Skip to content

Conversation

@dweindl
Copy link
Member

@dweindl dweindl commented May 20, 2022

This implements a proof of concept for the PEtab multi-language proposal.
Handles PySB-PEtab problems using the recent PEtab model abstraction (PEtab-dev/libpetab-python#145).
Removes the (need for the) current PysbPetabProblem and allows for importing PEtab problems through a single interface.

Runs the tentative PEtab version 2 test cases from PEtab-dev/petab_test_suite#53.

Blocked by pysb/pysb#570
Blocked by PEtab-dev/libpetab-python#203

@codecov
Copy link

codecov bot commented May 20, 2022

Codecov Report

Merging #1800 (54fb4ee) into develop (06e7442) will increase coverage by 0.18%.
The diff coverage is 73.71%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1800      +/-   ##
===========================================
+ Coverage    76.11%   76.29%   +0.18%     
===========================================
  Files           80       81       +1     
  Lines        14840    15959    +1119     
===========================================
+ Hits         11295    12176     +881     
- Misses        3545     3783     +238     
Flag Coverage Δ
cpp 73.50% <ø> (-0.06%) ⬇️
petab 54.40% <73.71%> (+4.93%) ⬆️
python 76.80% <22.28%> (-0.07%) ⬇️
sbmlsuite ?

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

Impacted Files Coverage Δ
python/sdist/amici/petab_import_pysb.py 63.52% <61.97%> (+54.27%) ⬆️
python/sdist/amici/petab_objective.py 90.03% <73.68%> (-4.16%) ⬇️
python/sdist/amici/petab_import.py 68.01% <89.47%> (-1.43%) ⬇️
python/sdist/amici/petab_util.py 92.59% <92.59%> (ø)
python/sdist/amici/parameter_mapping.py 84.21% <100.00%> (+0.11%) ⬆️

... and 8 files with indirect coverage changes

@dweindl dweindl force-pushed the petab_abstract_model branch from b24f413 to 4116235 Compare May 21, 2022 16:47
@dweindl dweindl force-pushed the petab_abstract_model branch from 2d5b6ad to 91dbfc7 Compare May 24, 2022 15:20
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@dweindl dweindl changed the title Test new PEtab model abstraction PEtab-multilanguage proof of concept for PySB-PEtab Jul 22, 2022
Comment on lines +33 to +35
pytest-cov cmake_build_extension numpy
pip install git+https://github.com/FFroehlich/pysb@fix_pattern_matching # pin to PR for SPM with compartments
pip install --verbose -e ${AMICI_PATH}/python/sdist[petab,test,vis] --no-build-isolation
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pytest-cov cmake_build_extension numpy
pip install git+https://github.com/FFroehlich/pysb@fix_pattern_matching # pin to PR for SPM with compartments
pip install --verbose -e ${AMICI_PATH}/python/sdist[petab,test,vis] --no-build-isolation
pytest-cov cmake_build_extension numpy
pip install --verbose -e ${AMICI_PATH}/python/sdist[petab,test,pysb,vis] --no-build-isolation

before merge

@dweindl dweindl marked this pull request as ready for review May 16, 2023 05:51
@dweindl dweindl requested a review from a team as a code owner May 16, 2023 05:51
Copy link
Member

@FFroehlich FFroehlich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -1,4 +1,5 @@
# NOTE: relative paths are expected to be relative to the repository root
#git+https://github.com/PEtab-dev/libpetab-python@develop#egg=petab
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#git+https://github.com/PEtab-dev/libpetab-python@develop#egg=petab
petab>=0.2.1

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current requirement is handled via setup.cfg. Will remove.

@dweindl dweindl enabled auto-merge May 22, 2023 13:37
@dweindl dweindl added this pull request to the merge queue May 22, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 22, 2023
@dweindl dweindl added this pull request to the merge queue May 22, 2023
Merged via the queue into develop with commit d0e8853 May 22, 2023
@dweindl dweindl deleted the petab_abstract_model branch May 23, 2023 07:07
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.

3 participants