Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sllh computation back to petab_objective.simulate_petab #1548

Merged
merged 79 commits into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from 74 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
4dc559a
add sllh to `simulate_petab`
dilpath Sep 13, 2021
2a7fb85
use ExpData for plist if available
dilpath Sep 14, 2021
6eb0ddc
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Oct 11, 2021
9f4613c
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Oct 16, 2021
5e666cb
use plist if set; breakpoint at error; preliminary test
dilpath Oct 25, 2021
6b0be2b
add sensi test to preexisting benchmark model test
dilpath Oct 27, 2021
16d646b
remove outdated test and test cases
dilpath Oct 27, 2021
a408330
add FD check for petab problems; add petab problem test case for SLLH…
dilpath Nov 4, 2021
bb1412a
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Nov 4, 2021
3f7c5ec
typo, RTOL
dilpath Nov 4, 2021
2bcc164
fix paths
dilpath Nov 5, 2021
4e51f91
docs
dilpath Nov 5, 2021
60445b5
Apply suggestions from code review
dilpath Nov 6, 2021
2cc7d66
reviews: docstring;error handling;optional sllh aggregation
dilpath Nov 6, 2021
839f585
Apply suggestions from code review
dilpath Nov 7, 2021
7dee733
review: clean up
dilpath Nov 7, 2021
3d449e5
Merge branch 'develop' into fix_simulate_petab_sllh
Nov 7, 2021
4bc1729
ignore parameters missing due to estimate=0
dilpath Nov 8, 2021
ced3201
Merge branch 'fix_simulate_petab_sllh' of https://github.com/AMICI-de…
dilpath Nov 8, 2021
6e2772e
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Nov 18, 2021
aabbdc4
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Nov 18, 2021
0eaaad0
Merge branch 'develop' into fix_simulate_petab_sllh
Nov 18, 2021
c816303
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Dec 5, 2021
2ed5f12
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Dec 13, 2021
0ba9154
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Jan 10, 2022
e9cf747
add test for petab benchmark models
dilpath Feb 1, 2022
56e66e0
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Feb 2, 2022
5ce0fb5
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Feb 2, 2022
21b2fad
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Feb 4, 2022
87dccb7
use fiddy
dilpath Feb 7, 2022
d103ca0
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Feb 15, 2022
0b9ffc9
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Mar 30, 2022
130eecc
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Apr 24, 2022
f2dc743
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Jun 1, 2022
d76e481
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Jun 22, 2022
785c403
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Jul 19, 2022
2965cb0
develop merge
dweindl Jul 19, 2022
65278b5
fix after merge
dilpath Feb 23, 2023
e0c4c2d
merge conflicts
dilpath Feb 23, 2023
489657f
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath Feb 23, 2023
f33452b
restore changes
dilpath Feb 23, 2023
c667968
make scaled gradients optional, default to linear
dilpath Feb 23, 2023
0de6b24
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Feb 28, 2023
b960fbc
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl Mar 11, 2023
c71bb36
Merge branch 'develop' into fix_simulate_petab_sllh
Apr 11, 2023
1913985
test scaled and unscaled
FFroehlich Apr 16, 2023
a8a098b
Merge branch 'develop' into fix_simulate_petab_sllh
Apr 21, 2023
3b81fa5
add fiddy to installation
FFroehlich Apr 21, 2023
515f554
fix deps
FFroehlich Apr 21, 2023
0b84159
update for fiddy redesign
dilpath May 3, 2023
3f6c47c
fix fiddy version
dilpath May 3, 2023
41cd884
Merge branch 'develop' into fix_simulate_petab_sllh
dilpath May 3, 2023
31c26b5
Merge branch 'develop' into fix_simulate_petab_sllh
FFroehlich May 5, 2023
5b2409a
update benchmark settings
FFroehlich May 6, 2023
b7e4a1b
Merge branch 'fix_simulate_petab_sllh' of https://github.com/AMICI-de…
FFroehlich May 6, 2023
3798277
Merge branch 'develop' into fix_simulate_petab_sllh
FFroehlich May 6, 2023
f502d2c
move tests
FFroehlich May 6, 2023
4cc3feb
Merge branch 'fix_simulate_petab_sllh' of https://github.com/AMICI-de…
FFroehlich May 6, 2023
5d4c670
add fiddy
FFroehlich May 6, 2023
af569e3
Update test_benchmark_collection_models.yml
FFroehlich May 6, 2023
764f68c
fix paths
FFroehlich May 6, 2023
eba5790
Update test_petab_benchmark.py
FFroehlich May 7, 2023
e2759a5
restrict test set
FFroehlich May 7, 2023
4dcb459
Update test_petab_benchmark.py
FFroehlich May 7, 2023
b841596
Update test_petab_benchmark.py
FFroehlich May 7, 2023
0d9e8dd
Update test_petab_benchmark.py
FFroehlich May 7, 2023
4849be4
Update test_petab_benchmark.py
FFroehlich May 7, 2023
574130f
use fiddy main
FFroehlich May 7, 2023
4b16443
Merge branch 'develop' into fix_simulate_petab_sllh
FFroehlich May 8, 2023
0956e24
Update test_petab_benchmark.py
FFroehlich May 8, 2023
cb67463
Merge branch 'develop' into fix_simulate_petab_sllh
FFroehlich May 8, 2023
e462867
oopsie
FFroehlich May 8, 2023
84f1065
Merge branch 'fix_simulate_petab_sllh' of https://github.com/AMICI-de…
FFroehlich May 8, 2023
fa29356
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl May 8, 2023
da6623b
address code review
FFroehlich May 8, 2023
4354faa
remove custom grad check methods; adjust test
dilpath May 8, 2023
ff794f5
Update python/sdist/amici/petab_objective.py
FFroehlich May 8, 2023
6586224
Merge branch 'develop' into fix_simulate_petab_sllh
FFroehlich May 8, 2023
bc4c48c
Merge branch 'develop' into fix_simulate_petab_sllh
dweindl May 9, 2023
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
6 changes: 6 additions & 0 deletions .github/workflows/test_benchmark_collection_models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ jobs:
git clone --depth 1 https://github.com/benchmarking-initiative/Benchmark-Models-PEtab.git \
&& export BENCHMARK_COLLECTION="$(pwd)/Benchmark-Models-PEtab/Benchmark-Models/" \
&& AMICI_PARALLEL_COMPILE=2 tests/benchmark-models/test_benchmark_collection.sh

# run gradient checks
- name: Run Gradient Checks
run: |
pip install git+https://github.com/ICB-DCM/fiddy.git \
dweindl marked this conversation as resolved.
Show resolved Hide resolved
&& cd tests/benchmark-models && pytest ./test_petab_benchmark.py

# upload results
- uses: actions/upload-artifact@v3
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,6 @@ Benchmark-Models-PEtab/
/test_bmc/

CS_Signalling_ERBB_RAS_AKT/
cache_fiddy/*
debug/*
tests/benchmark-models/cache_fiddy/*
1 change: 0 additions & 1 deletion documentation/example_errors.ipynb
FFroehlich marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

Loading