fixup: mpi/gtest changes for new HIP CI image

ORNL · Oct 3, 2023 · 8de382a · 8de382a
1 parent f218d64
commit 8de382a
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/.github/workflows/CI-e4s-build.yml b/.github/workflows/CI-e4s-build.yml
@@ -22,20 +22,6 @@ jobs:
     runs-on: ubuntu-20.04
     container: ghcr.io/ecp-copa/ci-containers/rocm:latest
     steps:
-      - name: Checkout GTest
-        uses: actions/checkout@v3
-        with:
-          repository: google/googletest
-          ref: release-1.11.0
-          path: gtest
-      - name: Build gtest
-        working-directory: gtest
-        run: |
-          cmake -B build \
-            -DCMAKE_INSTALL_PREFIX=$HOME/gtest \
-            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }}
-          cmake --build build --parallel 2
-          cmake --install build
       - name: Checkout json
         uses: actions/checkout@v3
         with:
@@ -78,12 +64,17 @@ jobs:
       - name: Build Cabana
         working-directory: cabana
         run: |
+          export MPI_LOCATION=/usr/lib/x86_64-linux-gnu/openmpi/
           cmake -B build \
             -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
             -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} \
             -DCMAKE_INSTALL_PREFIX=$HOME/Cabana \
             -DCMAKE_PREFIX_PATH="$HOME/kokkos" \
-            -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON
+            -DCMAKE_CXX_FLAGS="-I${MPI_LOCATION}/include"
+            -DCMAKE_EXE_LINKER_FLAGS="-L${MPI_LOCATION}/lib -lmpi"
+            -DCMAKE_SHARED_LINKER_FLAGS="-L${MPI_LOCATION}/lib -lmpi"
+            -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON \
+            -DCabana_REQUIRE_MPI=ON
           cmake --build build --parallel 2
           cmake --install build
       - name: Checkout CabanaPD