From 214875ad7661139ce378027f7800dcdaaf00faa6 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 11 Apr 2024 13:55:21 +0100 Subject: [PATCH 01/11] Update eden tests for 0.2.3 --- .github/workflows/omv-ci.yml | 4 ++-- neuroConstruct/generatedNeuroML2/.test.jnmleden.omt | 4 ++-- neuroConstruct/generatedNeuroML2/.test.two.jnmleden.omt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index 5ef7c40..03c1d54 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -18,10 +18,10 @@ jobs: engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_validate, jNeuroML_validatev1, jNeuroML_EDEN ] steps: - - uses: actions/checkout@v3 + - 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 }} diff --git a/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt b/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt index 11ef15e..83ba293 100644 --- a/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt +++ b/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt @@ -14,7 +14,7 @@ experiments: spike detection: method: threshold threshold: 0 - tolerance: 0.0010167414427688726 + tolerance: 0.0010208952879688757 Current clamp basket: observables: spike times: @@ -25,4 +25,4 @@ experiments: spike detection: method: threshold threshold: 0 - tolerance: 0.00029262095123372775 + tolerance: 0.000289288215650068 diff --git a/neuroConstruct/generatedNeuroML2/.test.two.jnmleden.omt b/neuroConstruct/generatedNeuroML2/.test.two.jnmleden.omt index 4f5776b..3ecaf90 100644 --- a/neuroConstruct/generatedNeuroML2/.test.two.jnmleden.omt +++ b/neuroConstruct/generatedNeuroML2/.test.two.jnmleden.omt @@ -15,7 +15,7 @@ experiments: spike detection: method: threshold threshold: 0 - tolerance: 0.017343922603342065 + tolerance: 0.01734388742304312 bask0: observables: spike times: @@ -26,4 +26,4 @@ experiments: spike detection: method: threshold threshold: 0 - tolerance: 0.0017869092394359062 + tolerance: 0.001786960295444412 From 49d16801994d64c08dddff8aa68e6e9c2ddd1b4f Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 11 Apr 2024 14:17:09 +0100 Subject: [PATCH 02/11] Multiple runs --- .github/workflows/omv-ci.yml | 7 ++++--- .gitignore | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index 03c1d54..4f3b1a9 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -9,13 +9,14 @@ on: jobs: build: - - runs-on: ubuntu-latest + name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} + runs-on: ${{ matrix.runs-on }} strategy: fail-fast: false matrix: - python-version: [ 3.7, 3.9 ] + python-version: [ 3.9, "3.11" ] engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_validate, jNeuroML_validatev1, jNeuroML_EDEN ] + runs-on: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index 38e51c5..c801517 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ neuroConstruct/generatedNeuroML2/*.js *_code.gen.c *_code.gen.so arm64 +/neuroConstruct/generatedNeuroML2/ACnet2.net.nml__flattened.xml From cebc21e633d4d2a41cd72f5bf56bdee69f6a20cd Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 11 Apr 2024 14:23:06 +0100 Subject: [PATCH 03/11] macos14 --- .github/workflows/omv-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index 4f3b1a9..b7b3b64 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -9,14 +9,14 @@ on: jobs: build: - name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }} + name: Py${{ matrix.python-version }}, ${{engine}} on ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }} strategy: fail-fast: false matrix: python-version: [ 3.9, "3.11" ] engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_validate, jNeuroML_validatev1, jNeuroML_EDEN ] - runs-on: [ubuntu-latest, macos-latest, windows-latest] + runs-on: [ubuntu-latest, macos-latest, macos-14 ] steps: - uses: actions/checkout@v4 From 8afac1019a89523693fcc6294ca598ded1a367c5 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 11 Apr 2024 14:23:49 +0100 Subject: [PATCH 04/11] Fix matrix --- .github/workflows/omv-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index b7b3b64..e762f18 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -9,7 +9,7 @@ on: jobs: build: - name: Py${{ matrix.python-version }}, ${{engine}} on ${{ matrix.runs-on }} + name: Py${{ matrix.python-version }}, ${{ matrix.engine}} on ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }} strategy: fail-fast: false From fc6fbf6691350d31bd96ce1e1e0514548f02ee96 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 11 Apr 2024 14:29:50 +0100 Subject: [PATCH 05/11] Just 3.10 --- .github/workflows/omv-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index e762f18..bcccf03 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ 3.9, "3.11" ] + python-version: [ "3.10" ] engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_validate, jNeuroML_validatev1, jNeuroML_EDEN ] runs-on: [ubuntu-latest, macos-latest, macos-14 ] From d1c21de51b45eda2bfe6cc9ca76ef03ae074ced3 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 11 Apr 2024 14:34:16 +0100 Subject: [PATCH 06/11] Rem tables --- .github/workflows/omv-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index bcccf03..22ee6e7 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -29,7 +29,6 @@ jobs: - name: Install OMV run: | pip install git+https://github.com/OpenSourceBrain/osb-model-validation - pip install scipy sympy matplotlib cython pandas tables - name: Run OMV tests on engine ${{ matrix.engine }} run: | From 28c270f79064bcdfc62c2ab282bf6f97c294871d Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 11 Apr 2024 15:42:32 +0100 Subject: [PATCH 07/11] Test passing on linux --- neuroConstruct/generatedNeuroML2/.test.jnmleden.omt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt b/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt index 83ba293..ae376bb 100644 --- a/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt +++ b/neuroConstruct/generatedNeuroML2/.test.jnmleden.omt @@ -25,4 +25,4 @@ experiments: spike detection: method: threshold threshold: 0 - tolerance: 0.000289288215650068 + tolerance: 0.000292671703552327 From e7da4a93343c50ab20f9daae1d5d6a7f213374c3 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Wed, 17 Apr 2024 10:47:57 +0100 Subject: [PATCH 08/11] Install hdf5 for mac14 --- .github/workflows/omv-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index 22ee6e7..7adbba4 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -26,6 +26,11 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Install HDF5 for pytables on macos-14 + if: ${{ matrix.runs-on == 'macos-14' }} + run: | + brew install hdf5 + - name: Install OMV run: | pip install git+https://github.com/OpenSourceBrain/osb-model-validation From 1f156b9e9e0314f5a5ba475f87c083e72607fcab Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 2 May 2024 15:13:34 +0100 Subject: [PATCH 09/11] Regenerated neuroml --- .../generatedNeuroML2/ACnet2.net.nml | 8 +-- neuroConstruct/generatedNeuroML2/Ca_conc.nml | 6 +- .../generatedNeuroML2/Ca_pyr.channel.nml | 70 ++++++++++++++----- .../generatedNeuroML2/Kahp_pyr.channel.nml | 69 +++++++++++++----- .../generatedNeuroML2/Kdr_bask.channel.nml | 40 ++++++++--- .../generatedNeuroML2/Kdr_pyr.channel.nml | 40 ++++++++--- .../LeakConductance_bask.channel.nml | 11 +-- .../LeakConductance_pyr.channel.nml | 11 +-- .../generatedNeuroML2/Na_bask.channel.nml | 67 +++++++++++++----- .../generatedNeuroML2/Na_pyr.channel.nml | 45 +++++++++--- .../generatedNeuroML2/bask_soma.cell.nml | 2 +- .../generatedNeuroML2/pyr_4_sym_soma.cell.nml | 2 +- 12 files changed, 269 insertions(+), 102 deletions(-) diff --git a/neuroConstruct/generatedNeuroML2/ACnet2.net.nml b/neuroConstruct/generatedNeuroML2/ACnet2.net.nml index 4698738..b7cbb5a 100644 --- a/neuroConstruct/generatedNeuroML2/ACnet2.net.nml +++ b/neuroConstruct/generatedNeuroML2/ACnet2.net.nml @@ -1,9 +1,9 @@ - + -Network structure (NeuroML 2beta3) for project: ACnet2 saved with neuroConstruct v1.7.1 on: 13:25:26, 17-Jun-14 +Network structure (NeuroML 2.3.1) for project: ACnet2 saved with neuroConstruct v1.7.5 on: 14:13:13, 02-May-24 Cell Group: basket_soma contains 1 cells Cell Group: pyramidal_soma contains 1 cells @@ -24,13 +24,9 @@ Cell Group: pyramidal_soma contains 1 cells - - - - diff --git a/neuroConstruct/generatedNeuroML2/Ca_conc.nml b/neuroConstruct/generatedNeuroML2/Ca_conc.nml index 3e71a23..985481f 100644 --- a/neuroConstruct/generatedNeuroML2/Ca_conc.nml +++ b/neuroConstruct/generatedNeuroML2/Ca_conc.nml @@ -1,8 +1,8 @@ - + NeuroML file describing intracellular Calcium dynamics, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. - + - + diff --git a/neuroConstruct/generatedNeuroML2/Ca_pyr.channel.nml b/neuroConstruct/generatedNeuroML2/Ca_pyr.channel.nml index abc098e..d878a9d 100644 --- a/neuroConstruct/generatedNeuroML2/Ca_pyr.channel.nml +++ b/neuroConstruct/generatedNeuroML2/Ca_pyr.channel.nml @@ -1,70 +1,106 @@ - + NeuroML file containing a single Calcium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. - + - - NeuroML file containing a single Calcium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + NeuroML file containing a single Calcium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + + + + + + + Traub, R. D., Wong, R. K., Miles, R., and Michelson, H. (1991). A model of a CA3 hippocampal pyramidal neuron incorporating voltage-clamp data on intrinsic conductances. Journal of neurophysiology, 66(2), 635-50. + + + - - + + + + Ca channels + + + - + + + - + + + + - + + + + - + + - + + + - + + + + - + - + + + - + + + + + + + - + - + diff --git a/neuroConstruct/generatedNeuroML2/Kahp_pyr.channel.nml b/neuroConstruct/generatedNeuroML2/Kahp_pyr.channel.nml index 5b214c9..b3cfbaa 100644 --- a/neuroConstruct/generatedNeuroML2/Kahp_pyr.channel.nml +++ b/neuroConstruct/generatedNeuroML2/Kahp_pyr.channel.nml @@ -1,69 +1,106 @@ - + NeuroML file containing a single Calcium-dependent Potassium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. - + - - NeuroML file containing a single Calcium-dependent Potassium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + NeuroML file containing a single Calcium-dependent Potassium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + + + + + + + Traub, R. D., Wong, R. K., Miles, R., and Michelson, H. (1991). A model of a CA3 hippocampal pyramidal neuron incorporating voltage-clamp data on intrinsic conductances. Journal of neurophysiology, 66(2), 635-50. + + + - - + + + + K channels + + + - + + + - + + + + - + + - + + + + - + + + + + + + + - + - + + + + - + + + + + - + - + diff --git a/neuroConstruct/generatedNeuroML2/Kdr_bask.channel.nml b/neuroConstruct/generatedNeuroML2/Kdr_bask.channel.nml index dcee473..fc9e6c2 100644 --- a/neuroConstruct/generatedNeuroML2/Kdr_bask.channel.nml +++ b/neuroConstruct/generatedNeuroML2/Kdr_bask.channel.nml @@ -1,40 +1,60 @@ - + NeuroML file containing a single Potassium Channel description, from the book Neuronal Networks of the Hippocampus, Traub and Miles 1991 - + - - NeuroML file containing a single Potassium Channel description, from the book Neuronal Networks of the Hippocampus, Traub and Miles 1991 + NeuroML file containing a single Potassium Channel description, from the book Neuronal Networks of the Hippocampus, Traub and Miles 1991 + + + + + + + Traub, R. D., & Miles, R. (1991). Neuronal Networks of the Hippocampus. Cambridge University Press. + + + - - + + + + K channels + + + - + + + - + + + + - + + - + diff --git a/neuroConstruct/generatedNeuroML2/Kdr_pyr.channel.nml b/neuroConstruct/generatedNeuroML2/Kdr_pyr.channel.nml index f89ac54..20364ae 100644 --- a/neuroConstruct/generatedNeuroML2/Kdr_pyr.channel.nml +++ b/neuroConstruct/generatedNeuroML2/Kdr_pyr.channel.nml @@ -1,40 +1,60 @@ - + NeuroML file containing a single Potassium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. - + - - NeuroML file containing a single Potassium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + NeuroML file containing a single Potassium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + + + + + + + Traub, R. D., Wong, R. K., Miles, R., and Michelson, H. (1991). A model of a CA3 hippocampal pyramidal neuron incorporating voltage-clamp data on intrinsic conductances. Journal of neurophysiology, 66(2), 635-50. + + + - - + + + + K channels + + + - + + + - + + + + - + + - + diff --git a/neuroConstruct/generatedNeuroML2/LeakConductance_bask.channel.nml b/neuroConstruct/generatedNeuroML2/LeakConductance_bask.channel.nml index b5d5b56..242680c 100644 --- a/neuroConstruct/generatedNeuroML2/LeakConductance_bask.channel.nml +++ b/neuroConstruct/generatedNeuroML2/LeakConductance_bask.channel.nml @@ -1,12 +1,13 @@ - + NeuroML file containing a single Channel description - + - + Passive conductance for basket cell - + + - + diff --git a/neuroConstruct/generatedNeuroML2/LeakConductance_pyr.channel.nml b/neuroConstruct/generatedNeuroML2/LeakConductance_pyr.channel.nml index 843dcca..ecfb8b7 100644 --- a/neuroConstruct/generatedNeuroML2/LeakConductance_pyr.channel.nml +++ b/neuroConstruct/generatedNeuroML2/LeakConductance_pyr.channel.nml @@ -1,12 +1,13 @@ - + NeuroML file containing a single Channel description - + - + Passive conductance for pyramidal cell - + + - + diff --git a/neuroConstruct/generatedNeuroML2/Na_bask.channel.nml b/neuroConstruct/generatedNeuroML2/Na_bask.channel.nml index 932d415..cf1c2ad 100644 --- a/neuroConstruct/generatedNeuroML2/Na_bask.channel.nml +++ b/neuroConstruct/generatedNeuroML2/Na_bask.channel.nml @@ -1,67 +1,100 @@ - + NeuroML file containing a single Sodium Channel description, from the book Neuronal Networks of the Hippocampus, Traub and Miles 1991 - + - - NeuroML file containing a single Sodium Channel description, from the book Neuronal Networks of the Hippocampus, Traub and Miles 1991 + NeuroML file containing a single Sodium Channel description, from the book Neuronal Networks of the Hippocampus, Traub and Miles 1991 + + + + + + + Traub, R. D., & Miles, R. (1991). Neuronal Networks of the Hippocampus. Cambridge University Press. + + + - - + + + + Na channels + + + - + + + - + + + + - + + + + - + + - + + + - + + + + - + - + + + - + + + + - + - + diff --git a/neuroConstruct/generatedNeuroML2/Na_pyr.channel.nml b/neuroConstruct/generatedNeuroML2/Na_pyr.channel.nml index 7702bed..5d0ff83 100644 --- a/neuroConstruct/generatedNeuroML2/Na_pyr.channel.nml +++ b/neuroConstruct/generatedNeuroML2/Na_pyr.channel.nml @@ -1,45 +1,68 @@ - + NeuroML file containing a single Sodium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. - + - - NeuroML file containing a single Sodium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + NeuroML file containing a single Sodium Channel description, from the Hippocampal CA3 neuron model presented in Traub et al., 1991. + + + + + + + Traub, R. D., Wong, R. K., Miles, R., and Michelson, H. (1991). A model of a CA3 hippocampal pyramidal neuron incorporating voltage-clamp data on intrinsic conductances. Journal of neurophysiology, 66(2), 635-50. + + + - - + + + + Na channels + + + - + + + - + + + + - + + + + - + + - + diff --git a/neuroConstruct/generatedNeuroML2/bask_soma.cell.nml b/neuroConstruct/generatedNeuroML2/bask_soma.cell.nml index 968a11e..629e3a4 100644 --- a/neuroConstruct/generatedNeuroML2/bask_soma.cell.nml +++ b/neuroConstruct/generatedNeuroML2/bask_soma.cell.nml @@ -1,5 +1,5 @@ - + diff --git a/neuroConstruct/generatedNeuroML2/pyr_4_sym_soma.cell.nml b/neuroConstruct/generatedNeuroML2/pyr_4_sym_soma.cell.nml index 45d12d2..ce32fcc 100644 --- a/neuroConstruct/generatedNeuroML2/pyr_4_sym_soma.cell.nml +++ b/neuroConstruct/generatedNeuroML2/pyr_4_sym_soma.cell.nml @@ -1,5 +1,5 @@ - + From 99f80dd0aec5c5b286bee1d5d4eddbb7efdadaf3 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 2 May 2024 15:18:31 +0100 Subject: [PATCH 10/11] More mac tests --- .github/workflows/omv-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index 7adbba4..da2d09f 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -16,7 +16,7 @@ jobs: matrix: python-version: [ "3.10" ] engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_validate, jNeuroML_validatev1, jNeuroML_EDEN ] - runs-on: [ubuntu-latest, macos-latest, macos-14 ] + runs-on: [ubuntu-latest, macos-latest, macos-12 ] steps: - uses: actions/checkout@v4 @@ -26,8 +26,8 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Install HDF5 for pytables on macos-14 - if: ${{ matrix.runs-on == 'macos-14' }} + - name: Install HDF5 for pytables on macos-latest + if: ${{ matrix.runs-on == 'macos-latest' }} run: | brew install hdf5 From 0059494127344bfbc2707991d86c5de80629e27e Mon Sep 17 00:00:00 2001 From: pgleeson Date: Thu, 2 May 2024 16:11:28 +0100 Subject: [PATCH 11/11] Rmove macos-12 - eden compatibility issues not a concern of this repo... --- .github/workflows/omv-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml index da2d09f..f0324c7 100644 --- a/.github/workflows/omv-ci.yml +++ b/.github/workflows/omv-ci.yml @@ -16,7 +16,7 @@ jobs: matrix: python-version: [ "3.10" ] engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_validate, jNeuroML_validatev1, jNeuroML_EDEN ] - runs-on: [ubuntu-latest, macos-latest, macos-12 ] + runs-on: [ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v4