Merge pull request #1326 from msimberg/update-pika-ci-image

Update CI images

.circleci/config.yml

@@ -21,7 +21,7 @@ setup_arm64_machine: &setup_arm64_machine
 
 docker_default: &docker_default
   docker:
-    - image: pikaorg/pika-ci-base:28
+    - image: pikaorg/pika-ci-base:29
 
 defaults: &defaults
   <<: *working_dir_default

.clang-format

@@ -19,7 +19,7 @@
 #   file while saving edits to disk
 # - Please do _not_ reformat a full source file without dire need.
 
-# PLEASE NOTE: This file requires clang-format V16.0
+# PLEASE NOTE: This file requires clang-format V18.0
 
 ---
 AccessModifierOffset: -4

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "docker.io/pikaorg/pika-ci-base:28",
+  "image": "docker.io/pikaorg/pika-ci-base:29",
   "features": {},
   "onCreateCommand": "cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Debug -DPIKA_WITH_MALLOC=system -DPIKA_WITH_EXAMPLES=ON -DPIKA_WITH_TESTS=ON -DPIKA_WITH_TESTS_EXAMPLES=ON -DPIKA_WITH_TESTS_HEADERS=ON -DPIKA_WITH_TESTS_MAX_THREADS=2 -DPIKA_WITH_COMPILER_WARNINGS=ON -DPIKA_WITH_COMPILER_WARNINGS_AS_ERRORS=ON && cmake --build build --target pika",
   "extensions": [

.github/workflows/linux_asan_ubsan_lsan.yml

@@ -21,7 +21,7 @@ jobs:
     name: github/linux/sanitizers/address-undefined-leak
     runs-on: ubuntu-24.04
     container:
-      image: pikaorg/pika-ci-base:28
+      image: pikaorg/pika-ci-base:29
       # --privileged is enabled for sysctl further down.
       options: --privileged
 
@@ -36,14 +36,15 @@ jobs:
       - name: Configure
         shell: bash
         run: |
+            # MPI is disabled because of https://github.com/pika-org/pika/issues/1348
             cmake \
                 . \
                 -Bbuild \
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
                 -DPIKA_WITH_MALLOC=system \
-                -DPIKA_WITH_MPI=ON \
+                -DPIKA_WITH_MPI=OFF \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \
                 -DPIKA_WITH_TESTS_EXAMPLES=ON \

.github/workflows/linux_asan_ubsan_lsan_blacklist.txt

@@ -1,3 +1,5 @@
+tests.performance.local.heterogeneous_timed_task_spawn
+tests.performance.local.task_overhead
 tests.unit.modules.resource_partitioner.cross_pool_injection
 tests.unit.modules.resource_partitioner.suspend_thread
 tests.unit.modules.thread_manager.thread_num

.github/workflows/linux_coverage.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     name: github/linux/coverage
     runs-on: ubuntu-24.04
-    container: pikaorg/pika-ci-base:28
+    container: pikaorg/pika-ci-base:29
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/linux_debug.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     name: github/linux/debug/fast
     runs-on: ubuntu-24.04
-    container: pikaorg/pika-ci-base:28
+    container: pikaorg/pika-ci-base:29
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/linux_release_fetchcontent.yml

@@ -20,7 +20,7 @@ jobs:
     name: github/linux/fetchcontent/fast
     if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-24.04
-    container: pikaorg/pika-ci-base:28
+    container: pikaorg/pika-ci-base:29
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/linux_tracy.yml

@@ -20,7 +20,7 @@ jobs:
     name: github/linux/tracy/fast
     if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-24.04
-    container: pikaorg/pika-ci-base:28
+    container: pikaorg/pika-ci-base:29
 
     steps:
       - name: Check out Tracy

.github/workflows/linux_tsan.yml

@@ -21,7 +21,7 @@ jobs:
     name: github/linux/sanitizers/thread
     runs-on: ubuntu-24.04
     container:
-      image: pikaorg/pika-ci-base:28
+      image: pikaorg/pika-ci-base:29
       # --privileged is enabled for sysctl further down.
       options: --privileged
 
@@ -43,14 +43,15 @@ jobs:
       - name: Configure
         shell: bash
         run: |
+            # MPI is disabled because of https://github.com/pika-org/pika/issues/1348
             cmake \
                 . \
                 -Bbuild \
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
                 -DPIKA_WITH_MALLOC=system \
-                -DPIKA_WITH_MPI=ON \
+                -DPIKA_WITH_MPI=OFF \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \
                 -DPIKA_WITH_TESTS_EXAMPLES=ON \

.github/workflows/linux_valgrind.yml

@@ -19,7 +19,7 @@ jobs:
   build:
     name: github/linux/valgrind
     runs-on: ubuntu-24.04
-    container: pikaorg/pika-ci-base:28
+    container: pikaorg/pika-ci-base:29
 
     strategy:
       matrix:

.gitlab/includes/dockerhub_pipeline.yml

@@ -11,7 +11,7 @@ clang14_debug_build_pika-ci-image:
   extends: .container-builder
   needs: []   # To clear the dotenv artifacts
   variables:
-    BASE_IMAGE: docker.io/pikaorg/pika-ci-base:28
+    BASE_IMAGE: docker.io/pikaorg/pika-ci-base:29
     DOCKERFILE: .gitlab/docker/Dockerfile.dockerhub_build
     DOCKER_BUILD_ARGS: '["BASE_IMAGE","BUILD_DIR","SOURCE_DIR"]'
     PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/pika-debug-cpu-clang14:$CI_COMMIT_SHORT_SHA

cmake/tests/cpuid.cpp

@@ -47,7 +47,7 @@ struct matcher
     {0x0000'0001U, &registers_t::ecx, 9, "ssse3"}, {0x0000'0001U, &registers_t::ecx, 19, "sse4.1"},
     {0x0000'0001U, &registers_t::ecx, 20, "sse4.2"}, {0x0000'0001U, &registers_t::ecx, 28, "avx"},
     {0x8000'0001U, &registers_t::edx, 11, "xop"}, {0x8000'0001U, &registers_t::edx, 16, "fma4"}};
-const size_t noptions = sizeof options / sizeof options[0];
+size_t const noptions = sizeof options / sizeof options[0];
 
 int main(int argc, char** argv)
 {

examples/balancing/os_thread_num.cpp

@@ -70,7 +70,7 @@ int pika_main(variables_map& vm)
 
         bool const csv = vm.count("csv");
 
-        const std::size_t pxthreads = vm["pxthreads"].as<std::size_t>();
+        std::size_t const pxthreads = vm["pxthreads"].as<std::size_t>();
 
         result_map results;
 

examples/balancing/thread_phase.cpp

@@ -114,7 +114,7 @@ int pika_main(variables_map& vm)
         for (std::size_t j = 0; j < pikathread_count; ++j)
         {
             // Compute the mutex to be used for this thread.
-            const std::size_t index = j % mutex_count;
+            std::size_t const index = j % mutex_count;
 
             thread_init_data data(make_thread_function_nullary(pika::util::detail::bind(
                                       &lock_and_wait, std::ref(m[index]), std::ref(b0),

examples/future_reduce/rnd_future_reduce.cpp

@@ -101,9 +101,8 @@ int pika_main()
     }
     double pr_pass = std::pow(1.0 - FAILURE_RATE_PERCENT / 100.0, SAMPLES_PER_LOOP);
     double exp_pass = TEST_LOOPS * pr_pass;
-    std::cout << "From " << TEST_LOOPS << " tests, we got "
-              << "\n " << count << " passes"
-              << "\n " << exp_pass << " expected \n"
+    std::cout << "From " << TEST_LOOPS << " tests, we got " << "\n " << count << " passes" << "\n "
+              << exp_pass << " expected \n"
               << "\n " << htimer.elapsed<std::chrono::seconds>() << " seconds \n"
               << std::flush;
     // Initiate shutdown of the runtime system.

examples/jacobi_smp/jacobi_nonuniform.cpp

@@ -42,8 +42,8 @@ namespace jacobi_smp {
     {
         double result = b[row];
         double div = 1.0;
-        const std::size_t begin = A.row_begin(row);
-        const std::size_t end = A.row_end(row);
+        std::size_t const begin = A.row_begin(row);
+        std::size_t const end = A.row_end(row);
 
         for (std::size_t j = begin; j < end; ++j)
         {
@@ -149,8 +149,8 @@ int pika_main(variables_map& vm)
             double mean_per_row = 0.0;
             for (std::size_t r = 0; r < b.size(); ++r)
             {
-                const std::size_t begin = A.row_begin(r);
-                const std::size_t end = A.row_end(r);
+                std::size_t const begin = A.row_begin(r);
+                std::size_t const end = A.row_end(r);
                 std::size_t n_row = end - begin;
                 mean_per_row += double(n_row);
                 if (n_row > max_per_row) { max_per_row = n_row; }

libs/pika/async_cuda/include/pika/async_cuda/then_with_stream.hpp

@@ -37,9 +37,9 @@
 namespace pika::cuda::experimental::then_with_stream_detail {
     template <typename F, typename... Ts>
     auto invoke_with_thread_local_cublas_handle(cuda_scheduler& sched, cuda_stream const& stream,
-        cublasPointerMode_t pointer_mode, F&& f, Ts&&... ts)
-        -> decltype(PIKA_INVOKE(
-            PIKA_FORWARD(F, f), std::declval<cublasHandle_t>(), PIKA_FORWARD(Ts, ts)...))
+        cublasPointerMode_t pointer_mode, F&& f,
+        Ts&&... ts) -> decltype(PIKA_INVOKE(PIKA_FORWARD(F, f), std::declval<cublasHandle_t>(),
+                        PIKA_FORWARD(Ts, ts)...))
     {
         auto locked_handle = sched.get_cublas_handle(stream, pointer_mode);
         return PIKA_INVOKE(PIKA_FORWARD(F, f), locked_handle.get().get(), PIKA_FORWARD(Ts, ts)...);
@@ -48,7 +48,7 @@ namespace pika::cuda::experimental::then_with_stream_detail {
     template <typename F, typename... Ts>
     auto invoke_with_thread_local_cusolver_handle(cuda_scheduler& sched, cuda_stream const& stream,
         F&& f, Ts&&... ts) -> decltype(PIKA_INVOKE(PIKA_FORWARD(F, f),
-        std::declval<cusolverDnHandle_t>(), PIKA_FORWARD(Ts, ts)...))
+                               std::declval<cusolverDnHandle_t>(), PIKA_FORWARD(Ts, ts)...))
     {
         auto locked_handle = sched.get_cusolver_handle(stream);
         return PIKA_INVOKE(PIKA_FORWARD(F, f), locked_handle.get().get(), PIKA_FORWARD(Ts, ts)...);

libs/pika/async_cuda/tests/performance/cuda_scheduler_throughput.cpp

@@ -102,8 +102,8 @@ void matrixMultiply(sMatrixSize& matrix_size, std::size_t device, std::size_t it
     }));
 
     std::cout << "Small matrix multiply tests using CUBLAS...\n\n";
-    const T alpha = 1.0f;
-    const T beta = 0.0f;
+    T const alpha = 1.0f;
+    T const beta = 0.0f;
 
     auto test_function = [&](cu::cuda_scheduler& cuda_sched, std::string const& msg,
                              std::size_t n_iters) {

libs/pika/async_cuda/tests/unit/cublas_matmul.cpp

@@ -157,8 +157,8 @@ void matrixMultiply(pika::cuda::experimental::cuda_scheduler& cuda_sched, sMatri
     tt::sync_wait(std::move(copy_AB));
 
     std::cout << "Computing result using CUBLAS...\n";
-    const T alpha = 1.0f;
-    const T beta = 0.0f;
+    T const alpha = 1.0f;
+    T const beta = 0.0f;
 
     // Perform warmup operation with cublas
     // note cublas is column major ordering : transpose the order

libs/pika/async_mpi/tests/unit/mpi_ring_async_sender_receiver.cpp

@@ -348,8 +348,8 @@ int pika_main(pika::program_options::variables_map& vm)
     // --------------------------
     // Get user options/flags
     // --------------------------
-    const std::uint32_t iterations = vm["iterations"].as<std::uint32_t>();
-    const std::uint32_t num_rounds = vm["rounds"].as<std::uint32_t>();
+    std::uint32_t const iterations = vm["iterations"].as<std::uint32_t>();
+    std::uint32_t const num_rounds = vm["rounds"].as<std::uint32_t>();
     output = vm.count("output") != 0;
     recv_before_send = vm["recv-before-send"].as<bool>();
     //

libs/pika/async_mpi/tests/unit/pool_creation.cpp

@@ -25,8 +25,8 @@
 /// note that it is expected that this test will print warnings when a pool is created
 /// but not actually needed by the completion mode
 
-static const std::string random_name1 = "abcd12345qwerty";
-static const std::string random_name2 = "ta-daa-500";
+static std::string const random_name1 = "abcd12345qwerty";
+static std::string const random_name2 = "ta-daa-500";
 
 namespace ex = pika::execution::experimental;
 namespace mpi = pika::mpi::experimental;

libs/pika/command_line_handling/src/command_line_handling.cpp

@@ -258,8 +258,8 @@ namespace pika::detail {
     {
         // If using the process mask we override "cores" and "all" options but
         // keep explicit numeric values.
-        const std::size_t init_threads = get_number_of_default_threads(use_process_mask);
-        const std::size_t init_cores = get_number_of_default_cores(use_process_mask);
+        std::size_t const init_threads = get_number_of_default_threads(use_process_mask);
+        std::size_t const init_cores = get_number_of_default_cores(use_process_mask);
 
         std::size_t default_threads = init_threads;
 

libs/pika/command_line_handling/src/late_command_line_handling.cpp

@@ -110,8 +110,8 @@ namespace pika::detail {
         }
         catch (std::exception const& e)
         {
-            std::cerr << "handle_late_commandline_options: "
-                      << "command line processing: " << e.what() << std::endl;
+            std::cerr << "handle_late_commandline_options: " << "command line processing: "
+                      << e.what() << std::endl;
             return -1;
         }