Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meanfield model #1136

Open
wants to merge 51 commits into
base: meanfield_model
Choose a base branch
from

Commits on Jul 28, 2021

  1. add meanfield model to spynnaker

    Garandel committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    3b006a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Configuration menu
    Copy the full SHA
    d02cfb3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request SpiNNakerManchester#1113 from SpiNNakerManchester/…

    …correct_spikearray_waring
    
    fixed the check for early spikes
    rowleya authored Oct 4, 2021
    Configuration menu
    Copy the full SHA
    f4fbe32 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Configuration menu
    Copy the full SHA
    2dd48ee View commit details
    Browse the repository at this point in the history
  2. Merge pull request SpiNNakerManchester#1114 from SpiNNakerManchester/…

    …extract_iobuf_during_run
    
    remove extract_iobuf_during_run flag
    rowleya authored Oct 5, 2021
    Configuration menu
    Copy the full SHA
    0d27ce6 View commit details
    Browse the repository at this point in the history
  3. Fix a whole bunch of minor warnings in the documentation build

    There's apparently also a crash, but I can't reproduce that locally
    dkfellows committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    53e62fc View commit details
    Browse the repository at this point in the history
  4. Merge pull request SpiNNakerManchester#1115 from SpiNNakerManchester/…

    …doc-fix
    
    Documentation fix
    rowleya authored Oct 5, 2021
    Configuration menu
    Copy the full SHA
    134bb4e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f59c23d View commit details
    Browse the repository at this point in the history
  6. Merge pull request SpiNNakerManchester#1116 from SpiNNakerManchester/…

    …send_sync_repeat
    
    allow for mutliple send_sync
    rowleya authored Oct 5, 2021
    Configuration menu
    Copy the full SHA
    31b95ed View commit details
    Browse the repository at this point in the history
  7. Trying to fix a crash...

    dkfellows committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    d422d95 View commit details
    Browse the repository at this point in the history
  8. Merge pull request SpiNNakerManchester#1117 from SpiNNakerManchester/…

    …doc-fix
    
    Trying to fix a crash...
    dkfellows authored Oct 5, 2021
    Configuration menu
    Copy the full SHA
    40dc454 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. modified: meanfield/models/meanfield_model_impl.c

    add the reel error function
    Garandel committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    36a7f86 View commit details
    Browse the repository at this point in the history
  2. modified: meanfield/models/meanfield_model_impl.c

    change real error function for an erzate
    Garandel committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    2fa237f View commit details
    Browse the repository at this point in the history
  3. modified: meanfield/models/meanfield_model_impl.c

    write some comments
    Garandel committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    d21e701 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2021

  1. modified: meanfield/models/meanfield_model_impl.c

    Do an approxiamtion of 2 over sqrt(pi)
    in order to remove the error due to the sqrtk() function.
    Start to remove division in the threshold_func().
    Garandel committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    14f0c87 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ded939e View commit details
    Browse the repository at this point in the history
  3. modified: meanfield/models/meanfield_model_impl.c

    	modified:   meanfield/models/meanfield_model_impl.h
    Set threshold_func() add and remove r_squared() because don't implemented yet.
    No removing of division yet.
    Garandel committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    2d023c8 View commit details
    Browse the repository at this point in the history
  4. clean and remove sqrtk indicated when with coms, just to try without …

    …optimisation yet
    Garandel committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    9b2d577 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. Configuration menu
    Copy the full SHA
    e41ac1d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    07d3170 View commit details
    Browse the repository at this point in the history
  3. add Vi

    Garandel committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    8cdb775 View commit details
    Browse the repository at this point in the history
  4. modified: meanfield/models/meanfield_model_impl.h

    	modified:   ../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../spynnaker/pyNN/models/neuron/neuron_models/config.py
    	modified:   ../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_model_eitn.py
    
    ADD Vi and put it like state_variables
    CHANGE muV from state_variables to parameters
    Garandel committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    d608f1c View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. modified: meanfield/models/meanfield_model_impl.c

    	modified:   ../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../spynnaker/pyNN/models/neuron/neuron_models/config.py
    
    pbl when add Vi obtain DIBBY0 error but now clue where.
    Garandel committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    d89ccb2 View commit details
    Browse the repository at this point in the history
  2. modified: meanfield/implementations/meanfield_impl_standard.h

    	modified:   meanfield/models/meanfield_model_impl.c
    	modified:   meanfield/models/meanfield_model_impl.h
    	modified:   ../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_model_eitn.py
    
    try to solved the error DIVBY0 and pass from 10 vars recorded to 5.
    Garandel committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    dcf8d35 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. modified: ../../src/meanfield/implementations/meanfield_impl_standard.h

    	modified:   ../../src/meanfield/models/meanfield_model_impl.c
    	modified:   ../../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_model_eitn.py
    	modified:   ../../../spynnaker8/extra_models/__init__.py
    
    OK problem don't comming from printing data but I guess from creating them.
    I will change some C code in meanfield_impl_standard.h
    PBL is like if Ve and g_syn are ok to be create but not Vi and Fout_th for a
     5 vars recorded
    Garandel committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    be1be0c View commit details
    Browse the repository at this point in the history
  2. modified: ../../src/meanfield/models/meanfield_model_impl.c

    Need to add Vi really to tyhe implementation and so to meanfield_model_impl.h
    and .c and to meanfield_model.h
    so if need comme back here
    Garandel committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    565bcd5 View commit details
    Browse the repository at this point in the history
  3. modified: ../../src/meanfield/implementations/meanfield_impl_standard.h

    	modified:   ../../src/meanfield/models/meanfield_model.h
    	modified:   ../../src/meanfield/models/meanfield_model_impl.c
    
    Ok that working a priori, it's not the most beautiful but it's working
    Just one comment is : the numbers between Ve and Vi are not treat as the same,
    	don't understadn why??
    Garandel committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    a1b4baf View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2021

  1. modified: src/meanfield/implementations/meanfield_impl_standard.h

    	modified:   src/meanfield/models/meanfield_model.h
    	modified:   src/meanfield/models/meanfield_model_impl.c
    
    a priori that's work for Ve, Vi and Fout_th
    ->will add an other TF() and so an other threshold_function() in order to have
    	a MF
    Garandel committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    3fd336b View commit details
    Browse the repository at this point in the history
  2. modified: ../../src/meanfield/models/meanfield_model_impl.c

    before add config Vi
    Garandel committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    09e51a1 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. new file: Vthre_params.h

    	modified:   config.h
    	modified:   meanfield_model.h
    	modified:   meanfield_model_impl.c
    
    Add in the c code the inhibitory contribution of the MF and so the
     differenciation btw Exc and Inh.
    Names of some variables and params will be change in order to don't induce
    misunderstanding.
    Garandel committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    4e39dd7 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. modified: ../meanfield_build.mk

    	modified:   Makefile
    	modified:   ../../../src/meanfield/implementations/meanfield_impl_standard.h
    	renamed:    ../../../src/meanfield/models/Vthre_params.h -> ../../../src/meanfield/models/P_fit_polynomial.h
    	modified:   ../../../src/meanfield/models/meanfield_model.h
    	modified:   ../../../src/meanfield/models/meanfield_model_impl.c
    	modified:   ../../../../spynnaker/pyNN/models/neuron/abstract_pynn_meanfield_model_standard.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    
    Add the other transfert function for inhibitors in C code,
    -> take parameters from config.h to an other Opaque structure P_fit_polynomial.h
    that's compile
    Garandel committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    b21502a View commit details
    Browse the repository at this point in the history
  2. modified: ../meanfield_build.mk

    	modified:   Makefile
    	modified:   ../../../src/meanfield/implementations/meanfield_impl_standard.h
    	modified:   ../../../src/meanfield/models/meanfield_model.h
    	modified:   ../../../src/meanfield/models/meanfield_model_impl.c
    	renamed:    ../../../src/meanfield/models/config.h -> ../../../src/meanfield/models/params_from_network.h
    
    renames config.h to params_from_network.h in order to be more precise in the
    correspondance btw code and litterature.
    change names of types, arrays and structure.
    compilation is ok
    Garandel committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    e7ab542 View commit details
    Browse the repository at this point in the history
  3. modified: ../../../src/meanfield/models/meanfield_model.h

    	modified:   ../../../src/meanfield/models/params_from_network.h
    
    was changeing mathsbox.h for estimate_err_func.h but go back bcs I don't
    know if I will implement other function inside mathsbox and not just error
    function
    Garandel committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    886ead1 View commit details
    Browse the repository at this point in the history
  4. modified: ../../../src/meanfield/models/meanfield_model.h

    wasn't go back totaly
    Garandel committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    fd29318 View commit details
    Browse the repository at this point in the history
  5. modified: abstract_pynn_meanfield_model_standard.py

    	modified:   builds/meanfield_base.py
    	modified:   implementations/meanfield_impl_standard.py
    	renamed:    neuron_models/config.py -> neuron_models/params_from_network.py
    
    change name config.py for params_from_network.py and so in files
    Garandel committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    f2dd0c1 View commit details
    Browse the repository at this point in the history
  6. modified: abstract_pynn_meanfield_model_standard.py

    	modified:   builds/meanfield_base.py
    	new file:   neuron_models/p_fit_polynomial.py
    	modified:   neuron_models/params_from_network.py
    
    add an other struct file to implemente params from fit of single neuron for
    Vthre polynome
    Garandel committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    43621b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. modified: ../../../src/meanfield/implementations/meanfield_impl_stan…

    …dard.h
    
    	modified:   ../../../src/meanfield/models/params_from_network.h
    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/__init__.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/p_fit_polynomial.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/params_from_network.py
    
    A priori meanfield_model_cond.dict says that I'm out of DTCM.
    	That's why I get the error:
    	"Population meanfield_model_cond does not have parameter p0"
    Go back to the past commit without inh implemented, just to see.
    Garandel committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    87c3120 View commit details
    Browse the repository at this point in the history
  2. modified: ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_…

    …base.py
    
    	modified:   ../../../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	renamed:    ../../../../spynnaker/pyNN/models/neuron/neuron_models/p_fit_polynomial.py -> ../../../../spynnaker/pyNN/models/neuron/neuron_models/P_fit_polynomial_exc.py
    	new file:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/P_fit_polynomial_inh.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/__init__.py
    
    CHECK POINT
    That's compile and work in virtual mode for c and python.
    ERROR : DIVBY0 when reel mode
    Garandel committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    12222e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. modified: ../../../src/meanfield/models/meanfield_model_impl.c

    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    
    DIVBY0 error is solved, due to put state var in local but don't go back to
    struct so all the time 0.
    RESUME :
    	- TF for exc and inh with
    	- some name changed in the files and in variables
    WILL:
    	- Change MeanfieldModelEitn in python
    	- add adaptation W ODE
    	- change Fout_th for W in output
    Garandel committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    a8106ef View commit details
    Browse the repository at this point in the history
  2. modified: ../builds/meanfield_base.py

    	modified:   __init__.py
    	renamed:    meanfield_model_eitn.py -> meanfield_of_adex_network.py
    
    Change the name from meanfield_model_eitn.py to meanfield_of_adex_network.py
    Garandel committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    4bbfae7 View commit details
    Browse the repository at this point in the history
  3. modified: ../../../src/meanfield/implementations/meanfield_impl_stan…

    …dard.h
    
    	modified:   ../../../src/meanfield/models/meanfield_model_impl.c
    	modified:   ../../../src/meanfield/models/meanfield_model_impl.h
    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_of_adex_network.py
    
    Add the structure for adaptation W, that's work but give non-sense results.
    Need to add a start value and the real ODE.
    Garandel committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    bc2dc01 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2021

  1. modified: ../../../src/meanfield/models/meanfield_model_impl.c

    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_of_adex_network.py
    
    Correct some error but have an error when calculating EDO with RK2_midpoint.
    maybe "error" come from recorder.py and constant.py
    will do some test so if need come back here
    Garandel committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    81dfef1 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2021

  1. modified: ../../../src/meanfield/models/meanfield_model_impl.c

    	modified:   ../../../src/meanfield/models/meanfield_model_impl.h
    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/implementations/meanfield_impl_standard.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_of_adex_network.py
    	modified:   ../../../../spynnaker/pyNN/models/recorder.py
    	modified:   ../../../../spynnaker/pyNN/utilities/constants.py
    
    do some modification aparently without effect of
    recorder and constant in rder to integrate Ve, Vi and W.
    Will modify meanfield_t
    because Vthre left in it but not anymore in meanfield_t and so modif
     meanfield_f_adex_network.py
    Garandel committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    d275a9c View commit details
    Browse the repository at this point in the history
  2. modified: ../../../src/meanfield/models/meanfield_model_impl.h

    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_of_adex_network.py
    
    remove nbr from meanfielf_t and to meanfield_of_adex_network.py
    Garandel committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    199bd23 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2021

  1. modified: ../../../src/meanfield/models/meanfield_model_impl.c

    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_of_adex_network.py
    
    No clue of why w return uint32 DataType and not S1615.
    Will try in switching Vi and w
    Garandel committed Nov 3, 2021
    Configuration menu
    Copy the full SHA
    4b7f219 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. modified: ../../../src/meanfield/implementations/meanfield_impl_stan…

    …dard.h
    
    	modified:   ../../../src/meanfield/models/meanfield_model.h
    	modified:   ../../../src/meanfield/models/meanfield_model_impl.c
    	modified:   ../../../../spynnaker/pyNN/models/neuron/neuron_models/meanfield_of_adex_network.py
    
    SAVE POINT
    	now that's fonctionnaly work.
    	NEED to optimise or doing real ode solver and error_function
    Garandel committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    3cdf4a9 View commit details
    Browse the repository at this point in the history
  2. modified: ../../../src/meanfield/models/mathsbox.h

    	modified:   ../../../src/meanfield/models/meanfield_model_impl.c
    
    modified error_function with midpoint methode for integration.
    will do pregressively trapezoidale and Simpson if possible in ITCM
    BUT try to have an homogeneous patern i.e. EULER and Midpoint integrale
    for error function.
    Garandel committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    4728d48 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2021

  1. modified: ../../../src/meanfield/models/meanfield_model_impl.c

    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    Did some cleanning, correction and rewriting of euler, RK2, mu_Ge and modif TvN= Tv only because of the original paper.
    Need to ask for that!!
    Modif T_inv in value.
    need to find a way to plot but plt.show don't work on the terminal.
    Garandel committed Nov 5, 2021
    Configuration menu
    Copy the full SHA
    cbcdb45 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2021

  1. modified: ../../../src/meanfield/models/mathsbox.h

    	modified:   ../../../src/meanfield/models/meanfield_model_impl.c
    	modified:   ../../../../spynnaker/pyNN/models/neuron/builds/meanfield_base.py
    
    Do some clarification and try some method to remove the 'overflowed ITCM' message
    because of sqrtk
    sqrt function is not activated, so sV is on the square value.
    Need to find a solution for sqrt without overflowed ITCM
    Garandel committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    9650299 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2021

  1. Merge branch 'master' into meanfield_model

    too much changes, so will have too much conflict to fixe so merge with -s ours
    Garandel committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    3e63072 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'meanfield_model' of https://github.com/garandel/meanfie…

    …ld_model into meanfield_model
    
    try to merge origin_MF with this local branch with -s ours option in order to remove conflict
    Garandel committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    7afd2b9 View commit details
    Browse the repository at this point in the history