Address comments; build all optional deps

ECP-copa · Jul 7, 2023 · e7468b0 · e7468b0
1 parent 9076df0
commit e7468b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 34 deletions.
diff --git a/.github/workflows/CI-e4s.yml b/.github/workflows/CI-e4s.yml
@@ -20,13 +20,7 @@ jobs:
       matrix:
         cxx: ['hipcc']
         cmake_build_type: ['Debug', 'Release']
-        kokkos_ver: ['3.6.01']
-        arborx: ['OFF']
-        heffte: ['OFF' ]
-        hypre: ['OFF']
-        liball: ['OFF']
-        silo: ['OFF']
-        hdf5: ['OFF']
+        kokkos_ver: ['4.0.01']
     runs-on: ubuntu-20.04
     container: docker.io/ecpe4s/e4s-base-rocm:23.05
     steps:
@@ -41,7 +35,7 @@ jobs:
         run: |
           cmake -B build \
             -DCMAKE_INSTALL_PREFIX=$HOME/gtest \
-            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }}
+            -DCMAKE_BUILD_TYPE=Release
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout kokkos
@@ -62,47 +56,41 @@ jobs:
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout arborx
-        if: ${{ matrix.arborx == 'ArborX' }}
         uses: actions/checkout@v3
         with:
           repository: arborx/ArborX
           ref: v1.2
           path: arborx
       - name: Build arborx
-        if: ${{ matrix.arborx == 'ArborX' }}
         working-directory: arborx
         run: |
           cmake -B build \
-            -DCMAKE_PREFIX_PATH=${HOME}/kokkos \
+            -DKokkos_ROOT=${HOME}/kokkos \
             -DCMAKE_INSTALL_PREFIX=$HOME/arborx \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \
-            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }}
+            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
+            -DARBORX_ENABLE_ROCTHRUST=OFF
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout heffte
-        if: ${{ matrix.heffte != 'OFF' }}
         # actions/checkout doesn't work for external repos yet (actions/checkout#447)
         run: |
           git clone --depth 1 --branch v2.1.0 https://bitbucket.org/icl/heffte.git heffte
       - name: Build heffte
-        if: ${{ matrix.heffte != 'OFF' }}
         working-directory: heffte
         run: |
           cmake -B build \
-            -DCMAKE_CXX_STANDARD="11" \
             -DBUILD_SHARED_LIBS=ON \
             -DCMAKE_INSTALL_PREFIX=$HOME/heffte \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \
             -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
-            -DHeffte_ENABLE_ROCFFT=ON
+            -DHeffte_ENABLE_ROCM=ON
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout ALL
-        if: ${{ matrix.liball == 'libALL' }}
         run: |
           git clone --depth 1 --branch v0.9.2 https://gitlab.jsc.fz-juelich.de/SLMS/loadbalancing ALL
       - name: Build ALL
-        if: ${{ matrix.liball == 'libALL' }}
         working-directory: ALL
         run: |
           cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$HOME/ALL
@@ -111,20 +99,7 @@ jobs:
       - name: Checkout Cabana
         uses: actions/checkout@v3
       - name: Build Cabana
-        env:
-          SILO: ${{ matrix.silo }}
-          HDF5: ${{ matrix.hdf5 }}
         run: |
-          if [[ ${SILO} == 'Silo' ]]; then
-            cabana_cmake_opts+=( -DCabana_REQUIRE_SILO=ON )
-          else
-            cabana_cmake_opts+=( -DCMAKE_DISABLE_FIND_PACKAGE_SILO=ON )
-          fi
-          if [[ ${HDF5} == 'HDF5' ]]; then
-            cabana_cmake_opts+=( -DCabana_REQUIRE_HDF5=ON )
-          else
-            cabana_cmake_opts+=( -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON )
-          fi
           cmake -B build \
             -DCMAKE_INSTALL_PREFIX=$HOME/Cabana \
             -DMPIEXEC_MAX_NUMPROCS=2 -DMPIEXEC_PREFLAGS="--oversubscribe" \
@@ -137,7 +112,7 @@ jobs:
             -DCabana_PERFORMANCE_EXPECTED_FLOPS=0 \
             -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
             -DDOXYGEN_WARN_AS_ERROR=FAIL_ON_WARNINGS \
-            ${cabana_cmake_opts[@]}
+            -DCabana_REQUIRE_HDF5=ON
           cmake --build build --parallel 2 --verbose
           cmake --install build
       - name: Test Cabana Export Target

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -288,7 +288,7 @@ jobs:
         working-directory: arborx
         run: |
           cmake -B build \
-            -DCMAKE_PREFIX_PATH=${HOME}/kokkos \
+            -DKokkos_ROOT=${HOME}/kokkos \
             -DCMAKE_INSTALL_PREFIX=$HOME/arborx \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -308,7 +308,6 @@ jobs:
           [[ ${{ matrix.heffte }} == "MKL" ]] && heffte_cmake_opts+=( -DHeffte_ENABLE_MKL=ON )
           # FIXME: Remove MKL path below when we update heFFTe
           cmake -B build \
-            -DCMAKE_CXX_STANDARD="11" \
             -DBUILD_SHARED_LIBS=ON \
             -DCMAKE_INSTALL_PREFIX=$HOME/heffte \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \