diff --git a/.gitlab/includes/clang11_pipeline.yml b/.gitlab/includes/clang11_pipeline.yml deleted file mode 100644 index 4e696d090..000000000 --- a/.gitlab/includes/clang11_pipeline.yml +++ /dev/null @@ -1,51 +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_clang11_config: - variables: - SPACK_ARCH: linux-ubuntu22.04-zen2 - COMPILER: clang@11.0.1 - CXXSTD: 17 - SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.72.0 \ - ^hwloc@1.11.11" - CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MAX_CPU_COUNT=256 \ - -DPIKA_WITH_MALLOC=system -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON" - -clang11_spack_compiler_image: - extends: - - .variables_clang11_config - - .compiler_image_template_rosa - -clang11_spack_image: - needs: [clang11_spack_compiler_image] - extends: - - .variables_clang11_config - - .dependencies_image_template_rosa - -clang11_build: - needs: [clang11_spack_image] - extends: - - .variables_clang11_config - - .build_template_rosa - -.clang11_test_common: - needs: [clang11_build] - extends: - - .variables_clang11_config - - .test_common_eiger_mc - - .test_template - -clang11_test_release: - extends: [.clang11_test_common] - image: $PERSIST_IMAGE_NAME_RELEASE - -clang11_test_debug: - extends: [.clang11_test_common] - image: $PERSIST_IMAGE_NAME_DEBUG diff --git a/.gitlab/includes/clang12_pipeline.yml b/.gitlab/includes/clang12_pipeline.yml deleted file mode 100644 index 01e311c19..000000000 --- a/.gitlab/includes/clang12_pipeline.yml +++ /dev/null @@ -1,55 +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_clang12_config: - variables: - SPACK_ARCH: linux-ubuntu22.04-zen2 - COMPILER: clang@12.0.1 - CXXSTD: 17 - SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.79.0 \ - ^hwloc@2.2.0" - CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \ - -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_COROUTINE_COUNTERS=ON \ - -DPIKA_WITH_THREAD_IDLE_RATES=ON \ - -DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON \ - -DPIKA_WITH_THREAD_CUMULATIVE_COUNTS=ON -DPIKA_WITH_THREAD_QUEUE_WAITTIME=ON \ - -DPIKA_WITH_THREAD_STEALING_COUNTS=ON -DPIKA_WITH_STACKTRACES=OFF" - -clang12_spack_compiler_image: - extends: - - .variables_clang12_config - - .compiler_image_template_rosa - -clang12_spack_image: - needs: [clang12_spack_compiler_image] - extends: - - .variables_clang12_config - - .dependencies_image_template_rosa - -clang12_build: - needs: [clang12_spack_image] - extends: - - .variables_clang12_config - - .build_template_rosa - -.clang12_test_common: - needs: [clang12_build] - extends: - - .variables_clang12_config - - .test_common_eiger_mc - - .test_template - -clang12_test_release: - extends: [.clang12_test_common] - image: $PERSIST_IMAGE_NAME_RELEASE - -clang12_test_debug: - extends: [.clang12_test_common] - image: $PERSIST_IMAGE_NAME_DEBUG diff --git a/.gitlab/includes/clang15_pipeline.yml b/.gitlab/includes/clang15_pipeline.yml index 5d6d923aa..bd9b5a47f 100644 --- a/.gitlab/includes/clang15_pipeline.yml +++ b/.gitlab/includes/clang15_pipeline.yml @@ -16,8 +16,8 @@ include: SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.80.0 \ ^hwloc@2.8.0" CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \ - -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_UNITY_BUILD=OFF \ - -DPIKA_WITH_THREAD_STACK_MMAP=OFF" + -DPIKA_WITH_MAX_CPU_COUNT=256 -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \ + -DPIKA_WITH_UNITY_BUILD=OFF -DPIKA_WITH_THREAD_STACK_MMAP=OFF" clang15_spack_compiler_image: extends: diff --git a/.gitlab/includes/clang16_pipeline.yml b/.gitlab/includes/clang16_pipeline.yml index 0705edcce..a960649c4 100644 --- a/.gitlab/includes/clang16_pipeline.yml +++ b/.gitlab/includes/clang16_pipeline.yml @@ -16,7 +16,11 @@ include: SPACK_SPEC: "pika@main arch=$SPACK_ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD ^boost@1.82.0 \ ^hwloc@2.9.1" CMAKE_FLAGS: "-DPIKA_WITH_CXX_STANDARD=$CXXSTD -DPIKA_WITH_MALLOC=system \ - -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON" + -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_COROUTINE_COUNTERS=ON \ + -DPIKA_WITH_THREAD_IDLE_RATES=ON \ + -DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON \ + -DPIKA_WITH_THREAD_CUMULATIVE_COUNTS=ON -DPIKA_WITH_THREAD_QUEUE_WAITTIME=ON \ + -DPIKA_WITH_THREAD_STEALING_COUNTS=ON -DPIKA_WITH_STACKTRACES=OFF" clang16_spack_compiler_image: extends: diff --git a/.gitlab/pipelines_on_merge.yml b/.gitlab/pipelines_on_merge.yml index 6433719a7..9989c8888 100644 --- a/.gitlab/pipelines_on_merge.yml +++ b/.gitlab/pipelines_on_merge.yml @@ -16,8 +16,6 @@ include: - local: '.gitlab/includes/gcc12_hip5_pipeline.yml' - local: '.gitlab/includes/gcc13_santis_pipeline.yml' - local: '.gitlab/includes/gcc14_pipeline.yml' - - local: '.gitlab/includes/clang11_pipeline.yml' - - local: '.gitlab/includes/clang12_pipeline.yml' - local: '.gitlab/includes/clang13_pipeline.yml' - local: '.gitlab/includes/clang15_pipeline.yml' - local: '.gitlab/includes/clang16_pipeline.yml' diff --git a/libs/pika/execution/include/pika/execution/algorithms/let_error.hpp b/libs/pika/execution/include/pika/execution/algorithms/let_error.hpp index 153132833..e9e8057d1 100644 --- a/libs/pika/execution/include/pika/execution/algorithms/let_error.hpp +++ b/libs/pika/execution/include/pika/execution/algorithms/let_error.hpp @@ -76,18 +76,12 @@ namespace pika::let_error_detail { // in CUDA mode (where >>> also has a different meaning in kernel // launches). template