Merge pull request #59 from darioizzo/update2heyoka5

update to heyoka5
esa · Jul 10, 2024 · 5931b8b · 5931b8b
2 parents d06707e + b6ab978
commit 5931b8b
Show file tree

Hide file tree

Showing 32 changed files with 69 additions and 5,638 deletions.
diff --git a/.github/workflows/gha_ci.yml b/.github/workflows/gha_ci.yml
@@ -26,52 +26,52 @@ jobs:
           fetch-depth: 2
       - name: Build
         run: bash tools/gha_conda_coverage.sh
-  manylinux228-py311:
-     runs-on: ubuntu-latest
-     container:
-      image: pagmo2/manylinux228_x86_64_with_deps:latest
-      env:
-        CASCADE_PY_BUILD_TYPE: "Python311"
-        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-     steps:
-       - uses: actions/checkout@v3
-       - name: Build
-         run: bash tools/gha_manylinux.sh
-  manylinux228-py310:
-     runs-on: ubuntu-latest
-     container:
-      image: pagmo2/manylinux228_x86_64_with_deps:latest
-      env:
-        CASCADE_PY_BUILD_TYPE: "Python310"
-        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-     steps:
-       - uses: actions/checkout@v3
-       - name: Build
-         run: bash tools/gha_manylinux.sh
-  manylinux228-py39:
-     runs-on: ubuntu-latest
-     container:
-      image: pagmo2/manylinux228_x86_64_with_deps:latest
-      env:
-        CASCADE_PY_BUILD_TYPE: "Python39"
-        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-     steps:
-       - uses: actions/checkout@v3
-       - name: Build
-         run: bash tools/gha_manylinux.sh
-  manylinux228-py38:
-     runs-on: ubuntu-latest
-     container:
-      image: pagmo2/manylinux228_x86_64_with_deps:latest
-      env:
-        CASCADE_PY_BUILD_TYPE: "Python38"
-        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-     steps:
-       - uses: actions/checkout@v3
-       - name: Build
-         run: bash tools/gha_manylinux.sh
+  #manylinux228-py311:
+  #   runs-on: ubuntu-latest
+  #   container:
+  #    image: pagmo2/manylinux228_x86_64_with_deps:latest
+  #    env:
+  #      CASCADE_PY_BUILD_TYPE: "Python311"
+  #      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Build
+  #       run: bash tools/gha_manylinux.sh
+  #manylinux228-py310:
+  #   runs-on: ubuntu-latest
+  #   container:
+  #    image: pagmo2/manylinux228_x86_64_with_deps:latest
+  #    env:
+  #      CASCADE_PY_BUILD_TYPE: "Python310"
+  #      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Build
+  #       run: bash tools/gha_manylinux.sh
+  #manylinux228-py39:
+  #   runs-on: ubuntu-latest
+  #   container:
+  #    image: pagmo2/manylinux228_x86_64_with_deps:latest
+  #    env:
+  #      CASCADE_PY_BUILD_TYPE: "Python39"
+  #      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Build
+  #       run: bash tools/gha_manylinux.sh
+  #manylinux228-py38:
+  #   runs-on: ubuntu-latest
+  #   container:
+  #    image: pagmo2/manylinux228_x86_64_with_deps:latest
+  #    env:
+  #      CASCADE_PY_BUILD_TYPE: "Python38"
+  #      TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Build
+  #       run: bash tools/gha_manylinux.sh
   windows_2019:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v3
       - name: Add msbuild to PATH
@@ -89,7 +89,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake ../ -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Miniconda\envs\cascade_devel\Library -DCASCADE_BUILD_TESTS=yes -DBoost_NO_BOOST_CMAKE=ON -DCASCADE_BUILD_PYTHON_BINDINGS=yes
+          cmake ../ -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Miniconda\envs\cascade_devel\Library -DCASCADE_BUILD_TESTS=yes -DBoost_NO_BOOST_CMAKE=ON -DCASCADE_BUILD_PYTHON_BINDINGS=yes
           cmake --build . -j4 --config Release --target install
           ctest -j4 -V -C Release
           cd c:\

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -179,7 +179,7 @@ find_package(fmt REQUIRED CONFIG)
 target_link_libraries(cascade PUBLIC fmt::fmt)
 
 # heyoka.
-find_package(heyoka 3.0.0 REQUIRED CONFIG)
+find_package(heyoka 5 REQUIRED CONFIG)
 target_link_libraries(cascade PUBLIC heyoka::heyoka)
 
 # spdlog.

diff --git a/cascade.py/test.py b/cascade.py/test.py
@@ -60,7 +60,7 @@ def test_kepler_equivalence(self):
     def test_perturbation_magnitudes(self):
         from .dynamics import simple_earth, kepler
         import numpy as np
-        from heyoka import make_cfunc
+        from heyoka import cfunc, make_vars
 
         dynkep = simple_earth(
             J2=False,
@@ -90,9 +90,11 @@ def test_perturbation_magnitudes(self):
             drag=False,
         )
 
-        dynkep_c = make_cfunc([dynkep[i][1] for i in [3, 4, 5]])
-        dynJ2_c = make_cfunc([dynJ2[i][1] for i in [3, 4, 5]])
-        dynJ3_c = make_cfunc([dynJ3[i][1] for i in [3, 4, 5]])
+        # Dynamical variables.
+        x, y, z, vx, vy, vz = make_vars("x", "y", "z", "vx", "vy", "vz")
+        dynkep_c = cfunc([dynkep[i][1] for i in [3, 4, 5]], vars=[x,y,z])
+        dynJ2_c = cfunc([dynJ2[i][1] for i in [3, 4, 5]], vars=[x,y,z])
+        dynJ3_c = cfunc([dynJ3[i][1] for i in [3, 4, 5]], vars=[x,y,z])
 
         # We compute the various acceleration magnitudes at 7000 km
         pos = np.array([7000000.0, 0.0, 0.0])

diff --git a/cascade_devel.yml b/cascade_devel.yml
@@ -11,8 +11,8 @@ dependencies:
   - tbb
   - boost-cpp >=1.73
   - fmt
-  - heyoka =3.0.*
-  - heyoka.py =3.0.*
+  - heyoka =5*
+  - heyoka.py =5*
   - spdlog
   - pybind11 >=2.10
   - xtensor

diff --git a/src/mdspan/__p0009_bits/compressed_pair.hpp b/src/mdspan/__p0009_bits/compressed_pair.hpp