Merge pull request #1284 from msimberg/drop-clang-11-12-ci

Remove clang 11 and 12 CI configurations
pika-org · Oct 30, 2024 · 8a7d118 · 8a7d118
2 parents 2d992c3 + 3ea8f18
commit 8a7d118
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 131 deletions.
diff --git a/.gitlab/includes/clang11_pipeline.yml b/.gitlab/includes/clang11_pipeline.yml
diff --git a/.gitlab/includes/clang12_pipeline.yml b/.gitlab/includes/clang12_pipeline.yml
diff --git 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
@@ -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
@@ -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
@@ -76,18 +76,12 @@ namespace pika::let_error_detail {
         // in CUDA mode (where >>> also has a different meaning in kernel
         // launches).
         template <template <typename...> class Tuple, template <typename...> class Variant>
-        using value_types = pika::util::detail::unique_concat_t<
-            predecessor_value_types<Tuple, Variant>,
-            pika::util::detail::concat_pack_of_packs_t<pika::util::detail::transform_t<
-                successor_sender_types<Variant>,
-                pika::execution::experimental::detail::value_types<Tuple, Variant>::template apply
-# if defined(PIKA_CLANG_VERSION) && PIKA_CLANG_VERSION < 110000
-                >
-                //
-                >>;
-# else
-                >>>;
-# endif
+        using value_types =
+            pika::util::detail::unique_concat_t<predecessor_value_types<Tuple, Variant>,
+                pika::util::detail::concat_pack_of_packs_t<
+                    pika::util::detail::transform_t<successor_sender_types<Variant>,
+                        pika::execution::experimental::detail::value_types<Tuple,
+                            Variant>::template apply>>>;
 
         template <template <typename...> class Variant>
         using error_types = pika::util::detail::unique_t<pika::util::detail::prepend_t<

diff --git a/libs/pika/execution/include/pika/execution/algorithms/let_value.hpp b/libs/pika/execution/include/pika/execution/algorithms/let_value.hpp
@@ -79,14 +79,8 @@ namespace pika::let_value_detail {
         template <template <typename...> class Tuple, template <typename...> class Variant>
         using value_types = pika::util::detail::unique_t<pika::util::detail::concat_pack_of_packs_t<
             pika::util::detail::transform_t<successor_sender_types<Tuple, Variant>,
-                pika::execution::experimental::detail::value_types<Tuple, Variant>::template apply
-# if defined(PIKA_CLANG_VERSION) && PIKA_CLANG_VERSION < 110000
-                >
-            //
-            >>;
-# else
-                >>>;
-# endif
+                pika::execution::experimental::detail::value_types<Tuple,
+                    Variant>::template apply>>>;
 
         // pika::util::detail::pack acts as a concrete type in place of Tuple. It is
         // required for computing successor_sender_types, but disappears