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

Release 0.30.0 #2622

Merged
merged 15 commits into from
Dec 10, 2024
Merged

Release 0.30.0 #2622

merged 15 commits into from
Dec 10, 2024

Conversation

dweindl
Copy link
Member

@dweindl dweindl commented Dec 9, 2024

No description provided.

dweindl and others added 12 commits November 28, 2024 12:52
SUNContext for `x_pos_tmp_` wasn't updated after copying.

Hopefully fixes AMICI-dev#2607.
)

During PEtab parameter mapping, fill in fixed parameter values for
initial values if requested. So far, this was only done for other
parameters.

Update documentation for amici/petab/parameter_mapping.py

Fixes AMICI-dev#2610.
* add jax serialisation

* doc

* bad ruff

* bad ruff
* add jax serialisation

* doc

* no compilation for jax

* bad ruff

* Update ExampleJaxPEtab.ipynb

* bad ruff

* Update ExampleJaxPEtab.ipynb
* refactor

* correct doc

* remove PK

* fix tests

* fix notebook

* fix parameter ids

* fix jax test

* fix notebook

* reviews

* fixup
* mark jax experimental

* add JAX import warning to pyest.ini
)

* disentangle sim & preeq

* disentangle sim & preeq

* run preequilibration once

* fix symlink

* separate default dirs for jax/cpp, honour model dir/name

* fix notebook

* fix path SNAFU

* fix models without preequilibration

* fix tests

* fixup

* fix doc typehints

* fix notebook

* fix output dict construction

* fix notebook
* disentangle sim & preeq

* disentangle sim & preeq

* run preequilibration once

* fix symlink

* separate default dirs for jax/cpp, honour model dir/name

* fix notebook

* fix path SNAFU

* fix models without preequilibration

* fix tests

* fixup

* fix doc typehints

* fix notebook

* implement jax-based reinitialisation

* add more defaults & doc

* fix state ids

* fix template

* Update model.py

* breaking jax release

* add jax runner to petab testsuite & fix

* fix notebook

* refactor petab test cases

* fix parameter unscaling

* fixups

* refactor & simplify

* fixup

* fix notebook

* fixup

* Update petab.py
Copy link

codecov bot commented Dec 9, 2024

Codecov Report

Attention: Patch coverage is 92.09040% with 28 lines in your changes missing coverage. Please review.

Project coverage is 77.17%. Comparing base (d2fbf91) to head (e55554e).
Report is 16 commits behind head on master.

Files with missing lines Patch % Lines
python/sdist/amici/jax/model.py 91.66% 6 Missing ⚠️
python/sdist/amici/petab/pysb_import.py 0.00% 6 Missing ⚠️
python/sdist/amici/petab/sbml_import.py 90.90% 6 Missing ⚠️
python/sdist/amici/petab/parameter_mapping.py 57.14% 3 Missing ⚠️
python/sdist/amici/pysb_import.py 76.92% 3 Missing ⚠️
python/sdist/amici/jax/ode_export.py 96.87% 2 Missing ⚠️
python/sdist/amici/jax/petab.py 98.83% 1 Missing ⚠️
python/sdist/amici/petab/import_helpers.py 90.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2622      +/-   ##
==========================================
- Coverage   77.63%   77.17%   -0.47%     
==========================================
  Files         329      332       +3     
  Lines       21708    22957    +1249     
  Branches     1477     1477              
==========================================
+ Hits        16853    17717     +864     
- Misses       4844     5229     +385     
  Partials       11       11              
Flag Coverage Δ
cpp 76.33% <66.21%> (+2.81%) ⬆️
cpp_python 33.49% <13.17%> (-0.66%) ⬇️
petab 38.35% <91.21%> (+1.40%) ⬆️
python 72.25% <81.63%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
include/amici/model_state.h 97.02% <100.00%> (+0.02%) ⬆️
python/sdist/amici/__init__.py 91.81% <ø> (-2.30%) ⬇️
python/sdist/amici/de_export.py 95.34% <100.00%> (-1.28%) ⬇️
python/sdist/amici/jax/__init__.py 100.00% <100.00%> (ø)
python/sdist/amici/jax/jaxcodeprinter.py 84.61% <100.00%> (ø)
python/sdist/amici/petab/petab_import.py 76.27% <100.00%> (+9.60%) ⬆️
python/sdist/amici/sbml_import.py 79.76% <100.00%> (+0.19%) ⬆️
python/sdist/amici/jax/petab.py 98.14% <98.83%> (+69.57%) ⬆️
python/sdist/amici/petab/import_helpers.py 86.66% <90.00%> (+0.72%) ⬆️
python/sdist/amici/jax/ode_export.py 96.87% <96.87%> (ø)
... and 5 more

... and 43 files with indirect coverage changes

* Tests: Skip llh test for Isensee_JCB2018

Until it has been decided which model/dataset is the correct one, and the expected llh is updated accordingly.

See Benchmarking-Initiative/Benchmark-Models-PEtab#253

* fix broken pytest invocation
@dweindl dweindl marked this pull request as ready for review December 10, 2024 11:57
@dweindl dweindl requested a review from a team as a code owner December 10, 2024 11:57
@dweindl dweindl merged commit 2d58f54 into AMICI-dev:master Dec 10, 2024
33 of 34 checks passed
@dweindl dweindl deleted the release branch December 10, 2024 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants