From decadb1d5167e251668b2478d45dc30540375d8c Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Fri, 6 Dec 2024 11:32:24 +0100 Subject: [PATCH] Move clang + CUDA CI pipeline from clang 14 to 17 --- .gitlab/includes/clang14_cuda11_pipeline.yml | 56 -------------------- .gitlab/includes/clang14_pipeline.yml | 54 +++++++++++++++++++ .gitlab/includes/clang17_cuda12_pipeline.yml | 55 +++++++++++++++++++ .gitlab/includes/clang17_pipeline.yml | 53 ------------------ .gitlab/pipelines_on_merge.yml | 1 + .gitlab/pipelines_on_push.yml | 2 +- 6 files changed, 111 insertions(+), 110 deletions(-) delete mode 100644 .gitlab/includes/clang14_cuda11_pipeline.yml create mode 100644 .gitlab/includes/clang14_pipeline.yml create mode 100644 .gitlab/includes/clang17_cuda12_pipeline.yml delete mode 100644 .gitlab/includes/clang17_pipeline.yml diff --git a/.gitlab/includes/clang14_cuda11_pipeline.yml b/.gitlab/includes/clang14_cuda11_pipeline.yml deleted file mode 100644 index b669ef330..000000000 --- a/.gitlab/includes/clang14_cuda11_pipeline.yml +++ /dev/null @@ -1,56 +0,0 @@ -# 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_clang14_cuda11_config: - variables: - SPACK_ARCH: linux-ubuntu24.04-neoverse_v2 - BASE_COMPILER: gcc@11 - COMPILER: clang@14.0.6 - CXXSTD: 17 - GPU_TARGET: '80' - SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} +cuda cuda_arch=${GPU_TARGET} malloc=system - cxxstd=$CXXSTD ^boost@1.79.0 ^cuda@11 ^hwloc@2.7.0" - CMAKE_FLAGS: "-DCMAKE_CXX_CLANG_TIDY=clang-tidy -DPIKA_WITH_CXX_STANDARD=20 -DPIKA_WITH_CUDA=ON -DPIKA_WITH_MALLOC=system \ - -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DCMAKE_CUDA_COMPILER=c++ \ - -DCMAKE_CUDA_ARCHITECTURES=${GPU_TARGET} \ - -DPIKA_WITH_CXX_LAMBDA_CAPTURE_DECLTYPE=OFF \ - -DPIKA_WITH_STACKOVERFLOW_DETECTION=OFF" - -clang14_cuda11_spack_compiler_image: - extends: - - .variables_clang14_cuda11_config - - .compiler_image_template_gh200 - -clang14_cuda11_spack_image: - needs: [clang14_cuda11_spack_compiler_image] - extends: - - .variables_clang14_cuda11_config - - .dependencies_image_template_gh200 - -clang14_cuda11_build: - needs: [clang14_cuda11_spack_image] - extends: - - .variables_clang14_cuda11_config - - .build_template_gh200 - -.clang14_cuda11_test_common: - needs: [clang14_cuda11_build] - extends: - - .variables_clang14_cuda11_config - - .test_common_daint_gh200 - - .test_template - -clang14_cuda11_test_release: - extends: [.clang14_cuda11_test_common] - image: $PERSIST_IMAGE_NAME_RELEASE - -clang14_cuda11_test_debug: - extends: [.clang14_cuda11_test_common] - image: $PERSIST_IMAGE_NAME_DEBUG diff --git a/.gitlab/includes/clang14_pipeline.yml b/.gitlab/includes/clang14_pipeline.yml new file mode 100644 index 000000000..8c055d0d1 --- /dev/null +++ b/.gitlab/includes/clang14_pipeline.yml @@ -0,0 +1,54 @@ +# 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_clang14_config: + variables: + SPACK_ARCH: linux-ubuntu24.04-neoverse_v2 + BASE_COMPILER: gcc@11 + COMPILER: clang@14.0.6 + CXXSTD: 20 + SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system + cxxstd=$CXXSTD ^boost@1.79.0 ^hwloc@2.7.0" + CMAKE_FLAGS: "-DCMAKE_CXX_CLANG_TIDY=clang-tidy -DPIKA_WITH_CXX_STANDARD=20 -DPIKA_WITH_MALLOC=system \ + -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \ + -DPIKA_WITH_CXX_LAMBDA_CAPTURE_DECLTYPE=OFF \ + -DPIKA_WITH_STACKOVERFLOW_DETECTION=OFF" + +clang14_spack_compiler_image: + extends: + - .variables_clang14_config + - .compiler_image_template_gh200 + +clang14_spack_image: + needs: [clang14_spack_compiler_image] + extends: + - .variables_clang14_config + - .dependencies_image_template_gh200 + +clang14_build: + needs: [clang14_spack_image] + extends: + - .variables_clang14_config + - .build_template_gh200 + +.clang14_test_common: + needs: [clang14_build] + extends: + - .variables_clang14_config + - .test_common_daint_gh200 + - .test_template + +clang14_test_release: + extends: [.clang14_test_common] + image: $PERSIST_IMAGE_NAME_RELEASE + +clang14_test_debug: + extends: [.clang14_test_common] + image: $PERSIST_IMAGE_NAME_DEBUG diff --git a/.gitlab/includes/clang17_cuda12_pipeline.yml b/.gitlab/includes/clang17_cuda12_pipeline.yml new file mode 100644 index 000000000..c64eb8f6f --- /dev/null +++ b/.gitlab/includes/clang17_cuda12_pipeline.yml @@ -0,0 +1,55 @@ +# 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_clang17_cuda12_config: + variables: + SPACK_ARCH: linux-ubuntu24.04-neoverse_v2 + BASE_COMPILER: gcc@12 + COMPILER: clang@17.0.4 + CXXSTD: 23 + GPU_TARGET: '80' + SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} +cuda cuda_arch=${GPU_TARGET} malloc=system cxxstd=$CXXSTD \ + ^cuda@12.4 ^boost@1.83.0 ^hwloc@2.9.1" + CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \ + -DPIKA_WITH_CUDA=ON -DCMAKE_CUDA_COMPILER=c++ -DCMAKE_CUDA_ARCHITECTURES=${GPU_TARGET} \ + -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_THREAD_STACK_MMAP=OFF \ + -DPIKA_WITH_STACKTRACES=OFF" + +clang17_cuda12_spack_compiler_image: + extends: + - .variables_clang17_cuda12_config + - .compiler_image_template_gh200 + +clang17_cuda12_spack_image: + needs: [clang17_cuda12_spack_compiler_image] + extends: + - .variables_clang17_cuda12_config + - .dependencies_image_template_gh200 + +clang17_cuda12_build: + needs: [clang17_cuda12_spack_image] + extends: + - .variables_clang17_cuda12_config + - .build_template_gh200 + +.clang17_cuda12_test_common: + needs: [clang17_cuda12_build] + extends: + - .variables_clang17_cuda12_config + - .test_common_daint_gh200 + - .test_template + +clang17_cuda12_test_release: + extends: [.clang17_cuda12_test_common] + image: $PERSIST_IMAGE_NAME_RELEASE + +clang17_cuda12_test_debug: + extends: [.clang17_cuda12_test_common] + image: $PERSIST_IMAGE_NAME_DEBUG diff --git a/.gitlab/includes/clang17_pipeline.yml b/.gitlab/includes/clang17_pipeline.yml deleted file mode 100644 index 020587168..000000000 --- a/.gitlab/includes/clang17_pipeline.yml +++ /dev/null @@ -1,53 +0,0 @@ -# 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_clang17_config: - variables: - SPACK_ARCH: linux-ubuntu24.04-zen2 - BASE_COMPILER: gcc@12 - COMPILER: clang@17.0.4 - CXXSTD: 23 - SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.83.0 \ - ^hwloc@2.9.1" - CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system - -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_THREAD_STACK_MMAP=OFF \ - -DPIKA_WITH_STACKTRACES=OFF" - -clang17_spack_compiler_image: - extends: - - .variables_clang17_config - - .compiler_image_template_zen2 - -clang17_spack_image: - needs: [clang17_spack_compiler_image] - extends: - - .variables_clang17_config - - .dependencies_image_template_zen2 - -clang17_build: - needs: [clang17_spack_image] - extends: - - .variables_clang17_config - - .build_template_zen2 - -.clang17_test_common: - needs: [clang17_build] - extends: - - .variables_clang17_config - - .test_common_eiger_mc - - .test_template - -clang17_test_release: - extends: [.clang17_test_common] - image: $PERSIST_IMAGE_NAME_RELEASE - -clang17_test_debug: - extends: [.clang17_test_common] - image: $PERSIST_IMAGE_NAME_DEBUG diff --git a/.gitlab/pipelines_on_merge.yml b/.gitlab/pipelines_on_merge.yml index 74c98efaf..8ff60cee4 100644 --- a/.gitlab/pipelines_on_merge.yml +++ b/.gitlab/pipelines_on_merge.yml @@ -16,6 +16,7 @@ include: - local: '.gitlab/includes/gcc12_hip5_pipeline.yml' - local: '.gitlab/includes/gcc14_pipeline.yml' - local: '.gitlab/includes/clang13_pipeline.yml' + - local: '.gitlab/includes/clang14_pipeline.yml' - local: '.gitlab/includes/clang15_pipeline.yml' - local: '.gitlab/includes/clang16_pipeline.yml' - local: '.gitlab/includes/clang17_pipeline.yml' diff --git a/.gitlab/pipelines_on_push.yml b/.gitlab/pipelines_on_push.yml index 4ad2467e7..676630995 100644 --- a/.gitlab/pipelines_on_push.yml +++ b/.gitlab/pipelines_on_push.yml @@ -6,6 +6,6 @@ include: - local: '.gitlab/includes/gcc13_pipeline.yml' - - local: '.gitlab/includes/clang14_cuda11_pipeline.yml' + - local: '.gitlab/includes/clang17_cuda12_pipeline.yml' - local: '.gitlab/includes/gcc12_hip6_pipeline.yml' - local: '.gitlab/includes/sloc.yml'