From 39cb0ea660f9928b3cd31b4d0f5e889dcf65db36 Mon Sep 17 00:00:00 2001 From: Tom Vander Aa Date: Fri, 21 Jun 2024 16:24:28 +0200 Subject: [PATCH] ci: add catch2 deps for cibw, conda and GitHub workflows --- .github/workflows/build_linux.yml | 14 ++++++++++++-- ci/buildwheel/install_deps.sh | 2 +- conda-recipes/smurff/meta.yaml | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index e434fa68..07410c60 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -26,16 +26,26 @@ jobs: - name: install dependencies run: |- sudo apt-get update - sudo apt-get install -y cmake wget ninja-build libblas-dev liblapack-dev liblapacke-dev libboost-all-dev libopenmpi-dev libeigen3-dev libhdf5-dev catch2 + sudo apt-get install -y cmake wget ninja-build libblas-dev liblapack-dev liblapacke-dev libboost-all-dev libopenmpi-dev libeigen3-dev libhdf5-dev sudo apt-get clean all + - name: Install Catch v3 + run: | + wget -O Catch2.tar.gz https://github.com/catchorg/Catch2/archive/refs/tags/v3.6.0.tar.gz + tar xzf Catch2.tar.gz + rm Catch2.tar.gz + cd Catch2* + cmake -S . -B build + cmake --build build + sudo cmake --install build + - name: Install HighFive run: | wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz tar xzf HighFive.tar.gz rm HighFive.tar.gz cd HighFive* - cmake -S . -B build + cmake -DHIGHFIVE_EXAMPLES=OFF -DHIGHFIVE_USE_BOOST=OFF -DHIGHFIVE_UNIT_TESTS=OFF -S . -B build cmake --build build sudo cmake --install build diff --git a/ci/buildwheel/install_deps.sh b/ci/buildwheel/install_deps.sh index 64f99c25..9f238656 100755 --- a/ci/buildwheel/install_deps.sh +++ b/ci/buildwheel/install_deps.sh @@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" echo "MACOSX_DEPLOYMENT_TARGET: [$MACOSX_DEPLOYMENT_TARGET]" echo "PWD: [$PWD]" -brew install --formulae eigen ../highfive.rb +brew install --formulae eigen ../highfive.rb catch2 brew uninstall --ignore-dependencies hdf5 ./install_hdf5.sh \ No newline at end of file diff --git a/conda-recipes/smurff/meta.yaml b/conda-recipes/smurff/meta.yaml index 9f18b2f1..19a95785 100644 --- a/conda-recipes/smurff/meta.yaml +++ b/conda-recipes/smurff/meta.yaml @@ -21,6 +21,7 @@ requirements: - mkl-devel # [blas_impl == 'mkl'] - openblas # [blas_impl != 'mkl'] - eigen + - catch2 - libboost-devel - pybind11 - highfive >=2.2