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 123 commits into
base: neuroml_updates
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
e5aa9e8
Exlude tests from discovery / installation
penguinpee Jul 26, 2023
42978bb
Merge pull request #777 from suny-downstate-medical-center/development
vvbragin Sep 20, 2023
7c3469a
chore(neuroml): clean up imports
sanjayankur31 Nov 29, 2023
2113bf7
chore(lint): add flake and mypy configs
sanjayankur31 Nov 29, 2023
bc223e2
chore(neuroml): display critical message if `pop` is used
sanjayankur31 Nov 29, 2023
9ad6e6b
chore(requirements): use overrides for python < 3.12
sanjayankur31 Nov 30, 2023
b176ed1
feat(neuroml): go critical if neuroml cannot be imported
sanjayankur31 Nov 30, 2023
c4b5017
chore(neuroml): convert comments to docstrings
sanjayankur31 Nov 30, 2023
1bbb32a
chore(neuroml): replace comments with override decorator
sanjayankur31 Nov 30, 2023
3bbb312
chore(neuroml): remove (probably) outdated comment
sanjayankur31 Nov 30, 2023
efba049
fix(neuroml): correct override
sanjayankur31 Nov 30, 2023
66d33ff
chore(neuroml): document `handle_population`
sanjayankur31 Nov 30, 2023
7b2ab3c
chore(neuroml): document `_get_prox_dist`
sanjayankur31 Nov 30, 2023
55b0ea6
wip
sanjayankur31 Nov 30, 2023
befa517
wip: add a few logging statements to inform user of progress
sanjayankur31 Dec 4, 2023
e8c6a5f
chore(gitingore): add mypy cache
sanjayankur31 Dec 4, 2023
eeda61b
wip(neuroml): add a few comments
sanjayankur31 Dec 4, 2023
ebb6274
chore(neuroml): only print cell id, not full cell
sanjayankur31 Dec 4, 2023
5aa9785
chore(neuroml): mark TODO
sanjayankur31 Dec 4, 2023
f94a128
chore(neuroml): mark TODO
sanjayankur31 Dec 4, 2023
6d82e35
feat(neuroml): approximate prox/dist parentage
sanjayankur31 Dec 5, 2023
cf6ac80
feat(neuroml): improve user message
sanjayankur31 Dec 5, 2023
32d53ac
chore(neuroml): use warning instead of debug
sanjayankur31 Dec 5, 2023
22adce0
feat(neuroml): remove commented out code
sanjayankur31 Dec 5, 2023
9a67381
feat(neuroml): implement ChannelDensityGK
sanjayankur31 Dec 5, 2023
bb7798c
fix(neuroml): correct permeability units
sanjayankur31 Dec 5, 2023
66af713
wip: non uniform nernsts
sanjayankur31 Dec 5, 2023
830706d
feat(nml): add erev to non uniform
sanjayankur31 Dec 13, 2023
60ed0cf
fix(neuroml): update `p` before its used in `eval`
sanjayankur31 Dec 21, 2023
56f68e1
chore(neuroml): remove unused bits, use logging
sanjayankur31 Dec 21, 2023
035c50e
chore(neuroml): use warning instead of warn (deprecated)
sanjayankur31 Dec 22, 2023
f634828
feat(neuroml): round temperature
sanjayankur31 Dec 22, 2023
827e977
feat(neuroml): round channel density values to 10 digits
sanjayankur31 Dec 22, 2023
a021306
chore(neuroml): print -> logging
sanjayankur31 Dec 22, 2023
3d29a36
chore(neuroml): print -> logging
sanjayankur31 Dec 22, 2023
fc05344
Merge pull request #806 from suny-downstate-medical-center/development
vvbragin Feb 12, 2024
8810323
Merge branch 'neuroml_updates' into feat/neuroml-ankur
sanjayankur31 Feb 14, 2024
4f9810f
Merge branch 'feat/neuroml-ankur' of github.com:sanjayankur31/netpyne…
sanjayankur31 Feb 16, 2024
44a1548
chore(neuroml): make less verbose
sanjayankur31 Feb 20, 2024
15e66bb
fix(neuroml): correct conditional logic
sanjayankur31 Feb 20, 2024
06aadd7
Merge branch 'master' into feat/neuroml-ankur
sanjayankur31 Feb 20, 2024
2507033
ci: update setup-python action
sanjayankur31 Feb 20, 2024
72f00e3
Revert "fix(neuroml): correct conditional logic"
sanjayankur31 Feb 21, 2024
521857c
feat(neuroml): correct fraction checking logic
sanjayankur31 Feb 21, 2024
6f4d0fd
feat(neuroml): use `%r` instead of `%s`
sanjayankur31 Feb 22, 2024
169d5fe
feat(neuroml-export): use float when exporting
sanjayankur31 Feb 23, 2024
269193d
chore: lint fixes: use "not in" instead of "not ... in"
sanjayankur31 Feb 23, 2024
1698805
Revert "feat(neuroml-export): use float when exporting"
sanjayankur31 Feb 23, 2024
71c9501
fix(neuroml-export): use float instead of string for erev constants
sanjayankur31 Feb 23, 2024
a79c85b
add default padding (==1) for plotCSD, to avoid top/bottom edge artif…
samnemo Mar 1, 2024
a7c06ec
better handling of exceptions in `importCellParams()` (incl. issue 782)
vvbragin Mar 5, 2024
8d1f4b8
fix(py312): remove `imp`
sanjayankur31 Mar 17, 2024
b35b841
Pandas deprecated parameter fix
RomanB22 Mar 27, 2024
c8b654d
fixed pointer id overflow on MPI (e.g. for gap junctions)
vvbragin Mar 28, 2024
b8584d9
Merge pull request #1 from suny-downstate-medical-center/development
RomanB22 Apr 1, 2024
9e34541
preSec and preLoc are no longer lost for inverse pointer connection
vvbragin Apr 5, 2024
f4d5e1c
cfg.connRandomSecFromList and cfg.distributeSynsUniformly can now be …
vvbragin Apr 5, 2024
48e1815
ability to use `sec`, `loc`, `preSec` and `preLoc` from list in `conn…
vvbragin Apr 5, 2024
fc37963
fixed escessive warning when estimating max pointer connections number
vvbragin Apr 5, 2024
3c471b5
Adding loading bar for net creation
RomanB22 Apr 15, 2024
a629a10
Update network.py
RomanB22 Apr 18, 2024
aa3e466
define `cellInds` before reference in `syncLines` logic
jchen6727 Apr 19, 2024
8763c9b
Merge pull request #814 from jchen6727/development
vvbragin Apr 19, 2024
1acd3e6
updated CHANGES.md
vvbragin Apr 19, 2024
b21d67a
Merge branch 'development' into feat/neuroml-ankur
sanjayankur31 Apr 23, 2024
62e44b3
Merge pull request #809 from sanjayankur31/feat/update-setup-py
vvbragin Apr 25, 2024
2556f56
Merge pull request #812 from sanjayankur31/feat/dev-imp
vvbragin Apr 25, 2024
ff8bb97
dropped python 2 support
vvbragin Apr 29, 2024
ca53c5b
Merge pull request #815 from suny-downstate-medical-center/python2dro…
vvbragin Apr 29, 2024
e97ed5c
Merge pull request #813 from RomanB22/development
vvbragin May 1, 2024
c2279cf
Merge pull request #811 from NathanKlineInstitute/development
vvbragin May 1, 2024
e3eec49
added tqdm (progress bar) to dependency list
vvbragin May 3, 2024
703435c
Fixed a bug in `gatherDataFromFiles()` where cellGids for node 0 were…
vvbragin May 3, 2024
6f16803
fixed bug in conn, updated test/examples/* to use dynamic pathing (#817)
jchen6727 May 11, 2024
8021936
updating documentation (user_documentation.rst) re: new `batchtools` …
jchen6727 May 14, 2024
a0846bb
quick fix, adding cfg.progressBar logic, fixed another issue with the…
jchen6727 May 16, 2024
8c81925
updated mkdir to makedirs (bug fix) -- note the exist_ok change for l…
Jsprouse0 Jun 3, 2024
bd4f897
Add examples of recording from synaptic currents mechanisms in the do…
yubelyrn Jun 20, 2024
560e5fb
Remove saveFileStep parameter and its references
yubelyrn Jul 3, 2024
2ca43d0
fixed generating rhythmic spiking pattern with 'uniform' option
vvbragin Jul 5, 2024
5c1737f
updated link to installation instructions
vvbragin Jul 5, 2024
b68c2cb
fixed misleading console output when cfg.recordStims is On
vvbragin Jul 11, 2024
20f991c
Update scalebar.py
christian-oreilly Aug 6, 2024
9c63297
fix in fromListConn
vvbragin Aug 14, 2024
91d8837
merge of batchtools into the development repository. (#829)
jchen6727 Aug 30, 2024
2a16f14
Merge pull request #825 from yubelyrn/remove-saveFileStep
vvbragin Aug 30, 2024
2f88a1a
Merge pull request #828 from christian-oreilly/patch-1
vvbragin Aug 30, 2024
a23fa95
Merge pull request #767 from penguinpee/development
vvbragin Aug 30, 2024
7c09717
Revert "Exlude tests from discovery / installation" - due to issue th…
vvbragin Aug 31, 2024
a581ece
VERSION 1.0.7
vvbragin Sep 4, 2024
9c765a8
minor correction to CHANGES.md
vvbragin Sep 4, 2024
840db3d
fixed sbi deprecation error. fixes in docs formatting
vvbragin Sep 4, 2024
846f0bb
updated upload instructions to exclude downtime
vvbragin Sep 4, 2024
2934100
file cleanup, slurm scripts and timeout added to batchtools submit te…
jchen6727 Sep 10, 2024
1785bf3
Merge branch 'development' into feat/neuroml-ankur
sanjayankur31 Sep 11, 2024
e5a4f84
chore: update imports to match `development`
sanjayankur31 Sep 11, 2024
4c5f185
chore: minor lint fixes
sanjayankur31 Sep 11, 2024
d6c530f
chore: minor formatting fixes, use logger
sanjayankur31 Sep 11, 2024
1aa40b9
chore(neuroml): add more type hints/doc strings
sanjayankur31 Sep 11, 2024
c701f3f
chore(neuroml): add more type hints, add more comments
sanjayankur31 Sep 11, 2024
3612bf0
feat(neuroml): stop casting dict keys to list
sanjayankur31 Sep 11, 2024
3b79d06
feat(neuroml): simplify looking for segment parent's section
sanjayankur31 Sep 11, 2024
6c9b0d4
feat(neuroml): refer to neuro_lex_ids in neuroml instead of hard coding
sanjayankur31 Sep 11, 2024
e52e780
code adjustments to internal sim.clearAll(), added sim.close() (#832)
jchen6727 Sep 11, 2024
a5b7a12
hot fix (submits.py) (#833)
jchen6727 Sep 11, 2024
335b440
feat(neuroml): combine non uniform and non uniform nernst channel den…
sanjayankur31 Sep 12, 2024
e21f84a
feat(neuroml): implement non uniform GHK channel densities
sanjayankur31 Sep 12, 2024
9ba6324
chore(neuroml): add descriptive comments
sanjayankur31 Sep 12, 2024
17b3bf0
fix(neuroml): correct dict iteration
sanjayankur31 Sep 12, 2024
413cbd4
fix(neuroml): correct variable
sanjayankur31 Sep 12, 2024
709eaf1
d/w expanse setup, moved {env} {res} {custom} (#834)
jchen6727 Sep 17, 2024
7567e74
quick fix to `update` method that allows for working with lists. (#837)
jchen6727 Sep 26, 2024
62649bd
extracellular stimulation
urdapile Sep 27, 2024
a1ef3e8
Merge branch 'development' of https://github.com/suny-downstate-medic…
urdapile Sep 27, 2024
3e3663b
feat(neuroml): species: create dict for ion before setting info
sanjayankur31 Oct 15, 2024
6e7cc40
chore(neuroml): use variable for setting rounding precision
sanjayankur31 Oct 23, 2024
0c71a1b
plotCSD: time slicing on pre-loaded data (credit: Nikita Novikov)
vvbragin Oct 31, 2024
0de4ac6
drop python 3.7 for unit-tests
vvbragin Nov 5, 2024
13f93fe
test with python 3.9-3.13
vvbragin Nov 5, 2024
376993f
for unit tests, rolled back to 3.12 so far
vvbragin Nov 5, 2024
cd6cbee
Merge branch 'development' into feat/neuroml-ankur
sanjayankur31 Nov 6, 2024
66e73be
fix(neuroml): get `erev` value from channel density
sanjayankur31 Nov 6, 2024
c119806
chore: use `format_` instead of `format` which is a python built-in
sanjayankur31 Dec 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
#python-version: [2.7, 3.7]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
fail-fast: false

steps:
- name: Check out repository code
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ examples/optunaOptim/simple/
/examples/NeuroMLImport/test/M1.net.nml
/examples/NeuroMLImport/test/LEMS_M1.xml
arm64


.mypy_cache/
2 changes: 2 additions & 0 deletions .mypy.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[mypy]
ignore_missing_imports = True
45 changes: 45 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,48 @@
- Added extracellular stimulation (option: without compiling an additional .mod file - large memory requirements-)

- Update of documentation (stimSourceParams and stimTargetParams) incorporating how to define extracellular stimulations


# Version 1.0.7

**New features**

- Introducing `batchtools` subpackage for parameters exploration and optimization

- Added progress-bar indicating network creation progress. Toggle the progress bar with cfg.progressBar

- cfg.connRandomSecFromList and cfg.distributeSynsUniformly can now be overriden in individual conn rule

- Added ability to use `sec`, `loc`, `preSec` and `preLoc` from list in connList-type connParams

- Updated tests.examples.utils to allow for dynamic pathing

- Dropped python2 support

**Bug fixes**

- Better handling of exceptions in `importCellParams()` (incl. `h.load_file()` - issue 782)

- Pandas deprecated parameter fix

- Fixed pointer id overflow on MPI (e.g. for gap junctions)

- preSec and preLoc are no longer lost for inverse pointer connection

- Fixed crash due to use of matplotlib.TextArea deprecated param (credit: Christian O'Reilly)

- syncLines in rasterPlot restored

- Fixed a bug in `gatherDataFromFiles()` where cellGids for node 0 were lost

- Fixed generating rhythmic spiking pattern with 'uniform' option

- Fixed misleading console output when cfg.recordStims is On

- The colors in CSD plots are now properly aligned vertically with the CSD time-series overlays (credit: Sam Neymotin)

- Update mkdir to makedirs (credit: Jacob Sprouse)

# Version 1.0.6

**New features**
Expand Down
13 changes: 8 additions & 5 deletions doc/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,23 @@
10d) It will fix the Package Index file
10e) It will build the html files
11) Post the documentation
11a) ssh [email protected] "rm -r ~/public_html"
11a) ssh [email protected] "cp -r ~/public_html ~/public_html_backup"
NOTE: it may give the error "... no matching host key type found ...". In this case, try using the "-oHostKeyAlgorithms=+ssh-rsa" argument in ssh command and in scp command below (as well as in 11c)
11b) scp -r build [email protected]:///home/gkaue9v7ctjf/public_html
11b) scp -r build [email protected]:///home/gkaue9v7ctjf/public_html_new
NOTE: it may give the error "path canonocalization failed", then use the argument "-O" in scp call - it rolls back to legacy mode (see also NOTE in 11a)
11c) ssh [email protected] "cp -r ~/redirect_html/. ~/public_html/"
11c) ssh [email protected] "cp -r ~/redirect_html/. ~/public_html_new/ && rm -r ~/public_html && mv ~/public_html_new ~/public_html"
11d) Make sure new documentation is up and running
11e) ssh [email protected] "rm -r ~/public_html_backup/"
12) Update PYPI (pip) with the latest release
12a) cd netpyne
12b) python3 setup.py bdist_wheel --universal
12c) python setup.py upload_via_twine
Username: salvadord
(outdated) Username: salvadord
Enter the token (https://dura-bernallab.slack.com/archives/D02A30N4Z50/p1707862380181609)
13) Announce the new release
13a) New release announcement text:
NetPyNE v#.#.# is now available. For a complete list of changes and bug fixes see: https://github.com/suny-downstate-medical-center/netpyne/releases/tag/v#.#.#
See here for instructions to install or update to the latest version: http://www.netpyne.org/install.html
See here for instructions to install or update to the latest version: https://www.netpyne.org/documentation/installation
13b) Announce on NEURON forum:
https://www.neuron.yale.edu/phpBB/viewtopic.php?f=45&t=3685&sid=9c380fe3a835babd47148c81ae71343e
13c) Announce to Google group:
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
# built documents.
#
# The short X.Y version.
version = '1.0.6'
version = '1.0.7'
# The full version, including alpha/beta/rc tags.
release = '1.0.6'
release = '1.0.7'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading
Loading