Skip to content

Commit

Permalink
Merge branch 'develop' into jax_export
Browse files Browse the repository at this point in the history
  • Loading branch information
FFroehlich committed Oct 24, 2024
2 parents b84dbdb + f5fa6cd commit 37b9329
Show file tree
Hide file tree
Showing 4 changed files with 302 additions and 153 deletions.
23 changes: 14 additions & 9 deletions .github/workflows/test_benchmark_collection_models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,28 @@ jobs:
AMICI_PARALLEL_COMPILE="" pip3 install -v --user \
$(ls -t python/sdist/dist/amici-*.tar.gz | head -1)[petab,test,vis,jax]
- run: |
- name: Install test dependencies
run: |
python3 -m pip uninstall -y petab && python3 -m pip install git+https://github.com/petab-dev/libpetab-python.git@develop \
&& python3 -m pip install -U sympy
&& python3 -m pip install -U sympy \
&& python3 -m pip install git+https://github.com/ICB-DCM/fiddy.git
# retrieve test models
- name: Download and test benchmark collection
- name: Download benchmark collection
run: |
pip install git+https://github.com/Benchmarking-Initiative/Benchmark-Models-PEtab.git@master#subdirectory=src/python \
&& AMICI_PARALLEL_COMPILE="" tests/benchmark-models/test_benchmark_collection.sh
# run gradient checks
- name: Run Gradient Checks
- name: Run tests
env:
AMICI_PARALLEL_COMPILE: ""
run: |
cd tests/benchmark-models && pytest --durations=10
# collect & upload results
- name: Aggregate results
run: |
pip install git+https://github.com/ICB-DCM/fiddy.git \
&& cd tests/benchmark-models && pytest --durations=10 ./test_petab_benchmark.py
cd tests/benchmark-models && python3 evaluate_benchmark.py
# upload results
- uses: actions/upload-artifact@v4
with:
name: computation-times-${{ matrix.python-version }}-${{ matrix.extract_subexpressions }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test_python_cplusplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ jobs:
macos_cpp_py:
name: Tests MacOS C++/Python
runs-on: macos-latest
env:
PYTHONFAULTHANDLER: "1"

steps:
- name: Set up Python
Expand Down Expand Up @@ -295,6 +297,8 @@ jobs:
macos_python:
name: Tests MacOS Python
runs-on: macos-latest
env:
PYTHONFAULTHANDLER: "1"

steps:
- name: Cache
Expand Down
124 changes: 0 additions & 124 deletions tests/benchmark-models/test_benchmark_collection.sh

This file was deleted.

Loading

0 comments on commit 37b9329

Please sign in to comment.