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

WIP: NeuroML import and export fixes and enhancements #810

Draft
wants to merge 109 commits into
base: neuroml_updates
Choose a base branch
from

Commits on Jul 26, 2023

  1. Exlude tests from discovery / installation

    Without it tests/ will be installed as a top level Python module.
    penguinpee committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    e5aa9e8 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Merge pull request suny-downstate-medical-center#777 from suny-downst…

    …ate-medical-center/development
    
    PR from development to master - VERSION 1.0.5
    vvbragin authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    42978bb View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Configuration menu
    Copy the full SHA
    7c3469a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2113bf7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bc223e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Configuration menu
    Copy the full SHA
    9ad6e6b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b176ed1 View commit details
    Browse the repository at this point in the history
  3. chore(neuroml): convert comments to docstrings

    More readable, and IDE friendly
    sanjayankur31 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    c4b5017 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1bbb32a View commit details
    Browse the repository at this point in the history
  5. chore(neuroml): remove (probably) outdated comment

    I seem to be able to run NetPyNE sims fine with MPI, so this comment
    does not seem to apply any more.
    sanjayankur31 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    3bbb312 View commit details
    Browse the repository at this point in the history
  6. fix(neuroml): correct override

    See, override decoration helps :)
    sanjayankur31 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    efba049 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    66d33ff View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7b2ab3c View commit details
    Browse the repository at this point in the history
  9. wip

    [skip ci]
    sanjayankur31 committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    55b0ea6 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Configuration menu
    Copy the full SHA
    befa517 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e8c6a5f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eeda61b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ebb6274 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5aa9785 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f94a128 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Configuration menu
    Copy the full SHA
    6d82e35 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cf6ac80 View commit details
    Browse the repository at this point in the history
  3. chore(neuroml): use warning instead of debug

    It's a warning that the user should be aware of.
    sanjayankur31 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    32d53ac View commit details
    Browse the repository at this point in the history
  4. feat(neuroml): remove commented out code

    erev is not required in Nernst or GHK2
    sanjayankur31 committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    22adce0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9a67381 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bb7798c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    66af713 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

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

Commits on Dec 21, 2023

  1. Configuration menu
    Copy the full SHA
    60ed0cf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    56f68e1 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Configuration menu
    Copy the full SHA
    035c50e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f634828 View commit details
    Browse the repository at this point in the history
  3. feat(neuroml): round channel density values to 10 digits

    Since NEURON's hoc only uses 10 decimal digits, to match it, we must
    limit our Python value to 10 decimal digits
    sanjayankur31 committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    827e977 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a021306 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

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

Commits on Feb 12, 2024

  1. Merge pull request suny-downstate-medical-center#806 from suny-downst…

    …ate-medical-center/development
    
    PR from development to master - VERSION 1.0.6
    vvbragin authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    fc05344 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

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

Commits on Feb 16, 2024

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

Commits on Feb 20, 2024

  1. chore(neuroml): make less verbose

    If we want it to be verbose, we toggle the verbosity in the module like
    this:
    
    ```
    logger = logging.getLogger("name of module").setLevel(..)
    ```
    sanjayankur31 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    44a1548 View commit details
    Browse the repository at this point in the history
  2. fix(neuroml): correct conditional logic

    We approximate if it *isnt* close to the value
    sanjayankur31 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    15e66bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    06aadd7 View commit details
    Browse the repository at this point in the history
  4. ci: update setup-python action

    To fix this annoying note:
    
    "Node.js 16 actions are deprecated. Please update the following actions
    to use Node.js 20: actions/setup-python@v4.."
    sanjayankur31 committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    2507033 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Revert "fix(neuroml): correct conditional logic"

    This reverts commit 15e66bb.
    sanjayankur31 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    72f00e3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    521857c View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. feat(neuroml): use %r instead of %s

    To ensure we get the complete value, and not the string converted one.
    sanjayankur31 committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    6f4d0fd View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. feat(neuroml-export): use float when exporting

    Because sometimes NetPyNE's internal format stores floats as strings,
    and so using `%r` results in invalid NeuroML.
    
    Eg:
    https://github.com/sanjayankur31/netpyne/actions/runs/8008676196/job/21875614690
    
    ```
    <membraneProperties>
        <channelDensity id="leak_soma_group" ionChannel="leak_hh" condDensity="0.003 S_per_cm2" erev="-70 mV" ion="non_specific"/>
        <channelDensity id="k_soma_group" ionChannel="k_hh" condDensity="0.036 S_per_cm2" erev="'-77' mV" ion="k"/>
        <channelDensity id="na_soma_group" ionChannel="na_hh" condDensity="0.12 S_per_cm2" erev="'50' mV" ion="na"/>
        <spikeThresh value="10 mV"/>
        <specificCapacitance value="1 uF_per_cm2" segmentGroup="soma_group"/>
        <initMembPotential value="-71 mV"/>
    </membraneProperties>
    ```
    
    Notice how values for membrane potential are correct but erevs for the
    two channels are not.
    sanjayankur31 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    169d5fe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    269193d View commit details
    Browse the repository at this point in the history
  3. Revert "feat(neuroml-export): use float when exporting"

    This reverts commit 169d5fe.
    sanjayankur31 committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    1698805 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    71c9501 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

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

Commits on Mar 5, 2024

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

Commits on Mar 17, 2024

  1. fix(py312): remove imp

    The `imp` module has been removed in Python 3.12:
    https://docs.python.org/3/whatsnew/3.12.html#imp
    sanjayankur31 committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    8d1f4b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Pandas deprecated parameter fix

    The inplace=True keyword was removed from newer Pandas versions, thus the inplace option is replaced by re-assigning the variable, following Pandas recs (pandas-dev/pandas#57104)
    Changing df['popInd'].cat.set_categories(sim.net.pops.keys(), inplace=True) by df['popInd'] = df['popInd'].cat.set_categories(sim.net.pops.keys()) in analysis/spikes.py
    RomanB22 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b35b841 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

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

Commits on Apr 1, 2024

  1. Merge pull request suny-downstate-medical-center#1 from suny-downstat…

    …e-medical-center/development
    
    fixed pointer id overflow on MPI (e.g. for gap junctions)
    RomanB22 authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    b8584d9 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Configuration menu
    Copy the full SHA
    9e34541 View commit details
    Browse the repository at this point in the history
  2. cfg.connRandomSecFromList and cfg.distributeSynsUniformly can now be …

    …overriden in individual conn rule
    vvbragin committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    f4d5e1c View commit details
    Browse the repository at this point in the history
  3. ability to use sec, loc, preSec and preLoc from list in `conn…

    …List`-type connParams (but so far, only if `synsPerConn == 1` - need to elaborate more general approach)
    vvbragin committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    48e1815 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc37963 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Adding loading bar for net creation

    Adding loading bar for cell and connectivity creation using tqdm package
    RomanB22 authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    3c471b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Update network.py

    Fixing double printing of Creating network sentence
    RomanB22 authored Apr 18, 2024
    Configuration menu
    Copy the full SHA
    a629a10 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. define cellInds before reference in syncLines logic

    hotfix, PR?
    jchen6727 committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    aa3e466 View commit details
    Browse the repository at this point in the history
  2. Merge pull request suny-downstate-medical-center#814 from jchen6727/d…

    …evelopment
    
    define `cellInds` before reference in `syncLines` logic
    vvbragin authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    8763c9b View commit details
    Browse the repository at this point in the history
  3. updated CHANGES.md

    vvbragin committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    1acd3e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

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

Commits on Apr 25, 2024

  1. Merge pull request suny-downstate-medical-center#809 from sanjayankur…

    …31/feat/update-setup-py
    
    ci: update setup-python action
    vvbragin authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    62e44b3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request suny-downstate-medical-center#812 from sanjayankur…

    …31/feat/dev-imp
    
    fix(py312): remove `imp`
    vvbragin authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    2556f56 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. dropped python 2 support

    vvbragin committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    ff8bb97 View commit details
    Browse the repository at this point in the history
  2. Merge pull request suny-downstate-medical-center#815 from suny-downst…

    …ate-medical-center/python2dropped
    
    dropped python 2 support
    vvbragin authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    ca53c5b View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Merge pull request suny-downstate-medical-center#813 from RomanB22/de…

    …velopment
    
    Pandas deprecated parameter fix + Loading Bar
    vvbragin authored May 1, 2024
    Configuration menu
    Copy the full SHA
    e97ed5c View commit details
    Browse the repository at this point in the history
  2. Merge pull request suny-downstate-medical-center#811 from NathanKline…

    …Institute/development
    
    add default padding (==1) for plotCSD, to avoid top/bottom edge artifacts in color plots
    vvbragin authored May 1, 2024
    Configuration menu
    Copy the full SHA
    c2279cf View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Configuration menu
    Copy the full SHA
    e3eec49 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    703435c View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. fixed bug in conn, updated test/examples/* to use dynamic pathing (su…

    …ny-downstate-medical-center#817)
    
    * fixed bug in conn, updated test/examples/* to use dynamic pathing
    
    * update CHANGES.md
    jchen6727 authored May 11, 2024
    Configuration menu
    Copy the full SHA
    6f16803 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. updating documentation (user_documentation.rst) re: new batchtools

    …(beta version) (suny-downstate-medical-center#819)
    
    * fixed bug in conn, updated test/examples/* to use dynamic pathing
    
    * update CHANGES.md
    
    * updated documentation with new batchtools (beta)
    jchen6727 authored May 14, 2024
    Configuration menu
    Copy the full SHA
    8021936 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. quick fix, adding cfg.progressBar logic, fixed another issue with the…

    … loading bar. (suny-downstate-medical-center#821)
    
    * Updated logic, bug fix
    
    cfg.progressBar = 2 will display all progress bars
    cfg.progressBar = 1 will call tqdm with progress bars w/ leave = 0
    cfg.progressBar = 0 will disable the progress bar.
    jchen6727 authored May 16, 2024
    Configuration menu
    Copy the full SHA
    a0846bb View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

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

Commits on Jun 20, 2024

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

Commits on Jul 3, 2024

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

Commits on Jul 5, 2024

  1. Configuration menu
    Copy the full SHA
    2ca43d0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5c1737f View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

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

Commits on Aug 6, 2024

  1. Update scalebar.py

    Removing the minimumdescent=False from the call to TextArea
    christian-oreilly authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    20f991c View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. fix in fromListConn

    vvbragin committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    9c63297 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Configuration menu
    Copy the full SHA
    91d8837 View commit details
    Browse the repository at this point in the history
  2. Merge pull request suny-downstate-medical-center#825 from yubelyrn/re…

    …move-saveFileStep
    
    Remove saveFileStep
    vvbragin authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    2a16f14 View commit details
    Browse the repository at this point in the history
  3. Merge pull request suny-downstate-medical-center#828 from christian-o…

    …reilly/patch-1
    
    Bug fix in scalebar - removing the use of the minimumdescent argument in the call to TextArea
    vvbragin authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    2f88a1a View commit details
    Browse the repository at this point in the history
  4. Merge pull request suny-downstate-medical-center#767 from penguinpee/…

    …development
    
    Exlude tests from discovery / installation
    vvbragin authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    a23fa95 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. Revert "Exlude tests from discovery / installation" - due to issue th…

    …at has emerged with spack installation (EBRAINS platform). Will re-visit later..
    
    This reverts commit e5aa9e8.
    vvbragin committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    7c09717 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. VERSION 1.0.7

    vvbragin committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a581ece View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9c765a8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    840db3d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    846f0bb View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. file cleanup, slurm scripts and timeout added to batchtools submit te…

    …mplates (suny-downstate-medical-center#831)
    
    see netpyne.batchtools esp. submits.py and search.py
    
    slurm job submission:
    search() now supports job_type='slurm' with associated 'ifs' and 'socket' communication modes
    
    the run_config for these submission scripts should specify the following arguments:
    'allocation' (allocation for the job)
    'walltime' (time limit before job termination)
    'nodes' (# nodes for job)
    'coresPerNode' (number of cores per job--i.e. the mpiexec -n value)
    'email' (user email)
    'custom' (any custom commands to execute prior to sourcing ~/.bashrc)
    'command' (execution of script, command to be run from the project directory to run the script)
    
    update to see submission:
    run_config for the submission now includes the following argument 
    'realtime' (time limit before job termination)
    jchen6727 authored Sep 10, 2024
    Configuration menu
    Copy the full SHA
    2934100 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Configuration menu
    Copy the full SHA
    1785bf3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e5a4f84 View commit details
    Browse the repository at this point in the history
  3. chore: minor lint fixes

    [skip ci]
    sanjayankur31 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    4c5f185 View commit details
    Browse the repository at this point in the history
  4. chore: minor formatting fixes, use logger

    [skip ci]
    sanjayankur31 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    d6c530f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1aa40b9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c701f3f View commit details
    Browse the repository at this point in the history
  7. feat(neuroml): stop casting dict keys to list

    This is only required if one modifies the keys of the dict while
    iterating over it, which we do not.
    sanjayankur31 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3612bf0 View commit details
    Browse the repository at this point in the history
  8. feat(neuroml): simplify looking for segment parent's section

    The same segment objects are used everywhere, so the segment object in
    `parent_seg` will also be the one used in the lists in `ordered_segs`.
    So, there's no need to iterate and compare ids, simply look if the
    object is in the list.
    sanjayankur31 committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3b79d06 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6c9b0d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    335b440 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e21f84a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9ba6324 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    17b3bf0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    413cbd4 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

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