Skip to content

Commit 2b8403e

Browse files
committed
undo last commit
1 parent a92b99b commit 2b8403e

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.github/actions/install-repo/action.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,4 @@ runs:
4444
- name: Build Cmake
4545
if: ${{ !steps.check-cache.outputs.cache-hit }}
4646
shell: bash
47-
run: cmake --build ${{ runner.temp }}/build-${{ inputs.repo-name }} -j8 --target install
48-
49-
- name: Export Install Path
50-
shell: bash
51-
run: export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${{ runner.temp }}/build-${{ inputs.repo-name }}/install
47+
run: cmake --build ${{ runner.temp }}/build-${{ inputs.repo-name }} -j8 --target install

.github/workflows/cmake.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ jobs:
6161
-DOmega_h_USE_MPI=on
6262
-DBUILD_TESTING=off
6363
-DCMAKE_C_COMPILER=mpicc
64-
-DCMAKE_CXX_COMPILER=mpicxx'
64+
-DCMAKE_CXX_COMPILER=mpicxx
65+
-DKokkos_PREFIX=${{ runner.temp }}/build-kokkos/install/lib/cmake'
6566

6667
- name: build Engpar
6768
uses: ./.github/actions/install-repo
@@ -86,7 +87,8 @@ jobs:
8687
cache: true
8788
options: '-DCMAKE_CXX_COMPILER=${{ matrix.compiler }}
8889
-DCMAKE_BUILD_TYPE=Release
89-
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON'
90+
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON
91+
-DCMAKE_PREFIX_PATH=${{ runner.temp }}/build-kokkos/install/lib/cmake'
9092

9193
- name: build pumi-pic
9294
uses: ./.github/actions/install-repo
@@ -98,7 +100,12 @@ jobs:
98100
cache: true
99101
options: '-DCMAKE_CXX_COMPILER=mpicxx
100102
-DTEST_DATA_DIR=$GITHUB_WORKSPACE/pumi-pic/pumipic-data
101-
-DENABLE_CABANA=on'
103+
-DOmega_h_PREFIX=${{ runner.temp }}/build-omega_h/install
104+
-DKokkos_PREFIX=${{ runner.temp }}/build-kokkos/install
105+
-DEnGPar_PREFIX=${{ runner.temp }}/build-Engpar/install
106+
-DCabana_PREFIX=${{ runner.temp }}/build-cabana/install
107+
-DENABLE_CABANA=on
108+
-DCMAKE_PREFIX_PATH=${{ runner.temp }}/build-kokkos/install/lib/cmake'
102109

103110
- name: build polyMPO
104111
uses: ./.github/actions/install-repo
@@ -109,6 +116,8 @@ jobs:
109116
repo-ref: ''
110117
cache: false
111118
options: '-DCMAKE_BUILD_TYPE=Debug
119+
-DKokkos_DIR=${{ runner.temp }}/build-kokkos/install/lib64/cmake/Kokkos
120+
-DCMAKE_PREFIX_PATH=${{ runner.temp }}/build-pumi-pic/install
112121
-DIS_TESTING=on
113122
-DCMAKE_CXX_COMPILER=mpicxx'
114123

0 commit comments

Comments
 (0)