Skip to content

Commit e22b868

Browse files
committed
add PETSc to ci
1 parent cb10fb7 commit e22b868

File tree

2 files changed

+55
-2
lines changed

2 files changed

+55
-2
lines changed

.github/workflows/clang-tidy.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
-DBUILD_SHARED_LIBS=OFF
6363
-DKokkos_ENABLE_SERIAL=ON
6464
-DKokkos_ENABLE_OPENMP=OFF
65+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
6566
-DKokkos_ENABLE_CUDA=OFF
6667
-DKokkos_ENABLE_CUDA_LAMBDA=OFF
6768
-DKokkos_ENABLE_CUDA_CONSTEXPR=OFF'
@@ -75,6 +76,7 @@ jobs:
7576
cache: true
7677
options: '-DCMAKE_CXX_STANDARD=17
7778
-DBUILD_SHARED_LIBS=OFF
79+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
7880
-DKokkos_DIR=${{ runner.temp }}/build-kokkos-openmpi/install/lib/cmake/Kokkos'
7981

8082
- name: build omega_h
@@ -136,10 +138,32 @@ jobs:
136138
with:
137139
repo-name: 'ADIOS2-openmpi'
138140
repo-path: 'ornladios/ADIOS2'
139-
repo-ref: ''
141+
repo-ref: 'v2.10.2'
140142
cache: true
141143
options: '-DADIOS2_USE_CUDA=OFF'
142144

145+
- name: Cache PETSc
146+
id: cache-petsc
147+
uses: actions/cache@v3
148+
with:
149+
path: ${{ runner.temp }}/petsc-openmpi
150+
key: build-petsc-openmpi
151+
152+
# PETSc check is removed due to a PETSc test failure using openmpi
153+
- name: build petsc
154+
if: steps.cache-petsc.outputs.cache-hit != 'true'
155+
run: |
156+
cd ${{ runner.temp }}
157+
git clone -b release https://gitlab.com/petsc/petsc.git petsc-openmpi
158+
cd petsc-openmpi
159+
./configure \
160+
PETSC_ARCH=ubuntu-kokkos \
161+
--with-kokkos-dir="${{ runner.temp }}/build-kokkos-openmpi/install/" \
162+
--with-kokkos-kernels-dir="${{ runner.temp }}/build-kokkos-kernels-openmpi/install/" \
163+
--with-cuda=0 \
164+
--download-fblaslapack
165+
make all
166+
143167
- name: build redev
144168
uses: ./.github/actions/install-repo
145169
with:
@@ -173,6 +197,9 @@ jobs:
173197
-DCMAKE_C_COMPILER=mpicc \
174198
-DCMAKE_CXX_COMPILER=mpicxx \
175199
-DCMAKE_Fortran_COMPILER=mpifort \
200+
-DPCMS_ENABLE_PETSC=ON \
201+
-DPETSC_DIR=${{ runner.temp }}/petsc-openmpi \
202+
-DPETSC_ARCH=ubuntu-kokkos \
176203
-DPCMS_TIMEOUT=10 \
177204
-DCatch2_DIR=${{ runner.temp }}/build-Catch2-openmpi/install/lib/cmake/Catch2 \
178205
-DOmega_h_DIR=${{ runner.temp }}/build-omega_h-openmpi/install/lib/cmake/Omega_h \

.github/workflows/cmake-test.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
-DBUILD_SHARED_LIBS=OFF
6363
-DKokkos_ENABLE_SERIAL=ON
6464
-DKokkos_ENABLE_OPENMP=OFF
65+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
6566
-DKokkos_ENABLE_CUDA=OFF
6667
-DKokkos_ENABLE_CUDA_LAMBDA=OFF
6768
-DKokkos_ENABLE_CUDA_CONSTEXPR=OFF'
@@ -75,6 +76,7 @@ jobs:
7576
cache: true
7677
options: '-DCMAKE_CXX_STANDARD=17
7778
-DBUILD_SHARED_LIBS=OFF
79+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
7880
-DKokkos_DIR=${{ runner.temp }}/build-kokkos/install/lib/cmake/Kokkos'
7981

8082
- name: build omega_h
@@ -136,7 +138,7 @@ jobs:
136138
with:
137139
repo-name: 'ADIOS2'
138140
repo-path: 'ornladios/ADIOS2'
139-
repo-ref: ''
141+
repo-ref: 'v2.10.2'
140142
cache: true
141143
options: '-DADIOS2_USE_CUDA=OFF'
142144

@@ -154,6 +156,27 @@ jobs:
154156
-DADIOS2_DIR=${{ runner.temp }}/build-ADIOS2/install/lib/cmake/adios2
155157
-Dperfstubs_DIR=${{ runner.temp }}/build-perfstubs/install/lib/cmake'
156158

159+
- name: Cache PETSc
160+
id: cache-petsc
161+
uses: actions/cache@v3
162+
with:
163+
path: ${{ runner.temp }}/petsc
164+
key: build-petsc
165+
166+
- name: build petsc
167+
if: steps.cache-petsc.outputs.cache-hit != 'true'
168+
run: |
169+
cd ${{ runner.temp }}
170+
git clone -b release https://gitlab.com/petsc/petsc.git petsc
171+
cd petsc
172+
./configure \
173+
PETSC_ARCH=ubuntu-kokkos \
174+
--with-kokkos-dir="${{ runner.temp }}/build-kokkos/install/" \
175+
--with-kokkos-kernels-dir="${{ runner.temp }}/build-kokkos-kernels/install/" \
176+
--with-cuda=0 \
177+
--download-fblaslapack
178+
make all check
179+
157180
- name: checkout pcms_testcases
158181
uses: actions/checkout@v3
159182
with:
@@ -175,6 +198,9 @@ jobs:
175198
-DCMAKE_CXX_COMPILER=`which mpicxx`
176199
-DCMAKE_Fortran_COMPILER=`which mpifort`
177200
-DMPIEXEC_PREFLAGS="--oversubscribe"
201+
-DPCMS_ENABLE_PETSC=ON
202+
-DPETSC_DIR=${{ runner.temp }}/petsc
203+
-DPETSC_ARCH=ubuntu-kokkos
178204
-DPCMS_TIMEOUT=10
179205
-DCatch2_DIR=${{ runner.temp }}/build-Catch2/install/lib/cmake/Catch2
180206
-DOmega_h_DIR=${{ runner.temp }}/build-omega_h/install/lib/cmake/Omega_h

0 commit comments

Comments
 (0)