Skip to content

Commit f5ee2dc

Browse files
authored
Merge pull request #461 from ModECI/development
Updates to NeuroML examples; regenerated images; to v0.4.6
2 parents c61fc54 + 82770ce commit f5ee2dc

File tree

159 files changed

+2438
-678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+2438
-678
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,19 @@ jobs:
5959
python -m pytest -m coremdf tests/
6060
6161
- name: Install optional dependencies
62-
run: python -m pip install .[all]
62+
run: |
63+
python -m pip install .[all]
6364
6465
- name: Version info for optional installed packages
6566
run: |
6667
pip list
6768
69+
- name: Install graphviz
70+
if: ${{ matrix.runs-on != 'windows-latest' }}
71+
run: |
72+
if [[ ${{ matrix.runs-on }} == *"macos"* ]]; then brew install graphviz ; fi
73+
if [[ ${{ matrix.runs-on }} == *"ubuntu"* ]]; then sudo apt install graphviz ; fi
74+
6875
- name: Test interface ACT-R
6976
if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
7077
run: |
@@ -88,8 +95,6 @@ jobs:
8895
- name: Test interface TensorFlow linux/mac
8996
if: ${{ matrix.runs-on != 'windows-latest' }}
9097
run: |
91-
if [[ ${{ matrix.runs-on }} == *"macos"* ]]; then brew install graphviz ; fi
92-
if [[ ${{ matrix.runs-on }} == *"ubuntu"* ]]; then sudo apt install graphviz ; fi
9398
dot -V
9499
python -m pytest -v -m "tensorflow" tests/
95100

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,3 +276,5 @@ Thumbs.db #thumbnail cache on Windows
276276
/examples/MDF/NLP/TestNLP
277277
/examples/MDF/conditions/composite_example
278278
/examples/NeuroML/arm64
279+
/examples/MDF/RNN/iaf.net
280+
/examples/MDF/RNN/iaf.net2
1.03 KB
Loading
-294 Bytes
Loading
-10 KB
Loading
1.89 KB
Loading
4.03 KB
Loading
902 Bytes
Loading
-3.91 KB
Loading
-138 Bytes
Loading

0 commit comments

Comments
 (0)