diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-07 13:15:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-07 13:15:13 (GMT) |
| commit | 602c24f778f68892ba983ddc3c7de891d9c56e52 (patch) | |
| tree | bc608dbfd4b9343927b22e65fd0f9dbf3881ec73 /.gitlab/ci | |
| parent | 5f9465580829bec15474bcbe0fbed06e462e6e78 (diff) | |
| parent | 12d032b2655ae4b91c7cb9688c36173cf6153200 (diff) | |
| download | CMake-602c24f778f68892ba983ddc3c7de891d9c56e52.zip CMake-602c24f778f68892ba983ddc3c7de891d9c56e52.tar.gz CMake-602c24f778f68892ba983ddc3c7de891d9c56e52.tar.bz2 | |
Merge topic 'ci-nvhpc'
12d032b265 gitlab-ci: Update NVHPC to version 22.11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7994
Diffstat (limited to '.gitlab/ci')
| -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 |
3 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab/ci/docker/nvhpc22.9/Dockerfile b/.gitlab/ci/docker/nvhpc22.11/Dockerfile index 90e7d12..52f4f8e 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 51ee410..51ee410 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 bf465d2..687403d 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 |