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

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

Merged
merged 20 commits into from
Mar 9, 2017

Commits on Jun 29, 2016

  1. Adapt setting of min_delay in NEST to changes in NEST master

    In NEST, min_delay is no longer set in the defaults of each synapse but min_delay is set globally in the NEST kernel
    Maximilian Schmidt committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    aa0fe36 View commit details
    Browse the repository at this point in the history
  2. Change install_nest.sh to make travis check for current NEST master

    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
    Maximilian Schmidt committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    c0bde34 View commit details
    Browse the repository at this point in the history
  3. Add cmake to packages for Travis

    Maximilian Schmidt committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    a460d46 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2016

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

    …on of cmake
    Maximilian Schmidt committed Jul 2, 2016
    Configuration menu
    Copy the full SHA
    bdc6ecd View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

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

     into mschmidt87-fix_min_delay_error
    
    # Conflicts:
    #	.travis.yml
    #	ci/install_nest.sh
    apdavison committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    c85641a View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2016

  1. Configuration menu
    Copy the full SHA
    56a3f24 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2016

  1. Configuration menu
    Copy the full SHA
    300604e View commit details
    Browse the repository at this point in the history
  2. Adapt to changes in the NEST master branch (doesn't like negative tim…

    …es for the start time of DCSource or for the simulation time)
    apdavison committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    f625a3c View commit details
    Browse the repository at this point in the history
  3. Preliminary implementation of GIF_cond_exp (cf Mensi et al., 2012) …

    …for `pyNN.neuron`, using NMODL description from Christian Roessert
    apdavison committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    0a60466 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eb240b2 View commit details
    Browse the repository at this point in the history
  5. Modified gif.mod so that the membrane potential is clamped to Vr,…

    … rather than 0 mV, during the refractory period (to match the behaviour of other IF models).
    apdavison committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    19da2ff View commit details
    Browse the repository at this point in the history
  6. The development version of NEST now contains the gif_cond_exp model…

    …, 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.
    apdavison committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    d2d5d10 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2016

  1. Configuration menu
    Copy the full SHA
    ede350a View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

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

    Generalized integrate-and-fire model
    apdavison committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    2655d2a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4257694 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into nest-dev

    # Conflicts:
    #	pyNN/neuron/standardmodels/cells.py
    apdavison committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    7449ebd View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2017

  1. Merge branch 'master' into nest-dev

    # Conflicts:
    #	pyNN/nest/cells.py
    #	pyNN/neuron/standardmodels/cells.py
    apdavison committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    3910560 View commit details
    Browse the repository at this point in the history
  2. Update Travis config

    apdavison committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    f6d81e1 View commit details
    Browse the repository at this point in the history
  3. Test with NEST 2.12.0

    apdavison committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    14763dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4e50b8d View commit details
    Browse the repository at this point in the history