Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
-DBUILD_SHARED_LIBS=OFF
-DKokkos_ENABLE_SERIAL=ON
-DKokkos_ENABLE_OPENMP=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is position independent code needed? Typically this is needed for shared libraries, but I see -DBUILD_SHARED_LIBS=OFF

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some shared libraries in the build required this. I just figured out it was PETSc itself. Now the shared library building is disabled.

-DKokkos_ENABLE_CUDA=OFF
-DKokkos_ENABLE_CUDA_LAMBDA=OFF
-DKokkos_ENABLE_CUDA_CONSTEXPR=OFF'
Expand All @@ -75,6 +76,7 @@ jobs:
cache: true
options: '-DCMAKE_CXX_STANDARD=17
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DKokkos_DIR=${{ runner.temp }}/build-kokkos-openmpi/install/lib/cmake/Kokkos'

- name: build omega_h
Expand Down Expand Up @@ -136,10 +138,32 @@ jobs:
with:
repo-name: 'ADIOS2-openmpi'
repo-path: 'ornladios/ADIOS2'
repo-ref: ''
repo-ref: 'v2.10.2'
cache: true
options: '-DADIOS2_USE_CUDA=OFF'

- name: Cache PETSc
id: cache-petsc
uses: actions/cache@v3
with:
path: ${{ runner.temp }}/petsc-openmpi
key: build-petsc-openmpi

# PETSc check is removed due to a PETSc test failure using openmpi
- name: build petsc
if: steps.cache-petsc.outputs.cache-hit != 'true'
run: |
cd ${{ runner.temp }}
git clone -b release https://gitlab.com/petsc/petsc.git petsc-openmpi
cd petsc-openmpi
./configure \
PETSC_ARCH=ubuntu-kokkos \
--with-kokkos-dir="${{ runner.temp }}/build-kokkos-openmpi/install/" \
--with-kokkos-kernels-dir="${{ runner.temp }}/build-kokkos-kernels-openmpi/install/" \
--with-cuda=0 \
--download-fblaslapack
make all

- name: build redev
uses: ./.github/actions/install-repo
with:
Expand Down Expand Up @@ -173,6 +197,9 @@ jobs:
-DCMAKE_C_COMPILER=mpicc \
-DCMAKE_CXX_COMPILER=mpicxx \
-DCMAKE_Fortran_COMPILER=mpifort \
-DPCMS_ENABLE_PETSC=ON \
-DPETSC_DIR=${{ runner.temp }}/petsc-openmpi \
-DPETSC_ARCH=ubuntu-kokkos \
-DPCMS_TIMEOUT=10 \
-DCatch2_DIR=${{ runner.temp }}/build-Catch2-openmpi/install/lib/cmake/Catch2 \
-DOmega_h_DIR=${{ runner.temp }}/build-omega_h-openmpi/install/lib/cmake/Omega_h \
Expand Down
28 changes: 27 additions & 1 deletion .github/workflows/cmake-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
-DBUILD_SHARED_LIBS=OFF
-DKokkos_ENABLE_SERIAL=ON
-DKokkos_ENABLE_OPENMP=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DKokkos_ENABLE_CUDA=OFF
-DKokkos_ENABLE_CUDA_LAMBDA=OFF
-DKokkos_ENABLE_CUDA_CONSTEXPR=OFF'
Expand All @@ -75,6 +76,7 @@ jobs:
cache: true
options: '-DCMAKE_CXX_STANDARD=17
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DKokkos_DIR=${{ runner.temp }}/build-kokkos/install/lib/cmake/Kokkos'

- name: build omega_h
Expand Down Expand Up @@ -136,7 +138,7 @@ jobs:
with:
repo-name: 'ADIOS2'
repo-path: 'ornladios/ADIOS2'
repo-ref: ''
repo-ref: 'v2.10.2'
cache: true
options: '-DADIOS2_USE_CUDA=OFF'

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

- name: Cache PETSc
id: cache-petsc
uses: actions/cache@v3
with:
path: ${{ runner.temp }}/petsc
key: build-petsc

- name: build petsc
if: steps.cache-petsc.outputs.cache-hit != 'true'
run: |
cd ${{ runner.temp }}
git clone -b release https://gitlab.com/petsc/petsc.git petsc
cd petsc
./configure \
PETSC_ARCH=ubuntu-kokkos \
--with-kokkos-dir="${{ runner.temp }}/build-kokkos/install/" \
--with-kokkos-kernels-dir="${{ runner.temp }}/build-kokkos-kernels/install/" \
--with-cuda=0 \
--download-fblaslapack
make all check

- name: checkout pcms_testcases
uses: actions/checkout@v3
with:
Expand All @@ -175,6 +198,9 @@ jobs:
-DCMAKE_CXX_COMPILER=`which mpicxx`
-DCMAKE_Fortran_COMPILER=`which mpifort`
-DMPIEXEC_PREFLAGS="--oversubscribe"
-DPCMS_ENABLE_PETSC=ON
-DPETSC_DIR=${{ runner.temp }}/petsc
-DPETSC_ARCH=ubuntu-kokkos
-DPCMS_TIMEOUT=10
-DCatch2_DIR=${{ runner.temp }}/build-Catch2/install/lib/cmake/Catch2
-DOmega_h_DIR=${{ runner.temp }}/build-omega_h/install/lib/cmake/Omega_h
Expand Down