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.

Sign up for GitHub

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

Jump to bottom

Non-contiguous subgroups #1229

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

Non-contiguous subgroups #1229

wants to merge 68 commits into from

Commits on Sep 11, 2020

  1. WIP: First steps to generalize subgroups to be non-contiguous

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    604e633 View commit details
    Browse the repository at this point in the history

  2. Update SpikeMonitor for non-contiguous subgroups

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    d67ca90 View commit details
    Browse the repository at this point in the history

  3. Sort indices before their use in Subgroup 

    Warn to notify user if not sorted already
    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    eeff84b View commit details
    Browse the repository at this point in the history

  4. Fix logic error in Cython/C++ SpikeMonitor code

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    97659da View commit details
    Browse the repository at this point in the history

  5. Make PopulationRateMonitor work with non-contiguous subgroups

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    4672adf View commit details
    Browse the repository at this point in the history

  6. Add subgroups test for StateMonitor

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    4c677f0 View commit details
    Browse the repository at this point in the history

  7. Fix subgroups of SpatialNeuron

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    db2dcd5 View commit details
    Browse the repository at this point in the history

  8. Forbid using non-contiguous subgroups in Synapses

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    aa9237d View commit details
    Browse the repository at this point in the history

  9. Enable string expressions for subgroups 

    Needs more testing
    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    db3ddf4 View commit details
    Browse the repository at this point in the history

  10. Make string expressions for subgroups/indexing work in standalone

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    f0a34d1 View commit details
    Browse the repository at this point in the history

  11. Fix string indexing with references to external constants

    @mstimberg
    mstimberg committed Sep 11, 2020
    Configuration menu
    Copy the full SHA
    5acd917 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2020

  1. Make doctest compatible with Windows output for 32bit ints

    @mstimberg
    mstimberg committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    33f537e View commit details
    Browse the repository at this point in the history

  2. Do not allow unsorted indices in subgroups 

    Instead of raising a warning
    @mstimberg
    mstimberg committed Sep 14, 2020
    Configuration menu
    Copy the full SHA
    b477583 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. Merge branch 'master' into non_contiguous_subgroup 

    # Conflicts:
#	brian2/groups/subgroup.py
#	brian2/monitors/ratemonitor.py
    @mstimberg
    mstimberg committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    0cfe648 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    e48f89b View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    92aff0b View commit details
    Browse the repository at this point in the history

  2. Fix a remaining case of a deprecated numpy scalar

    @mstimberg
    mstimberg committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    cdb5427 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. Merge remote-tracking branch 'origin/master' into non_contiguous_subg… 

    …roup
    @mstimberg
    mstimberg committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    35bf32f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2022

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg authored Feb 9, 2022
    Configuration menu
    Copy the full SHA
    3032909 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2022

  1. Merge remote-tracking branch 'origin/master' into non_contiguous_subg… 

    …roup
    @mstimberg
    mstimberg committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    3177307 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2022

  1. minor optimization for non-contiguous subgroups

    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    89430b9 View commit details
    Browse the repository at this point in the history

  2. make PoissonGroup work with non-contiguous subgroups

    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    269d9e0 View commit details
    Browse the repository at this point in the history

  3. make SpikeMonitor generated code deterministic

    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    73cd6d9 View commit details
    Browse the repository at this point in the history

  4. Check for illegal subgroup indices in consistent way

    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    d0abc65 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'non_contiguous_subgroup' of github.com:brian-team/brian… 

    …2 into non_contiguous_subgroup
    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    afd5324 View commit details
    Browse the repository at this point in the history

  6. revert run_tests script to original version

    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    20e0efb View commit details
    Browse the repository at this point in the history

  7. Add/update tests for subgroups

    @mstimberg
    mstimberg committed May 2, 2022
    Configuration menu
    Copy the full SHA
    3ae9e1a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg authored Jun 8, 2022
    Configuration menu
    Copy the full SHA
    fd2933d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    c57e129 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2022

  1. Update documentation for non-contiguous subgroups 

    [ci skip]
    @mstimberg
    mstimberg committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    d8707aa View commit details
    Browse the repository at this point in the history

  2. Some more basic tests for incorrect subgroup creation

    @mstimberg
    mstimberg committed Nov 10, 2022
    Configuration menu
    Copy the full SHA
    7e495bb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg authored Nov 10, 2022
    Configuration menu
    Copy the full SHA
    ec0fe52 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Fix exception type in subgroup tests 

    ValueError → TypeError
    @mstimberg
    mstimberg committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    aaacc26 View commit details
    Browse the repository at this point in the history

  2. Test+doc for non-contiguous indices in SpatialNeuron

    @mstimberg
    mstimberg committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    22629b8 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    209d239 View commit details
    Browse the repository at this point in the history

  2. Remove deprecated usage of np.bool

    @mstimberg
    mstimberg committed Nov 22, 2022
    Configuration menu
    Copy the full SHA
    65ec4c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Fragile but basic working version of SynapticSubgroup 

    Needs refactoring and documentation
    @mstimberg
    mstimberg committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    82e3ffc View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    6f84542 View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary imports

    @mstimberg
    mstimberg committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    5509437 View commit details
    Browse the repository at this point in the history

  3. Add tests for synaptic subgroups

    @mstimberg
    mstimberg committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    fe861b7 View commit details
    Browse the repository at this point in the history

  4. Support array indexing for multi-synaptic indices

    @mstimberg
    mstimberg committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    73d214f View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Refactor Group.Indexing for better readability

    @mstimberg
    mstimberg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e51b0ae View commit details
    Browse the repository at this point in the history

  2. Add new tests for synaptic subgroups

    @mstimberg
    mstimberg committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    6ceba16 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Small refactoring for synaptic indexing 

    Also fixing a few issues related for standalone
    @mstimberg
    mstimberg committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    dbbb741 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. Fix a test

    @mstimberg
    mstimberg committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    2ff3cb1 View commit details
    Browse the repository at this point in the history

  2. Write sizes of dynamic arrays to disk after run in standalone mode

    @mstimberg
    mstimberg committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    fe0add7 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Simplify RateMonitor template for non-contiguous subgroup 

    No need to store the individual spikes, we only care about the total number
    @mstimberg
    mstimberg committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    eaf1efa View commit details
    Browse the repository at this point in the history

  2. Minor reformatting in test

    @mstimberg
    mstimberg committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    3759bf7 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Fail for out-of-range 1d array indices in Synapses

    @mstimberg
    mstimberg committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    2c4787b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Handle scalar synaptic indices correctly

    @mstimberg
    mstimberg committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    53ae0d8 View commit details
    Browse the repository at this point in the history

  2. Raise errors for boolean indices of incorrect shape

    @mstimberg
    mstimberg committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    6d27f53 View commit details
    Browse the repository at this point in the history

  3. Handle IndexErrors correctly for synapses as well

    @mstimberg
    mstimberg committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    adc17ec View commit details
    Browse the repository at this point in the history

  4. Install coveralls with pip everywhere

    @mstimberg
    mstimberg committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    fed868e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg authored Jun 15, 2023
    Configuration menu
    Copy the full SHA
    d163840 View commit details
    Browse the repository at this point in the history

  2. Fix incorrect merge

    @mstimberg
    mstimberg committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    a7f6cbe View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge remote-tracking branch 'origin/master' into non_contiguous_subg… 

    …roup

# Conflicts:
#	brian2/devices/cpp_standalone/device.py
    @mstimberg
    mstimberg committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    1c050b2 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Do not force float64 in TimedArray

    @mstimberg
    mstimberg committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    a7cd7f3 View commit details
    Browse the repository at this point in the history

  2. Invalidate caches on each run

    @mstimberg
    mstimberg committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    437e3fe View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into non_contiguous_subg… 

    …roup
    @mstimberg
    mstimberg committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    de0ee35 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2023

  1. Fix cache invalidation

    @mstimberg
    mstimberg committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    b476451 View commit details
    Browse the repository at this point in the history

  2. Correctly the return type of TimedArray functions in generated code

    @mstimberg
    mstimberg committed Oct 30, 2023
    Configuration menu
    Copy the full SHA
    285dffb View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. WIP: Allow non-contiguous subgroups for synapses 

    Only C++ standalone supported until now
    @mstimberg
    mstimberg committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    4cb865b View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Allow non-contiguous subgroups for synapses 

    Implementation for Cython and numpy
    @mstimberg
    mstimberg committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    bb7ddb9 View commit details
    Browse the repository at this point in the history

  2. Non-contiguous subgroups for synapses: summed variables

    @mstimberg
    mstimberg committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    ce5bb3b View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Test summed variable error for overlapping subgroups

    @mstimberg
    mstimberg committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    16e2ffc View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Merge branch 'master' into non_contiguous_subgroup

    @mstimberg
    mstimberg committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    3097569 View commit details
    Browse the repository at this point in the history

  2. minor fixes

    @mstimberg
    mstimberg committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    f1ea1b5 View commit details
    Browse the repository at this point in the history

  3. Re-add write sizes of dynamic arrays to disk 

    Changes from commit fe0add7 got lost in merge
    @mstimberg
    mstimberg committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    c21ec60 View commit details
    Browse the repository at this point in the history