From f5ab18b5e958ce5831996de09f3537ffcd452d73 Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Fri, 30 May 2025 16:08:29 +0200 Subject: [PATCH 1/9] fix: call correct heyoka method in mascon_asteroid --- cascade.py/dynamics/_mascon_asteroid.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cascade.py/dynamics/_mascon_asteroid.py b/cascade.py/dynamics/_mascon_asteroid.py index 300963f6..9aab6049 100644 --- a/cascade.py/dynamics/_mascon_asteroid.py +++ b/cascade.py/dynamics/_mascon_asteroid.py @@ -38,8 +38,7 @@ def mascon_asteroid(Gconst: float, points, masses, omega) -> typing.List[typing. Returns: The dynamics in the same units used by the input arguments. Can be used directly to instantiate a :class:`~cascade.sim`. """ - from heyoka import make_mascon_system - return make_mascon_system(Gconst, points, masses, omega) + return hy.model.mascon(Gconst, masses, points, omega) def mascon_asteroid_energy(state, Gconst: float, points, masses, omega): """Energy in the :class:`~cascade.dynamics.mascon_asteroid` dynamics. From 916c3c1228a78f1bff1b13213bdf3320897d07cc Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Tue, 3 Jun 2025 10:53:16 +0200 Subject: [PATCH 2/9] fix: update includes to account for xtensor breaking changes --- benchmark/2022_leo_pop.cpp | 2 +- benchmark/haumea.cpp | 2 +- test/conj_tracking.cpp | 2 +- test/domain_exit.cpp | 2 +- test/heyoka_comparison.cpp | 2 +- test/interrupt_order.cpp | 2 +- test/invalid_state.cpp | 2 +- test/reentry.cpp | 2 +- test/single_collision.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benchmark/2022_leo_pop.cpp b/benchmark/2022_leo_pop.cpp index 9e1c56ae..065f36fa 100644 --- a/benchmark/2022_leo_pop.cpp +++ b/benchmark/2022_leo_pop.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/benchmark/haumea.cpp b/benchmark/haumea.cpp index 14990562..2169167c 100644 --- a/benchmark/haumea.cpp +++ b/benchmark/haumea.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/test/conj_tracking.cpp b/test/conj_tracking.cpp index 2a3bf398..5bc0e20c 100644 --- a/test/conj_tracking.cpp +++ b/test/conj_tracking.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/test/domain_exit.cpp b/test/domain_exit.cpp index 09ae412e..c5c749d9 100644 --- a/test/domain_exit.cpp +++ b/test/domain_exit.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/heyoka_comparison.cpp b/test/heyoka_comparison.cpp index 93f5cf98..af550b3d 100644 --- a/test/heyoka_comparison.cpp +++ b/test/heyoka_comparison.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/test/interrupt_order.cpp b/test/interrupt_order.cpp index 17512885..6ea584fd 100644 --- a/test/interrupt_order.cpp +++ b/test/interrupt_order.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/test/invalid_state.cpp b/test/invalid_state.cpp index caca5901..370d8dcc 100644 --- a/test/invalid_state.cpp +++ b/test/invalid_state.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/test/reentry.cpp b/test/reentry.cpp index 6bd223ec..ff29a501 100644 --- a/test/reentry.cpp +++ b/test/reentry.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include diff --git a/test/single_collision.cpp b/test/single_collision.cpp index 8d60f0fd..5bb5d05e 100644 --- a/test/single_collision.cpp +++ b/test/single_collision.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include #include From adad3471069afa8c5b75809a14a763be2fd73967 Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Tue, 3 Jun 2025 11:31:07 +0200 Subject: [PATCH 3/9] revert: undo effort to migrate to xtensor v0.26 Refs: 916c3c1 --- benchmark/2022_leo_pop.cpp | 2 +- benchmark/haumea.cpp | 2 +- test/conj_tracking.cpp | 2 +- test/domain_exit.cpp | 2 +- test/heyoka_comparison.cpp | 2 +- test/interrupt_order.cpp | 2 +- test/invalid_state.cpp | 2 +- test/reentry.cpp | 2 +- test/single_collision.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benchmark/2022_leo_pop.cpp b/benchmark/2022_leo_pop.cpp index 065f36fa..9e1c56ae 100644 --- a/benchmark/2022_leo_pop.cpp +++ b/benchmark/2022_leo_pop.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/benchmark/haumea.cpp b/benchmark/haumea.cpp index 2169167c..14990562 100644 --- a/benchmark/haumea.cpp +++ b/benchmark/haumea.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/test/conj_tracking.cpp b/test/conj_tracking.cpp index 5bc0e20c..2a3bf398 100644 --- a/test/conj_tracking.cpp +++ b/test/conj_tracking.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/test/domain_exit.cpp b/test/domain_exit.cpp index c5c749d9..09ae412e 100644 --- a/test/domain_exit.cpp +++ b/test/domain_exit.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/heyoka_comparison.cpp b/test/heyoka_comparison.cpp index af550b3d..93f5cf98 100644 --- a/test/heyoka_comparison.cpp +++ b/test/heyoka_comparison.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/test/interrupt_order.cpp b/test/interrupt_order.cpp index 6ea584fd..17512885 100644 --- a/test/interrupt_order.cpp +++ b/test/interrupt_order.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/test/invalid_state.cpp b/test/invalid_state.cpp index 370d8dcc..caca5901 100644 --- a/test/invalid_state.cpp +++ b/test/invalid_state.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/test/reentry.cpp b/test/reentry.cpp index ff29a501..6bd223ec 100644 --- a/test/reentry.cpp +++ b/test/reentry.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include diff --git a/test/single_collision.cpp b/test/single_collision.cpp index 5bb5d05e..8d60f0fd 100644 --- a/test/single_collision.cpp +++ b/test/single_collision.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include #include From a343f8003d28b139c90e238e5e291e856f6184b2 Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Tue, 3 Jun 2025 11:32:59 +0200 Subject: [PATCH 4/9] fix: pin xtensor to 0.25 --- cascade_devel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cascade_devel.yml b/cascade_devel.yml index 850ee73b..0f166a4c 100644 --- a/cascade_devel.yml +++ b/cascade_devel.yml @@ -15,6 +15,6 @@ dependencies: - heyoka.py =6* - spdlog - pybind11 >=2.10 - - xtensor + - xtensor = 0.25 # v0.26 intrdouces breaking changes - xtensor-blas - hdf5 \ No newline at end of file From d1d97113078baa2c418534bc2c1ffb1d2d8bf0cc Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Fri, 6 Jun 2025 11:16:41 +0200 Subject: [PATCH 5/9] fix: heyok v6 -> v7 --- cascade_devel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cascade_devel.yml b/cascade_devel.yml index 0f166a4c..490e2a16 100644 --- a/cascade_devel.yml +++ b/cascade_devel.yml @@ -11,8 +11,8 @@ dependencies: - tbb - libboost-devel >=1.86 - fmt - - heyoka =6* - - heyoka.py =6* + - heyoka + - heyoka.py - spdlog - pybind11 >=2.10 - xtensor = 0.25 # v0.26 intrdouces breaking changes From b791b18748e7d43b6d1d75cde4afe2dadf492a4b Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Fri, 6 Jun 2025 11:55:48 +0200 Subject: [PATCH 6/9] fix: heyok v6 -> v7 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aaeb04e..b8385d6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,7 +174,7 @@ find_package(fmt REQUIRED CONFIG) target_link_libraries(cascade PUBLIC fmt::fmt) # heyoka. -find_package(heyoka 6 REQUIRED CONFIG) +find_package(heyoka REQUIRED CONFIG) target_link_libraries(cascade PUBLIC heyoka::heyoka) # spdlog. @@ -183,7 +183,7 @@ target_link_libraries(cascade PRIVATE spdlog::spdlog) # Boost. # NOTE: need 1.73 for atomic_ref. -# NOTE: it seems this must to be after find_package(heyoka 6 REQUIRED CONFIG) else +# NOTE: it seems this must to be after find_package(heyoka REQUIRED CONFIG) else # cmake will complain of the missing target Boost::serialization find_package(Boost 1.73 REQUIRED CONFIG) target_link_libraries(cascade PUBLIC Boost::boost) From 67cc3d89959836fb9e467eae67803b342a335729 Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Fri, 6 Jun 2025 12:19:01 +0200 Subject: [PATCH 7/9] fix: pin to heyoka 7 and remove derecated method in python 3.13 --- cascade.py/test.py | 2 +- cascade_devel.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cascade.py/test.py b/cascade.py/test.py index 38cf3e42..1198fc5a 100644 --- a/cascade.py/test.py +++ b/cascade.py/test.py @@ -417,7 +417,7 @@ def run_test_suite(): retval = 0 suite = _ut.TestLoader().loadTestsFromTestCase(dynamics_test_case) - suite.addTests(_ut.makeSuite(sim_test_case)) + suite.addTests(_ut.TestLoader().loadTestsFromTestCase(sim_test_case)) test_result = _ut.TextTestRunner(verbosity=2).run(suite) diff --git a/cascade_devel.yml b/cascade_devel.yml index 490e2a16..eeef7e4a 100644 --- a/cascade_devel.yml +++ b/cascade_devel.yml @@ -11,8 +11,8 @@ dependencies: - tbb - libboost-devel >=1.86 - fmt - - heyoka - - heyoka.py + - heyoka =7* + - heyoka.py =7* - spdlog - pybind11 >=2.10 - xtensor = 0.25 # v0.26 intrdouces breaking changes From 874e179b76dc4499ad4cede99354aa93f1cb4445 Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Fri, 6 Jun 2025 14:38:32 +0200 Subject: [PATCH 8/9] fix: install pthread in conda_asan --- .github/workflows/gha_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gha_ci.yml b/.github/workflows/gha_ci.yml index 58ea8722..0f65b609 100644 --- a/.github/workflows/gha_ci.yml +++ b/.github/workflows/gha_ci.yml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install Dependencies + run: sudo apt-get update && sudo apt-get install -y libpthread-stubs0-dev - name: Build run: bash tools/gha_conda_asan.sh conda_coverage: From b7dbf0220f0a78716c220d45883679f4cc86db40 Mon Sep 17 00:00:00 2001 From: Pietro Fanti Date: Fri, 6 Jun 2025 14:39:43 +0200 Subject: [PATCH 9/9] docs: substitute broken link --- doc/examples/itokawa_cubesats.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/itokawa_cubesats.ipynb b/doc/examples/itokawa_cubesats.ipynb index aff8525e..e9bc9b8e 100644 --- a/doc/examples/itokawa_cubesats.ipynb +++ b/doc/examples/itokawa_cubesats.ipynb @@ -7,7 +7,7 @@ "source": [ "# Swarming Itokawa with cubesats\n", "In this example we consider a rather advanced mission option inspired to us by the European Space Agency\n", - "[HERA mission](https://www.esa.int/Space_Safety/Hera). HERA is an interplanetary spacecraft that will explore the binary system named Didymos in 2025.\n", + "[HERA mission](https://www.heramission.space/). HERA is an interplanetary spacecraft that will explore the binary system named Didymos in 2025.\n", "In the case of HERA, two cubesats called Milani and [Juventas](https://www.heramission.space/hera-mission-juventas-cubesat), will detach from the main\n", "mother satellite to perform some detailed exploration of the system, including the exploartion of its gravity field.\n", "The use of cubesats to increase the mission scientific output, while minimizing risks connected to operating in a highly unknown environment,\n",