diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5075888220..fd56c98ff4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -460,11 +460,11 @@ t:fedora43-instrumentation: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:nvhpc24.9-ninja: +t:nvhpc26.3-ninja: extends: - .nvhpc_ninja - .cmake_test_linux_release - - .linux_x86_64_v3_tags_cuda_arch_52 + - .linux_x86_64_v3_tags_cuda_arch_75 - .rules - .needs_centos7_x86_64 variables: diff --git a/.gitlab/ci/configure_nvhpc_ninja.cmake b/.gitlab/ci/configure_nvhpc_ninja.cmake index e25ff7280c..b72c4aac21 100644 --- a/.gitlab/ci/configure_nvhpc_ninja.cmake +++ b/.gitlab/ci/configure_nvhpc_ninja.cmake @@ -1,9 +1,9 @@ set(CMake_TEST_CUDA "NVIDIA" CACHE STRING "") -set(CMake_TEST_CUDA_ARCH "52" CACHE STRING "") +set(CMake_TEST_CUDA_ARCH "75" CACHE STRING "") set(CMake_TEST_CUDA_CUPTI "ON" CACHE STRING "") -set(CMake_TEST_C_STANDARDS "90;99;11;17" CACHE STRING "") -set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23" CACHE STRING "") +set(CMake_TEST_C_STANDARDS "90;99;11;17;23" CACHE STRING "") +set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23;26" CACHE STRING "") set(configure_no_sccache 1) diff --git a/.gitlab/ci/docker/nvhpc24.9/Dockerfile b/.gitlab/ci/docker/nvhpc26.3/Dockerfile similarity index 75% rename from .gitlab/ci/docker/nvhpc24.9/Dockerfile rename to .gitlab/ci/docker/nvhpc26.3/Dockerfile index b94b14adda..14b9bca2b1 100644 --- a/.gitlab/ci/docker/nvhpc24.9/Dockerfile +++ b/.gitlab/ci/docker/nvhpc26.3/Dockerfile @@ -1,5 +1,5 @@ # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags -FROM kitware/nvidia-nvhpc:24.9-devel-cuda_multi-ubuntu24.04 +FROM kitware/nvidia-nvhpc:26.3-devel-cuda_multi-ubuntu24.04 MAINTAINER Brad King COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/nvhpc24.9/install_deps.sh b/.gitlab/ci/docker/nvhpc26.3/install_deps.sh similarity index 100% rename from .gitlab/ci/docker/nvhpc24.9/install_deps.sh rename to .gitlab/ci/docker/nvhpc26.3/install_deps.sh diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index c370f418a0..5e6f1ee5ad 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -407,7 +407,7 @@ ### NVHPC Compiler .nvhpc: - image: "kitware/cmake:ci-nvhpc24.9-x86_64-2024-09-27" + image: "kitware/cmake:ci-nvhpc26.3-x86_64-2026-03-31" variables: CMAKE_ARCH: x86_64 CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP: 1 @@ -666,10 +666,10 @@ - docker - linux-x86_64 -.linux_x86_64_v3_tags_cuda_arch_52: +.linux_x86_64_v3_tags_cuda_arch_75: tags: - cmake - - cuda-arch-52 + - cuda-arch-75 - docker - linux-x86_64-v3