Merge pull request #1260 from aurianer/add_nvhpc_24_9_pipeline

Add `[email protected]` pipeline on alps
pika-org · Nov 9, 2024 · aacb2dc · aacb2dc
2 parents 1a62925 + 3c311d4
commit aacb2dc
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 4 deletions.
diff --git a/.gitlab/docker/Dockerfile.spack_compiler b/.gitlab/docker/Dockerfile.spack_compiler
@@ -41,7 +41,7 @@ RUN spack compiler info $COMPILER > /dev/null 2> /dev/null; compiler_missing=$?;
             spack install -j$NUM_PROCS $NVHPC_COMPILER%$spack_compiler arch=$SPACK_ARCH && \
             spack external find \
                 --scope site \
-                --path $(spack location -i $NVHPC_COMPILER)/Linux_x86_64/$nvhpc_version/compilers/bin \
+                --path $(spack location -i $NVHPC_COMPILER)/Linux_$(uname -m)/$nvhpc_version/compilers/bin \
                 nvhpc; \
         fi && \
         spack clean --all; \

diff --git a/.gitlab/includes/common_spack_pipeline.yml b/.gitlab/includes/common_spack_pipeline.yml
@@ -8,7 +8,7 @@ include:
   - local: '.gitlab/includes/common_pipeline.yml'
 
 variables:
-  SPACK_COMMIT: develop-2024-10-06
+  SPACK_COMMIT: develop-2024-10-13
 
 .base_spack_image:
   timeout: 1 hours

diff --git a/.gitlab/includes/nvhpc24_9_pipeline.yml b/.gitlab/includes/nvhpc24_9_pipeline.yml
@@ -0,0 +1,41 @@
+# Copyright (c) 2023 ETH Zurich
+#
+# SPDX-License-Identifier: BSL-1.0
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file BOOST_LICENSE_1_0.rst or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+include:
+  - local: '.gitlab/includes/common_pipeline.yml'
+  - local: '.gitlab/includes/common_spack_pipeline.yml'
+
+.variables_nvhpc24_9_config:
+  variables:
+    SPACK_ARCH: linux-ubuntu22.04-neoverse_v2
+    COMPILER: [email protected]
+    NVHPC_COMPILER: [email protected]
+    CXXSTD: 20
+    GPU_TARGET: '90'
+    SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${NVHPC_COMPILER} +stdexec +mpi +cuda cuda_arch=${GPU_TARGET} \
+                 malloc=system cxxstd=$CXXSTD ^[email protected]%${NVHPC_COMPILER} ^[email protected] \
+                 ^[email protected] ^[email protected]%${NVHPC_COMPILER} ^whip%${NVHPC_COMPILER}"
+    CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_CUDA=ON -DPIKA_WITH_MALLOC=system \
+                  -DPIKA_WITH_MPI=ON -DCMAKE_CUDA_ARCHITECTURES=$GPU_TARGET -DPIKA_WITH_STDEXEC=ON"
+    PULL_ON_HOST_MACHINE: "YES"
+
+nvhpc24_9_spack_compiler_image:
+  extends:
+    - .variables_nvhpc24_9_config
+    - .compiler_image_template_santis
+
+nvhpc24_9_spack_image:
+  needs: [nvhpc24_9_spack_compiler_image]
+  extends:
+    - .variables_nvhpc24_9_config
+    - .dependencies_image_template_santis
+
+nvhpc24_9_build:
+  timeout: 2 hours
+  needs: [nvhpc24_9_spack_image]
+  extends:
+    - .variables_nvhpc24_9_config
+    - .build_template_santis
diff --git a/.gitlab/pipelines_on_merge.yml b/.gitlab/pipelines_on_merge.yml
@@ -23,3 +23,4 @@ include:
   - local: '.gitlab/includes/clang18_pipeline.yml'
   - local: '.gitlab/includes/clang19_pipeline.yml'
   - local: '.gitlab/includes/nvhpc24_7_pipeline.yml'
+  - local: '.gitlab/includes/nvhpc24_9_pipeline.yml'
diff --git a/cmake/pika_setup_cuda.cmake b/cmake/pika_setup_cuda.cmake
@@ -150,8 +150,11 @@ function(pika_add_nvhpc_cuda_flags source)
 
   get_source_file_property(source_compile_flags ${source} COMPILE_FLAGS)
   string(REGEX REPLACE "^NOTFOUND$" "" source_compile_flags ${source_compile_flags})
+  set(extra_source_compile_flags
+      $<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,24.9.0>:"--diag_suppress cuda_compile">
+  )
   set_source_files_properties(
-    ${source} PROPERTIES COMPILE_FLAGS "${source_compile_flags} -x cu ${source_gpu_cc_flags}"
-                         LANGUAGE CXX
+    ${source} PROPERTIES COMPILE_FLAGS "${source_compile_flags} -x cu ${source_gpu_cc_flags} \
+      ${extra_source_compile_flags}" LANGUAGE CXX
   )
 endfunction()
diff --git a/cmake/tests/cxx23_static_call_operator.cpp b/cmake/tests/cxx23_static_call_operator.cpp
@@ -4,9 +4,17 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#if defined(__NVCOMPILER)
+# pragma diag_error static_member_operator_not_allowed
+#endif
+
 struct s
 {
     static void operator()() {}
 };
 
 int main() { s::operator()(); }
+
+#if defined(__NVCOMPILER)
+# pragma diag_default static_member_operator_not_allowed
+#endif