Merge pull request #21 from OpenSourceBrain/development

Development
OpenSourceBrain · Jul 31, 2024 · 5d1c9ae · 5d1c9ae
2 parents 2e39ef2 + eb9b8f7
commit 5d1c9ae
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 5 deletions.
diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml
@@ -15,9 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [ 3.9 ]
-        runs-on: [ ubuntu-latest ]
+        runs-on: [ ubuntu-latest, macos-latest ]
         engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_EDEN, jNeuroML_validate, jNeuroML_validatev1, Py_neuroConstruct ]
-
+        exclude:
+          - runs-on: macos-latest
+            engine: "Py_neuroConstruct"
+
     steps:
     - uses: actions/checkout@v4
 
@@ -26,6 +29,12 @@ jobs:
       with:
         python-version:  ${{ matrix.python-version }}
 
+
+    - name: Install HDF5 for pytables on macos-latest
+      if: ${{ matrix.runs-on == 'macos-latest' }}
+      run: |
+        brew install hdf5
+        
     - name: Install OMV
       run: |
         pip install git+https://github.com/OpenSourceBrain/osb-model-validation

diff --git a/neuroConstruct/generatedNeuroML2/.test.jnmlnetpyne.omt b/neuroConstruct/generatedNeuroML2/.test.jnmlnetpyne.omt
@@ -0,0 +1,17 @@
+# Script for running automated tests on OSB using Travis-CI, see https://github.com/OpenSourceBrain/osb-model-validation
+
+target: LEMS_Thalamocortical.xml 
+engine: jNeuroML_NetPyNE
+mep: .test.mep
+experiments:
+  Current clamp:
+    observables:
+      spike times:
+        file: 
+          path: CG_CML_0.0.dat
+          columns: [0,1]
+          scaling: [1, 1]
+        spike detection: 
+          method: threshold
+          threshold: 0
+        tolerance: 0.0006224451876625568
diff --git a/neuroConstruct/generatedNeuroML2/.test.jnmlnrn.omt b/neuroConstruct/generatedNeuroML2/.test.jnmlnrn.omt
@@ -14,4 +14,4 @@ experiments:
         spike detection: 
           method: threshold
           threshold: 0
-        tolerance: 0.000623
+        tolerance: 0.0006224451876625568
diff --git a/neuroConstruct/generatedNeuroML2/.test.l23frb.jnmlnetpyne.omt b/neuroConstruct/generatedNeuroML2/.test.l23frb.jnmlnetpyne.omt
@@ -0,0 +1,17 @@
+# Script for running automated tests on OSB using Travis-CI, see https://github.com/OpenSourceBrain/osb-model-validation
+
+target: LEMS_L23PyrFRB.xml
+engine: jNeuroML_NetPyNE
+mep: ../../NeuroML2/test/.test.l23frb.mep
+experiments:
+  L23FRB:
+    observables:
+      spike times:
+        file: 
+          path: CGsuppyrFRB_0.0.dat
+          columns: [0,1]
+          scaling: [1, 1]
+        spike detection: 
+          method: threshold
+          threshold: 0
+        tolerance: 0.0060422960725075164
diff --git a/neuroConstruct/generatedNeuroML2/.test.l23frb.jnmlnrn.omt b/neuroConstruct/generatedNeuroML2/.test.l23frb.jnmlnrn.omt
@@ -14,4 +14,4 @@ experiments:
         spike detection: 
           method: threshold
           threshold: 0
-        tolerance: 0.006043
+        tolerance: 0.006042296072507726
diff --git a/neuroConstruct/generatedNeuroML2/.test.supaxax.jnmleden.omt_ b/neuroConstruct/generatedNeuroML2/.test.supaxax.jnmleden.omt_
@@ -14,4 +14,4 @@ experiments:
         spike detection:
           method: threshold
           threshold: 0
-        tolerance: 0.012777811381621991
+        tolerance: 0.012777811381621991