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

Upgrade to sundials 5.7.0 #1392

Merged
merged 14 commits into from
Feb 1, 2021
Merged

Upgrade to sundials 5.7.0 #1392

merged 14 commits into from
Feb 1, 2021

Conversation

dweindl
Copy link
Member

@dweindl dweindl commented Jan 30, 2021

  • Upgrade to sundials 5.7.0
  • Remove a load of unused sundials components

@codecov
Copy link

codecov bot commented Jan 30, 2021

Codecov Report

Merging #1392 (5b306cd) into develop (4cf9473) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1392      +/-   ##
===========================================
+ Coverage    78.69%   78.70%   +0.01%     
===========================================
  Files           63       63              
  Lines         9925     9925              
===========================================
+ Hits          7810     7811       +1     
+ Misses        2115     2114       -1     
Flag Coverage Δ
cpp 75.19% <ø> (+0.01%) ⬆️
petab 69.55% <ø> (ø)
python 67.98% <ø> (ø)

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

Impacted Files Coverage Δ
src/amici.cpp 79.81% <0.00%> (ø)
src/sundials_matrix_wrapper.cpp 84.04% <0.00%> (+0.21%) ⬆️

@dweindl
Copy link
Member Author

dweindl commented Jan 30, 2021

@FFroehlich Any idea what could be wrong with test_compare_conservation_laws_sbml (https://github.com/AMICI-dev/AMICI/runs/1797159532?check_suite_focus=true)?

(rdata['preeq_status'][0] is failed instead of expected failed_factorization)

@dweindl dweindl linked an issue Jan 30, 2021 that may be closed by this pull request
Comment on lines -184 to +194
#define SUNLS_ATIMES_FAIL_UNREC -804 /* atimes unrecoverable failure */
#define SUNLS_PSET_FAIL_UNREC -805 /* pset unrecoverable failure */
#define SUNLS_PSOLVE_FAIL_UNREC -806 /* psolve unrecoverable failure */
#define SUNLS_PACKAGE_FAIL_UNREC -807 /* external package unrec. fail */
#define SUNLS_GS_FAIL -808 /* Gram-Schmidt failure */
#define SUNLS_QRSOL_FAIL -809 /* QRsol found singular R */
#define SUNLS_VECTOROP_ERR -810 /* vector operation error */
#define SUNLS_ATIMES_NULL -804 /* atimes function is NULL */
#define SUNLS_ATIMES_FAIL_UNREC -805 /* atimes unrecoverable failure */
#define SUNLS_PSET_FAIL_UNREC -806 /* pset unrecoverable failure */
#define SUNLS_PSOLVE_NULL -807 /* psolve function is NULL */
#define SUNLS_PSOLVE_FAIL_UNREC -808 /* psolve unrecoverable failure */
#define SUNLS_PACKAGE_FAIL_UNREC -809 /* external package unrec. fail */
#define SUNLS_GS_FAIL -810 /* Gram-Schmidt failure */
#define SUNLS_QRSOL_FAIL -811 /* QRsol found singular R */
#define SUNLS_VECTOROP_ERR -812 /* vector operation error */
Copy link
Member Author

@dweindl dweindl Jan 30, 2021

Choose a reason for hiding this comment

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

Return codes for linear solvers have changed here (new ones + changed values), that is why test_compare_conservation_laws_sbml fails. @paulstapor or @FFroehlich , could you please have a look how SteadystateProblem and defines.h needs to be updated?

We should either get rid of the AMICI_* defines copying these values or adding respective static assertions somewhere, as done for other values.

Copy link
Member

Choose a reason for hiding this comment

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

will do

Copy link
Member

Choose a reason for hiding this comment

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

done

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.

Nice 👍 , was deleting python/tests/solverSettings.hdf5 intentional?

@dweindl
Copy link
Member Author

dweindl commented Jan 31, 2021

was deleting python/tests/solverSettings.hdf5 intentional?

I wasn't aware of deleting it. But that file never should have been added to version control. So yes, intentional :)

@sonarcloud
Copy link

sonarcloud bot commented Feb 1, 2021

Kudos, SonarCloud Quality Gate passed!

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

No Coverage information No Coverage information
0.0% 0.0% Duplication

@FFroehlich FFroehlich merged commit b94525e into develop Feb 1, 2021
@FFroehlich FFroehlich deleted the sundials branch February 1, 2021 18:46
@dweindl dweindl mentioned this pull request Feb 19, 2021
dweindl added a commit that referenced this pull request Feb 20, 2021
….13)

Breaking changes:
* AMICI requires Python>=3.7
* Updated package installation (PEP517/518): 
  Creating source distributions requires https://github.com/pypa/build (#1384)
  (but now handles all package building dependencies properly)

Features:
* More flexible state reinitialization (#1417)

Updated dependencies:
* Upgrade to sundials 5.7.0 (#1392)

Fixes:
* Python: account for heaviside functions in expressions (#1382)
* Python: allow loading of existing models in import_petab_problem (#1383)
* Python: Don't override user-provided compiler/linker flags (#1389)
* Python: PEtab import reinitialization fixes (#1417)
* Python: Fix PEtab observables for pysb models (#1390)
* Python: Substitute expressions in event condition expressions (#1404)
* Python: Unspecified initial states in PEtab conditions table default to SBML initial value (#1397)
* C++: Fix timepoint out of bounds access (#1402)
* C++: Fix exported CMake config (#1388)
* Fixed Dockerfile: add python3-venv (#1398, #1408)

Other:
* Slim exported swig interface (#1425)
* Updated documentation
    * Getting started tutorial (#1423)
    * List supported SBML test tags (#1428)
    * Add AMICI C++/Python/Matlab feature comparison (#1409)
    * ...
* Various minor CI improvements
* ...
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.

Update to sundials 5.7
2 participants