Merge nest-dev into master, support for NEST 2.12.0 #460

apdavison · 2017-03-08T21:46:27Z

No description provided.

In NEST, min_delay is no longer set in the defaults of each synapse but min_delay is set globally in the NEST kernel

Change the NEST-version that Travis downloads to current master branch Change script to download and re-build NEST every time so that Travis always checks the current master

…on of cmake

into mschmidt87-fix_min_delay_error # Conflicts: # .travis.yml # ci/install_nest.sh

… of NEST models.

…es for the start time of DCSource or for the simulation time)

…for `pyNN.neuron`, using NMODL description from Christian Roessert

… rather than 0 mV, during the refractory period (to match the behaviour of other IF models).

…, so it is not necessary to use the MyModule approach. Also modified the NEURON implementation to increment the eta and gamma variables at spike onset rather than after the refractory period. This matches the description in Pozzorini et al., and the behaviour of the NEST implementation.

…#114 has been fixed.

Generalized integrate-and-fire model

# Conflicts: # pyNN/neuron/standardmodels/cells.py

# Conflicts: # pyNN/nest/cells.py # pyNN/neuron/standardmodels/cells.py

coveralls · 2017-03-08T22:05:39Z

Coverage increased (+31.8%) to 61.918% when pulling 4e50b8d on apdavison:nest-dev into 3270908 on NeuralEnsemble:master.

Maximilian Schmidt and others added 20 commits June 29, 2016 10:44

Adapt setting of min_delay in NEST to changes in NEST master

aa0fe36

In NEST, min_delay is no longer set in the defaults of each synapse but min_delay is set globally in the NEST kernel

Change install_nest.sh to make travis check for current NEST master

c0bde34

Change the NEST-version that Travis downloads to current master branch Change script to download and re-build NEST every time so that Travis always checks the current master

Add cmake to packages for Travis

a460d46

Use trusty beta build environment for Travis, to activate newer versi…

bdc6ecd

…on of cmake

Merge branch 'fix_min_delay_error' of https://github.com/mschmidt87/PyNN

c85641a

into mschmidt87-fix_min_delay_error # Conflicts: # .travis.yml # ci/install_nest.sh

Merge branch 'mschmidt87-fix_min_delay_error' into nest-dev

56a3f24

Add some entries to the list of names to ignore when getting defaults…

300604e

… of NEST models.

Adapt to changes in the NEST master branch (doesn't like negative tim…

f625a3c

…es for the start time of DCSource or for the simulation time)

Preliminary implementation of GIF_cond_exp (cf Mensi et al., 2012) …

0a60466

…for `pyNN.neuron`, using NMODL description from Christian Roessert

Added preliminary support for GIF_cond_exp in pyNN.nest

eb240b2

Modified gif.mod so that the membrane potential is clamped to Vr,…

19da2ff

… rather than 0 mV, during the refractory period (to match the behaviour of other IF models).

Restore testing of AdExp with Delta_T=0, now that nest/nest-simulator…

ede350a

…#114 has been fixed.

Merge pull request NeuralEnsemble#427 from apdavison/gif-model

2655d2a

Generalized integrate-and-fire model

Merge branch 'nest-dev' of github.com:NeuralEnsemble/PyNN into nest-dev

4257694

Merge branch 'master' into nest-dev

7449ebd

# Conflicts: # pyNN/neuron/standardmodels/cells.py

Merge branch 'master' into nest-dev

3910560

# Conflicts: # pyNN/nest/cells.py # pyNN/neuron/standardmodels/cells.py

Update Travis config

f6d81e1

Test with NEST 2.12.0

14763dc

Preparing 0.8.3 release in nest-dev branch

4e50b8d

apdavison added this to the 0.8.3 milestone Mar 8, 2017

apdavison changed the title ~~Merge nest-dev into master, for NEST 2.12.0 release~~ Merge nest-dev into master, support for NEST 2.12.0 Mar 8, 2017

apdavison merged commit 45f348d into NeuralEnsemble:master Mar 9, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge nest-dev into master, support for NEST 2.12.0 #460

Merge nest-dev into master, support for NEST 2.12.0 #460

apdavison commented Mar 8, 2017

coveralls commented Mar 8, 2017 •

edited

Loading

Merge nest-dev into master, support for NEST 2.12.0 #460

Merge nest-dev into master, support for NEST 2.12.0 #460

Conversation

apdavison commented Mar 8, 2017

coveralls commented Mar 8, 2017 • edited Loading

coveralls commented Mar 8, 2017 •

edited

Loading