Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
e275945
testing with python 3.11
Monsurat-Onabajo Jan 14, 2023
e65cb24
Fix for SwinTransformer model in torchvision
davidt0x Mar 16, 2023
cdb8050
Merge branch 'development' of https://github.com/ModECI/MDF into test…
davidt0x Mar 16, 2023
8361bd7
Mark maxvit_t, inception_v3, and resnet101 as xfail.
davidt0x Mar 16, 2023
38b28a5
Remove version cap on torchvision.
davidt0x Mar 16, 2023
975af47
Add some code to speedup slow torchvision model tests
davidt0x May 18, 2023
7823fb7
Pin ir_version to 8
davidt0x May 18, 2023
d17873b
feat: bump deps for py3.11
sanjayankur31 Jul 26, 2023
1352ca9
ci(py311): add to matrix
sanjayankur31 Jul 26, 2023
7d25b9b
Disable SWIN model from torchvision for now
davidt0x Aug 2, 2023
ec8915c
Remove pins on onnx
pgleeson Aug 9, 2023
3bf6c37
Tweak keras script
pgleeson Aug 9, 2023
abb9c07
Merge branch 'feature/update_onnx' into version_update
pgleeson Aug 9, 2023
4897316
Merge pull request #372 from ModECI/version_update
pgleeson Aug 9, 2023
7a9608a
Fixes for newer ONNX
davidt0x Aug 30, 2023
c2d7618
Merge branch 'development' of https://github.com/ModECI/MDF into fix_…
davidt0x Aug 30, 2023
c84978b
Merge branch 'feature/update_onnx' of https://github.com/ModECI/MDF i…
davidt0x Aug 30, 2023
45511d0
Run pre-commit
davidt0x Aug 30, 2023
649e0c6
Fix key name for ONNX example.
davidt0x Aug 30, 2023
b0f3ed0
Pin tensorflow
davidt0x Aug 30, 2023
ae0159e
Another attempted fix for TypeError: weight_decay
davidt0x Aug 30, 2023
4c55b92
Install graphviz cross-platform
davidt0x Aug 31, 2023
66e453a
Re-consolidate windows tests
davidt0x Aug 31, 2023
f0b0475
Pre-commit
davidt0x Aug 31, 2023
6042eca
Add full testing on 3.10
davidt0x Aug 31, 2023
ffee019
Drop 3.11 testing for now.
davidt0x Aug 31, 2023
59f3963
Merge branch 'development' into fix_torch_v2
pgleeson Sep 6, 2023
ce187cb
Merge pull request #484 from ModECI/fix_torch_v2
pgleeson Sep 6, 2023
7222224
Update onnx examples to change /A/Add->Add_1 etc
pgleeson Sep 6, 2023
a20fc5f
Tested again with torch 2.0.1
pgleeson Sep 6, 2023
29d286e
Merge branch 'nml_examples' into feature/update_onnx
pgleeson Sep 6, 2023
8448f2d
Regenerated some images
pgleeson Sep 6, 2023
509b2b1
Merge branch 'development' into feature/update_onnx
pgleeson Sep 15, 2023
329ef62
TensorFlow fixes
pgleeson Sep 15, 2023
6827b82
Add lower pin on tensorflow
pgleeson Sep 15, 2023
ca35d82
Merge branch 'development' into feature/update_onnx
pgleeson Sep 15, 2023
296b8af
To v0.4.9
pgleeson Sep 15, 2023
5ee8522
Regenerated onnx docs
pgleeson Sep 15, 2023
100b618
Test on py3.11
pgleeson Sep 16, 2023
1bb2503
Avoid Tensorflow for now on py3.11
pgleeson Sep 16, 2023
f2d968b
Don't test psyneulink on py3.11
pgleeson Sep 16, 2023
2375fdf
Merge branch 'feat/py311' of github.com:sanjayankur31/MDF into sanjay…
pgleeson Sep 18, 2023
d379f20
Merge branch 'sanjayankur31-feat/py311' into feature/update_onnx
pgleeson Sep 18, 2023
1011825
Pin back to grpcio-tools==1.42.0 for psyneulink
pgleeson Sep 18, 2023
fca26bf
Merge pull request #490 from ModECI/feature/update_onnx
pgleeson Sep 18, 2023
4038801
Regenerated with latest nml libraries
pgleeson Oct 18, 2023
7a6ffb2
Regenerated with latest pyneuroml
pgleeson Oct 25, 2023
ab99f39
Py3.7 not supported, 3.11 is
pgleeson Dec 14, 2023
fb223d7
Regenerated nml
pgleeson Feb 1, 2024
164178f
Limit graph_scheduler<1.2.0,>=1.1.1
pgleeson Feb 1, 2024
0892259
Test torch<2.2.0,>=1.11.0
pgleeson Feb 1, 2024
48c7518
Merge pull request #494 from ModECI/nml_examples
pgleeson Feb 1, 2024
2cb29dd
Update GHA versions
pgleeson Feb 7, 2024
18c6a2f
Merge pull request #499 from ModECI/main
pgleeson Mar 5, 2024
065fb63
Merge pull request #500 from ModECI/nml_examples
pgleeson Mar 5, 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
37 changes: 13 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
- uses: pre-commit/[email protected]
Expand All @@ -27,13 +27,13 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.8", "3.9", "3.10"]
python-version: [ "3.8", "3.10", "3.11"]
runs-on: [ubuntu-latest, macos-latest, windows-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand Down Expand Up @@ -62,48 +62,37 @@ jobs:

- name: Install most optional dependencies
run: |
python -m pip install .[all_except_psyneulink]
python -m pip install .[optional]

- name: Version info for optional installed packages
run: |
pip list

- name: Install graphviz
if: ${{ matrix.runs-on != 'windows-latest' }}
run: |
if [[ ${{ matrix.runs-on }} == *"macos"* ]]; then brew install graphviz ; fi
if [[ ${{ matrix.runs-on }} == *"ubuntu"* ]]; then sudo apt install graphviz ; fi
uses: ts-graphviz/setup-graphviz@v1

- name: Test interface ACT-R
if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
run: |
python -m pytest -v -m "actr" tests/

- name: Test interface PyTorch
if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
run: |
python -m pytest -v -m "pytorch" tests/

- name: Test interface NeuroML
if: ${{ matrix.python-version != '3.10' || matrix.runs-on != 'windows-latest' }}
run: |
python -m pip install .[neuroml]
python -m pytest -v -m "neuroml" tests/

- name: Test interface TensorFlow linux/mac
if: ${{ matrix.runs-on != 'windows-latest' }}
run: |
dot -V
python -m pytest -v -m "tensorflow" tests/

- name: Test interface TensorFlow windows
if: ${{ matrix.python-version != '3.10' && matrix.runs-on == 'windows-latest' }}
- name: Test interface TensorFlow
if: ${{ matrix.python-version != '3.11'}}
run: |
choco install graphviz
python -m pip install .[tensorflow]
dot -V
python -m pytest -v -m "tensorflow" tests/

- name: Test interface PsyNeuLink
if: ${{ matrix.python-version != '3.10' }}
if: ${{ matrix.python-version != '3.11'}}
run: |
python -m pip install .[psyneulink]
python -m pytest -v -m "psyneulink" tests/
Expand All @@ -125,7 +114,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build sdist and wheel
run: pipx run --spec build pyproject-build
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,4 @@ examples/TensorFlow/Keras/keras_to_MDF
/examples/TensorFlow/Keras/MNIST/keras_to_MDF
/examples/TensorFlow/Keras/MNIST/keras_to_MDF.1
/examples/TensorFlow/Keras/IRIS/keras_to_MDF.1
/checkout_pngs.sh
106 changes: 53 additions & 53 deletions docs/MDF_function_specifications.json

Large diffs are not rendered by default.

Loading