Merge pull request #60 from esa/update_hy_6

update to hy 6
esa · Dec 12, 2024 · 1fe6fcb · 1fe6fcb
2 parents 82b2c7f + e75e7ac
commit 1fe6fcb
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 37 deletions.
diff --git a/.github/workflows/gha_ci.yml b/.github/workflows/gha_ci.yml
@@ -12,13 +12,13 @@ jobs:
   conda_asan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build
         run: bash tools/gha_conda_asan.sh
   conda_coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # NOTE: this is needed by codecov
           # apparently:
@@ -73,10 +73,10 @@ jobs:
   windows_2019:
     runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
-      - uses: conda-incubator/setup-miniconda@v2
+        uses: microsoft/setup-msbuild@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: cascade_devel
           environment-file: cascade_devel.yml
@@ -97,13 +97,13 @@ jobs:
   osx_11:
     runs-on: macos-11
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build
         run: bash tools/gha_conda_osx.sh
   build-and-deploydocs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install and Build 🔧 
         run: bash tools/gha_deploydocs.sh
       - name: Upload to github pages 🚀

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT CMAKE_BUILD_TYPE)
 	FORCE)
 endif()
 
-project(cascade VERSION 0.1.8 LANGUAGES CXX C)
+project(cascade VERSION 0.1.9 LANGUAGES CXX C)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/yacma")
 
@@ -169,23 +169,25 @@ target_include_directories(cascade PUBLIC
 find_package(TBB REQUIRED CONFIG)
 target_link_libraries(cascade PRIVATE TBB::tbb)
 
-# Boost.
-# NOTE: need 1.73 for atomic_ref.
-find_package(Boost 1.73 REQUIRED)
-target_link_libraries(cascade PUBLIC Boost::boost)
-
 # fmt.
 find_package(fmt REQUIRED CONFIG)
 target_link_libraries(cascade PUBLIC fmt::fmt)
 
 # heyoka.
-find_package(heyoka 5 REQUIRED CONFIG)
+find_package(heyoka 6 REQUIRED CONFIG)
 target_link_libraries(cascade PUBLIC heyoka::heyoka)
 
 # spdlog.
 find_package(spdlog REQUIRED CONFIG)
 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 
+# cmake will complain of the missing target Boost::serialization
+find_package(Boost 1.73 REQUIRED CONFIG)
+target_link_libraries(cascade PUBLIC Boost::boost)
+
 # Installation of the header files.
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/cascade" DESTINATION include)
 #install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/cascade/config.hpp" DESTINATION include/cascade)

diff --git a/cascade_devel.yml b/cascade_devel.yml
@@ -6,15 +6,15 @@ dependencies:
   - cxx-compiler
   - ninja
   - cmake >=3.18
-  - python =3.11
+  - python
   - tbb-devel
   - tbb
-  - boost-cpp >=1.73
+  - libboost-devel >=1.86
   - fmt
-  - heyoka =5*
-  - heyoka.py =5*
+  - heyoka =6*
+  - heyoka.py =6*
   - spdlog
   - pybind11 >=2.10
   - xtensor
-  - xtensor-blas
-  - hdf5
+  - xtensor-blas 
+  - hdf5
diff --git a/src/sim_jit.cpp b/src/sim_jit.cpp
@@ -227,7 +227,7 @@ void sim::add_jit_functions()
 
     auto &state = m_data->state;
 
-    auto *fp_t = hy::detail::to_llvm_type<double>(state.context());
+    auto *fp_t = hy::detail::to_internal_llvm_type<double>(state);
 
     detail::add_poly_translator_a(state, m_data->s_ta.get_order());
     detail::add_poly_ssdiff3_cfunc(state, m_data->s_ta.get_order());

diff --git a/tools/gha_conda_asan.sh b/tools/gha_conda_asan.sh
@@ -10,11 +10,11 @@ set -e
 sudo apt-get install wget
 
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O mambaforge.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
 export deps_dir=$HOME/local
-export PATH="$HOME/mambaforge/bin:$PATH"
-bash mambaforge.sh -b -p $HOME/mambaforge
-mamba env create -f cascade_devel.yml -q -p $deps_dir
+export PATH="$HOME/miniforge/bin:$PATH"
+bash miniforge.sh -b -p $HOME/miniforge
+conda env create -f cascade_devel.yml -q -p $deps_dir
 source activate $deps_dir
 
 export CXXFLAGS="$CXXFLAGS -fsanitize=address"

diff --git a/tools/gha_conda_coverage.sh b/tools/gha_conda_coverage.sh
@@ -10,11 +10,11 @@ set -e
 sudo apt-get install wget
 
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O mambaforge.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
 export deps_dir=$HOME/local
-export PATH="$HOME/mambaforge/bin:$PATH"
-bash mambaforge.sh -b -p $HOME/mambaforge
-mamba env create -f cascade_devel.yml -q -p $deps_dir
+export PATH="$HOME/miniforge/bin:$PATH"
+bash miniforge.sh -b -p $HOME/miniforge
+conda env create -f cascade_devel.yml -q -p $deps_dir
 source activate $deps_dir
 mamba install lcov -y
 

diff --git a/tools/gha_conda_osx.sh b/tools/gha_conda_osx.sh
@@ -6,13 +6,17 @@ set -x
 # Exit on error.
 set -e
 
+# Core deps.
+sudo apt-get install wget
+
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-MacOSX-x86_64.sh -O mambaforge.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
 export deps_dir=$HOME/local
-export PATH="$HOME/mambaforge/bin:$PATH"
-bash mambaforge.sh -b -p $HOME/mambaforge
+export PATH="$HOME/miniforge/bin:$PATH"
+bash miniforge.sh -b -p $HOME/miniforge
 conda env create -f cascade_devel.yml -q -p $deps_dir
 source activate $deps_dir
+source activate $deps_dir
 
 mkdir build
 cd build

diff --git a/tools/gha_deploydocs.sh b/tools/gha_deploydocs.sh
@@ -10,13 +10,13 @@ set -e
 sudo apt-get install wget
 
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh -O mambaforge.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
 export deps_dir=$HOME/local
-export PATH="$HOME/mambaforge/bin:$PATH"
-bash mambaforge.sh -b -p $HOME/mambaforge
-mamba env create -f cascade_devel.yml -q -p $deps_dir
-# Adding the necessary tools for doc building
+export PATH="$HOME/miniforge/bin:$PATH"
+bash miniforge.sh -b -p $HOME/miniforge
+conda env create -f cascade_devel.yml -q -p $deps_dir
 source activate $deps_dir
+# Adding the necessary tools for doc building
 mamba install sphinx myst-nb sphinx-book-theme sphinx-design matplotlib pykep sgp4
 
 # Create the build dir and cd into it.