Merge topic 'ci-nvhpc'

12d032b265 gitlab-ci: Update NVHPC to version 22.11

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7994

.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

.gitlab/ci/docker/nvhpc22.9/Dockerfile → .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 <[email protected]>
 
 COPY install_deps.sh /root/install_deps.sh

.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

.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