diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/docker/nvhpc22.11/Dockerfile (renamed from .gitlab/ci/docker/nvhpc22.9/Dockerfile) | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/nvhpc22.11/install_deps.sh (renamed from .gitlab/ci/docker/nvhpc22.9/install_deps.sh) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/env_nvhpc_ninja.sh | 4 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
5 files changed, 3 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf94d4b3a1..6fdb6067d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,7 +237,7 @@ t:fedora37-makefiles-nospace: CMAKE_CI_BUILD_NAME: fedora37_makefiles_nospace CMAKE_CI_JOB_NIGHTLY: "true" -t:nvhpc22.9-ninja: +t:nvhpc22.11-ninja: extends: - .nvhpc_ninja - .cmake_test_linux_release diff --git a/.gitlab/ci/docker/nvhpc22.9/Dockerfile b/.gitlab/ci/docker/nvhpc22.11/Dockerfile index 90e7d1214c..52f4f8ecaf 100644 --- a/.gitlab/ci/docker/nvhpc22.9/Dockerfile +++ b/.gitlab/ci/docker/nvhpc22.11/Dockerfile @@ -1,5 +1,5 @@ # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags -FROM nvcr.io/nvidia/nvhpc:22.9-devel-cuda_multi-ubuntu22.04 +FROM nvcr.io/nvidia/nvhpc:22.11-devel-cuda_multi-ubuntu22.04 MAINTAINER Brad King <brad.king@kitware.com> COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/nvhpc22.9/install_deps.sh b/.gitlab/ci/docker/nvhpc22.11/install_deps.sh index 51ee410606..51ee410606 100755 --- a/.gitlab/ci/docker/nvhpc22.9/install_deps.sh +++ b/.gitlab/ci/docker/nvhpc22.11/install_deps.sh diff --git a/.gitlab/ci/env_nvhpc_ninja.sh b/.gitlab/ci/env_nvhpc_ninja.sh index bf465d2aaa..687403d096 100644 --- a/.gitlab/ci/env_nvhpc_ninja.sh +++ b/.gitlab/ci/env_nvhpc_ninja.sh @@ -3,7 +3,3 @@ export CXX=nvc++ export FC=nvfortran export CUDACXX=nvcc export CUDAHOSTCXX=nvc++ -# FIXME(#24225): /opt/nvidia/hpc_sdk/Linux_x86_64/22.9/compilers/bin/nvcc -# selects a CUDA version 10.2 with host driver versions > 520. -# Manually select the preferred nvcc version. -export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/22.9/cuda/11.7/bin:$PATH diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 46ea992326..cf671ef981 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -258,7 +258,7 @@ ### NVHPC Compiler .nvhpc: - image: "kitware/cmake:ci-nvhpc22.9-x86_64-2022-11-22" + image: "kitware/cmake:ci-nvhpc22.11-x86_64-2022-12-06" variables: CMAKE_ARCH: x86_64 |