diff --git a/src/3rdparty/SUNDIALS/CMakeLists.txt b/src/3rdparty/SUNDIALS/CMakeLists.txt index 46d245508..fb678f1ed 100644 --- a/src/3rdparty/SUNDIALS/CMakeLists.txt +++ b/src/3rdparty/SUNDIALS/CMakeLists.txt @@ -13,9 +13,9 @@ # limitations under the License. set(PACKAGE_NAME SUNDIALS) -set(PACKAGE_VERSION v7.0.0) +set(PACKAGE_VERSION v7.1.0) set(PACKAGE_REPOSITORY sundials) -set(RELEASE_TAG v7.0.0) +set(RELEASE_TAG v7.1.0) set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME}) # Either retrieve or build our package. @@ -24,32 +24,32 @@ if(LIBOPENCOR_PREBUILT_SUNDIALS) if(EMSCRIPTEN) retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION} ${PACKAGE_REPOSITORY} ${RELEASE_TAG} - 78bce667f10758e3e5f2fcdc56a401514e323c0d) + c9f7012b681622c4faa18d2b68f9dee2c236ea74) else() if(WIN32) if(RELEASE_MODE) retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION} ${PACKAGE_REPOSITORY} ${RELEASE_TAG} - 4ae38fb1382236a092282c9cb5cd456db6ab746c) + 519fd7c2133ed7efb666193028b50ac4f788f416) else() retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION} ${PACKAGE_REPOSITORY} ${RELEASE_TAG} - b2725d3140839774a5f253d59f39fda2cd33cfe0) + 1bcd8ca9cea9b0d03f35b66058b53e1f06791d03) endif() elseif(APPLE) if(INTEL_MODE) retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION} ${PACKAGE_REPOSITORY} ${RELEASE_TAG} - c55dc7e76e72eb2389b7902b67ccbe3e3a344ef0) + c07da207a1da3da0dfb638c5bc2ba8908be7007f) else() retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION} ${PACKAGE_REPOSITORY} ${RELEASE_TAG} - 35e6771a04f8943353b3ebef009d04fd3ed02bdf) + c54fd6934c2a72f99ba21dcb88e4d07f9b3e4d00) endif() else() retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION} ${PACKAGE_REPOSITORY} ${RELEASE_TAG} - 737f908f53c3a70224cea78ed5a5bf290207261c) + 3af6ee478c72261af012eb400fc1bd0e114c1727) endif() endif() else() diff --git a/tests/api/sed/runtests.cpp b/tests/api/sed/runtests.cpp index d2af9017c..aa4cc7ae5 100644 --- a/tests/api/sed/runtests.cpp +++ b/tests/api/sed/runtests.cpp @@ -119,17 +119,7 @@ namespace { void runOdeModel(bool pCompiled) { static const libOpenCOR::ExpectedIssues expectedIssues = { -#if defined(BUILDING_ON_WINDOWS) {libOpenCOR::Issue::Type::ERROR, "At t = 0.00140014, mxstep steps taken before reaching tout."}, -#elif defined(BUILDING_ON_LINUX) - {libOpenCOR::Issue::Type::ERROR, "At t = 1, mxstep steps taken before reaching tout."}, -#else -# ifdef BUILDING_ON_INTEL - {libOpenCOR::Issue::Type::ERROR, "At t = 5.00577e+06, mxstep steps taken before reaching tout."}, -# else - {libOpenCOR::Issue::Type::ERROR, "At t = 0.00140014, mxstep steps taken before reaching tout."}, -# endif -#endif }; auto file = libOpenCOR::File::create(libOpenCOR::resourcePath(libOpenCOR::CELLML_2_FILE)); diff --git a/tests/api/version/tests.cpp b/tests/api/version/tests.cpp index 952ee153c..7b3f3c25a 100644 --- a/tests/api/version/tests.cpp +++ b/tests/api/version/tests.cpp @@ -62,6 +62,6 @@ TEST(VersionTest, LLVM) TEST(VersionTest, SUNDIALS) { - EXPECT_EQ(0x070000U, libOpenCOR::sundialsVersion()); - EXPECT_EQ("7.0.0", libOpenCOR::sundialsVersionString()); + EXPECT_EQ(0x070100U, libOpenCOR::sundialsVersion()); + EXPECT_EQ("7.1.0", libOpenCOR::sundialsVersionString()); } diff --git a/tests/bindings/javascript/version.test.js b/tests/bindings/javascript/version.test.js index a5c31c278..03cf3918b 100644 --- a/tests/bindings/javascript/version.test.js +++ b/tests/bindings/javascript/version.test.js @@ -40,7 +40,7 @@ describe("Version tests", () => { }); test("SUNDIALS", () => { - expect(libopencor.sundialsVersion()).toBe(0x070000); - expect(libopencor.sundialsVersionString()).toBe("7.0.0"); + expect(libopencor.sundialsVersion()).toBe(0x070100); + expect(libopencor.sundialsVersionString()).toBe("7.1.0"); }); }); diff --git a/tests/bindings/python/test_sed_run.py b/tests/bindings/python/test_sed_run.py index d61d77860..31f7d96e3 100644 --- a/tests/bindings/python/test_sed_run.py +++ b/tests/bindings/python/test_sed_run.py @@ -135,19 +135,7 @@ def run_ode_model(compiled): expected_issues = [ [ Issue.Type.Error, - ( - "At t = 0.00140014, mxstep steps taken before reaching tout." - if platform.system() == "Windows" - else ( - "At t = 1, mxstep steps taken before reaching tout." - if platform.system() == "Linux" - else ( - "At t = 5.00577e+06, mxstep steps taken before reaching tout." - if platform.machine() == "x86_64" - else "At t = 0.00140014, mxstep steps taken before reaching tout." - ) - ) - ), + "At t = 0.00140014, mxstep steps taken before reaching tout.", ], ] diff --git a/tests/bindings/python/test_version.py b/tests/bindings/python/test_version.py index a70c28de1..fc5d44c9c 100644 --- a/tests/bindings/python/test_version.py +++ b/tests/bindings/python/test_version.py @@ -88,9 +88,9 @@ def test_llvm_version_string(): def test_sundials_version(): assert isinstance(oc.sundials_version(), int) - assert oc.sundials_version() == 0x070000 + assert oc.sundials_version() == 0x070100 def test_sundials_version_string(): assert isinstance(oc.sundials_version_string(), str) - assert oc.sundials_version_string() == "7.0.0" + assert oc.sundials_version_string() == "7.1.0"