Skip to content

enable cuda tests #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Oct 29, 2025
Merged

enable cuda tests #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1c048da
update base images. reenable ubuntu cuda ci
rrsettgast Oct 26, 2025
312c16e
fix cuda version
rrsettgast Oct 26, 2025
214b5d4
fix some cuda issues...more to come
rrsettgast Oct 27, 2025
2332df3
finished unit test cuda enablement
rrsettgast Oct 28, 2025
0146702
some test modifications
rrsettgast Oct 28, 2025
0913e75
add rocky builds. update baselines
rrsettgast Oct 28, 2025
989cf0e
debugging
rrsettgast Oct 28, 2025
a4c8922
debugging
rrsettgast Oct 28, 2025
42ed123
debugging
rrsettgast Oct 28, 2025
6f83feb
debugging
rrsettgast Oct 28, 2025
a58647a
fix issue with constexpr capture
rrsettgast Oct 28, 2025
cfd4695
fix a couple of issues
rrsettgast Oct 29, 2025
58724fa
try to fix coverage
rrsettgast Oct 29, 2025
ff25665
avoid optimization for coverage runs
rrsettgast Oct 29, 2025
8eb045a
try to fix coverage again
rrsettgast Oct 29, 2025
5c04761
try to fix coverage again
rrsettgast Oct 29, 2025
3956585
revert code coverage image
rrsettgast Oct 29, 2025
516f5b1
try to fix coverage
rrsettgast Oct 29, 2025
63c82b0
try to fix coverage
rrsettgast Oct 29, 2025
65f15b3
add doxygen
rrsettgast Oct 29, 2025
0d7039f
add doxygen
rrsettgast Oct 29, 2025
50eb3b1
reinstall tex for doxygen run
rrsettgast Oct 29, 2025
df91942
reinstall tex for doxygen run
rrsettgast Oct 29, 2025
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
192 changes: 85 additions & 107 deletions .github/workflows/continuousIntegration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ concurrency:
jobs:

get_docker_image_tag_hash:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
DOCKER_IMAGE_TAG_HASH: ${{ steps.extract_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
steps:
- name: Extract docker image tag hash
id: extract_docker_image_tag_hash
run: |
echo "DOCKER_IMAGE_TAG_HASH=b838c3153fadcfd4cd37e4859a4b172581e08417" >> "$GITHUB_OUTPUT"
echo "DOCKER_IMAGE_TAG_HASH=8222ff90b7e0083101204ce7f2c476ec23785a03" >> "$GITHUB_OUTPUT"

# code_style:
# needs: [check_pull_request_is_not_a_draft]
# runs-on: ubuntu-22.04
# runs-on: ubuntu-24.04
# steps:
# - name: Checkout Repository
# uses: actions/[email protected]
Expand All @@ -39,7 +39,7 @@ jobs:
# run: ./scripts/ci_build_and_test.sh

doxygen_check:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- get_docker_image_tag_hash
steps:
Expand All @@ -50,7 +50,7 @@ jobs:
lfs: false
- name: Check doxygen
env:
DOCKER_REPOSITORY: geosx/ubuntu:22.04-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
DOCKER_REPOSITORY: geosx/ubuntu:24.04-clang-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
HOST_CONFIG: hostconfigs/environment.cmake
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
Expand All @@ -60,7 +60,7 @@ jobs:


code_checks:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- get_docker_image_tag_hash
steps:
Expand All @@ -71,7 +71,7 @@ jobs:
lfs: false
- name: code_checks
env:
DOCKER_REPOSITORY: geosx/ubuntu:22.04-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
DOCKER_REPOSITORY: geosx/ubuntu:24.04-clang-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
HOST_CONFIG: hostconfigs/environment.cmake
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
Expand All @@ -89,127 +89,105 @@ jobs:
fail-fast: false
matrix:
include:
# - name: RHEL8.10-clang17-dbg (ubi8.10, clang-17.0.6, Debug)
# DOCKER_REPOSITORY: geosx/ubi:8.10
# RUNS_ON: ubuntu-22.04
# CMAKE_CXX_COMPILER: clang++
# CMAKE_C_COMPILER: clang
# CMAKE_BUILD_TYPE: Debug
- name: rocky-gcc-dbg (rockylinux8, gcc 14, Release)
DOCKER_REPOSITORY: geosx/rockylinux:8-gcc
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/gcc
CMAKE_BUILD_TYPE: Debug

# - name: RHEL8.10-clang17-rel (ubi8.10, clang-17.0.6, Release)
# DOCKER_REPOSITORY: geosx/ubi:8.10
# RUNS_ON: ubuntu-22.04
# CMAKE_CXX_COMPILER: clang++
# CMAKE_C_COMPILER: clang
# CMAKE_BUILD_TYPE: Release
- name: rocky-gcc-rel (rockylinux8, gcc 14, Release)
DOCKER_REPOSITORY: geosx/rockylinux:8-gcc
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/g++
CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/usr/bin/gcc
CMAKE_BUILD_TYPE: Release

# - name: RHEL8.10-gcc13-dbg (ubi8.10, gcc 13.2.1, Debug)
# DOCKER_REPOSITORY: geosx/ubi:8.10
# RUNS_ON: ubuntu-22.04
# CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/bin/g++
# CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/bin/gcc
# CMAKE_BUILD_TYPE: Debug
- name: rocky-clang-dbg (rockylinux8, clang-15, Debug)
DOCKER_REPOSITORY: geosx/rockylinux:8-clang
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Debug

# - name: RHEL8.10-gcc13-rel (ubi8.10, gcc 13.2.1, Release)
# DOCKER_REPOSITORY: geosx/ubi:8.10
# RUNS_ON: ubuntu-22.04
# CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/bin/g++
# CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/bin/gcc
# CMAKE_BUILD_TYPE: Release
- name: rocky-clang-rel (rockylinux8, clang-15, Release)
DOCKER_REPOSITORY: geosx/rockylinux:8-clang
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Release

- name: ubuntu22-gcc11-dbg (ubuntu-22, gcc 11.4.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
RUNS_ON: ubuntu-22.04
- name: ubuntu24-gcc11-dbg (ubuntu-24, gcc 11.4.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-gcc
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Debug

- name: ubuntu22-gcc11-rel (ubuntu-22, gcc 11.4.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
RUNS_ON: ubuntu-22.04
- name: ubuntu24-gcc11-rel (ubuntu-24, gcc 11.4.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-gcc
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Release

- name: ubuntu22-clang14-dbg (ubuntu-22, clang-14.0.0, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
RUNS_ON: ubuntu-22.04
- name: ubuntu24-clang18-dbg (ubuntu-24, clang-18.0.0, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-clang
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Debug

- name: ubuntu22-clang14-rel (ubuntu-22, clang-14.0.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:22.04
RUNS_ON: ubuntu-22.04
- name: ubuntu24-clang18-rel (ubuntu-24, clang-18.0.0, Release)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-clang
RUNS_ON: ubuntu-24.04
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Release

# - name: ubuntu22-gcc11-cuda11-rel (ubuntu-22, gcc 11.4.0, cuda-11.8.0, Release)
# DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
# RUNS_ON: streak2
# CMAKE_CXX_COMPILER: /usr/bin/g++
# CMAKE_C_COMPILER: /usr/bin/gcc
# CMAKE_BUILD_TYPE: Release
# ENABLE_CUDA: ON
# CMAKE_CUDA_ARCHITECTURES: "86"
# NPROC: 4
# DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

# - name: ubuntu22-gcc11-cuda11-dbg (ubuntu-22, gcc 11.4.0, cuda-11.8.0, Debug)
# DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
# RUNS_ON: streak2
# CMAKE_CXX_COMPILER: /usr/bin/g++
# CMAKE_C_COMPILER: /usr/bin/gcc
# CMAKE_BUILD_TYPE: Debug
# ENABLE_CUDA: ON
# CMAKE_CUDA_ARCHITECTURES: "86"
# NPROC: 4
# DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

# - name: ubuntu22-clang14-cuda11-rel (ubuntu-22, clang-14.0.0, cuda-11.8.0, Release)
# DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
# RUNS_ON: streak2
# CMAKE_CXX_COMPILER: /usr/bin/clang++
# CMAKE_C_COMPILER: /usr/bin/clang
# CMAKE_BUILD_TYPE: Release
# ENABLE_CUDA: ON
# CMAKE_CUDA_ARCHITECTURES: "86"
# NPROC: 4
# DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"
- name: ubuntu24-gcc11-cuda12-rel (ubuntu-24, gcc 11.4.0, cuda-12.9.1, Release)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-gcc-cuda12.9
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Release
ENABLE_CUDA: ON
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

# - name: ubuntu22-clang14-cuda11-dbg (ubuntu-22, clang-14.0.0, cuda-11.8.0, Debug)
# DOCKER_REPOSITORY: geosx/ubuntu:22.04-cuda11.8
# RUNS_ON: streak2
# CMAKE_CXX_COMPILER: /usr/bin/clang++
# CMAKE_C_COMPILER: /usr/bin/clang
# CMAKE_BUILD_TYPE: Debug
# ENABLE_CUDA: ON
# CMAKE_CUDA_ARCHITECTURES: "86"
# NPROC: 4
# DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"
- name: ubuntu24-gcc11-cuda12-dbg (ubuntu-24, gcc 11.4.0, cuda-12.9.1, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-gcc-cuda12.9
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
CMAKE_BUILD_TYPE: Debug
ENABLE_CUDA: ON
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

# - name: RHEL8.10-clang17-cuda12-rel (ubi8.10, clang-17.0.6, cuda-12.4.1, Release)
# DOCKER_REPOSITORY: geosx/ubi:8.10-cuda12.8
# RUNS_ON: streak2
# CMAKE_CXX_COMPILER: clang++
# CMAKE_C_COMPILER: clang
# CMAKE_BUILD_TYPE: Release
# ENABLE_CUDA: ON
# CMAKE_CUDA_ARCHITECTURES: "86"
# NPROC: 4
# DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"
- name: ubuntu24-clang14-cuda12-rel (ubuntu-24, clang-14.0.0, cuda-12.9.1, Release)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-clang-cuda12.9
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Release
ENABLE_CUDA: ON
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

# - name: RHEL8.10-gcc13-cuda12-rel (ubi8.10, gcc 13.2.1, cuda-12.4.1, Release)
# DOCKER_REPOSITORY: geosx/ubi:8.10-cuda12.8
# RUNS_ON: streak2
# CMAKE_CXX_COMPILER: /opt/rh/gcc-toolset-13/root/bin/g++
# CMAKE_C_COMPILER: /opt/rh/gcc-toolset-13/root/bin/gcc
# CMAKE_BUILD_TYPE: Release
# ENABLE_CUDA: ON
# CMAKE_CUDA_ARCHITECTURES: "86"
# NPROC: 4
# DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"
- name: ubuntu24-clang14-cuda12-dbg (ubuntu-24, clang-14.0.0, cuda-12.9.1, Debug)
DOCKER_REPOSITORY: geosx/ubuntu:24.04-clang-cuda12.9
RUNS_ON: streak2
CMAKE_CXX_COMPILER: /usr/bin/clang++
CMAKE_C_COMPILER: /usr/bin/clang
CMAKE_BUILD_TYPE: Debug
ENABLE_CUDA: ON
CMAKE_CUDA_ARCHITECTURES: "86"
NPROC: 4
DOCKER_RUN_ARGS: "--cpus=4 --memory=64g --runtime=nvidia --gpus all"

steps:
- name: Checkout Repository
Expand Down Expand Up @@ -247,7 +225,7 @@ jobs:
lfs: false
- name: run code coverage
env:
DOCKER_REPOSITORY: geosx/ubuntu:22.04-${{ needs.get_docker_image_tag_hash.outputs.DOCKER_IMAGE_TAG_HASH }}
DOCKER_REPOSITORY: geosx/ubuntu:22.04-b838c3153fadcfd4cd37e4859a4b172581e08417
HOST_CONFIG: hostconfigs/environment.cmake
CMAKE_CXX_COMPILER: /usr/bin/g++
CMAKE_C_COMPILER: /usr/bin/gcc
Expand All @@ -264,7 +242,7 @@ jobs:


check_that_all_jobs_succeeded:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- get_docker_image_tag_hash
- linux_builds
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ if( NOT is_submodule )

set( BLT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/cmake/blt CACHE PATH "" )
set( BLT_CXX_STD "c++17" CACHE STRING "Version of C++ standard" FORCE )
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CUDA_STANDARD_REQUIRED ON)

set( ENABLE_WARNINGS_AS_ERRORS "ON" CACHE PATH "" )

option( HPCREACT_ENABLE_UNIT_TESTS "Builds tests" ON )
Expand Down
6 changes: 6 additions & 0 deletions cmake/CMakeBasics.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS_DEBUG
CLANG "-fstandalone-debug"
)

if( ENABLE_COVERAGE )
blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS_DEBUG
GNU "-O0 -fno-inline -fno-inline-functions -fno-inline-functions-called-once"
)
endif()

set( CAMP_ENABLE_TESTS OFF CACHE BOOL "")
2 changes: 1 addition & 1 deletion cmake/blt
Open in desktop
Submodule blt updated 610 files
57 changes: 57 additions & 0 deletions hostconfigs/LLNL/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#################################################################################
# Generated host-config - Edit at own risk!
#################################################################################
#--------------------------------------------------------------------------------
# SYS_TYPE: toss_4_x86_64_ib
# Compiler Spec: clang@=19.1.3
# CMake executable path: /usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/cmake-3.26.3-nz532rvfpaf5lf74zxmplgiobuhol7lu/bin/cmake
#--------------------------------------------------------------------------------

#--------------------------------------------------------------------------------
# Compilers
#--------------------------------------------------------------------------------

set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-19.1.3-magic/bin/clang" CACHE PATH "")

set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-19.1.3-magic/bin/clang++" CACHE PATH "")

set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -march=native -mtune=native" CACHE STRING "")

set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG" CACHE STRING "")

set(CMAKE_CXX_FLAGS_DEBUG "-g" CACHE STRING "")

#--------------------------------------------------------------------------------
# CMake Standard
#--------------------------------------------------------------------------------

set(BLT_CXX_STD "c++17" CACHE STRING "")


#--------------------------------------------------------------------------------
# OpenMP
#--------------------------------------------------------------------------------

set(ENABLE_OPENMP ON CACHE BOOL "")

#--------------------------------------------------------------------------------
# Cuda
#--------------------------------------------------------------------------------

set(ENABLE_CUDA OFF CACHE BOOL "")

#--------------------------------------------------------------------------------
# System Math Libraries
#--------------------------------------------------------------------------------

set(ENABLE_MKL ON CACHE BOOL "")

set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "")

set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so
/usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so
/usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so
/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-13.3.1/llvm-19.1.3-gy2lu5xbi4csr2k47emlajzfs5mlsd4g/bin/../lib/x86_64-unknown-linux-gnu/libomp.so
/lib64/libpthread.so
/lib64/libm.so
/lib64/libdl.so CACHE STRING "")
Loading