Merge remote-tracking branch 'origin/master' into comm-grid-round-robin

eth-cscs · Dec 12, 2023 · b72fde5 · b72fde5
2 parents 3353914 + a48055c
commit b72fde5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -169,7 +169,7 @@ else()
 endif()
 
 # ----- pika
-find_package(pika 0.19.0 REQUIRED)
+find_package(pika 0.19.1 REQUIRED)
 
 # ----- BLASPP/LAPACKPP
 find_package(blaspp REQUIRED)

diff --git a/ci/cpu/gcc11_debug_stdexec.yml b/ci/cpu/gcc11_debug_stdexec.yml
@@ -18,3 +18,12 @@ cpu gcc11 stdexec debug build:
     - cpu gcc11 stdexec debug deps
   variables:
     DEPLOY_IMAGE: $CSCS_REGISTRY_PATH/cpu-gcc11-stdexec-debug/deploy:$CI_COMMIT_SHA
+
+cpu gcc11 stdexec debug test:
+  extends: .run_common
+  needs:
+    - cpu gcc11 stdexec debug build
+  trigger:
+    include:
+      - artifact: pipeline.yml
+        job: cpu gcc11 stdexec debug build
diff --git a/ci/docker/debug-cpu-stdexec.yaml b/ci/docker/debug-cpu-stdexec.yaml
@@ -31,5 +31,5 @@ spack:
         - 'malloc=system'
     stdexec:
       require:
-        - '@git.48c52df0f81c6151eecf4f39fa5eed2dc0216204=main'
+        - '@git.nvhpc-23.09.rc4=main'
         - 'build_type=Debug'
diff --git a/include/dlaf/eigensolver/band_to_tridiag/mc.h b/include/dlaf/eigensolver/band_to_tridiag/mc.h
@@ -827,7 +827,7 @@ TridiagResult<T, Device::CPU> BandToTridiag<Backend::MC, D, T>::call_L(
           ex::when_all_vector(matrix::select(mat_v, common::iterate_range2d(LocalTileIndex{i, i},
                                                                             LocalTileSize{n - i, 1}))) |
           ex::then([](TileVector&& vector) { return std::make_shared<TileVector>(std::move(vector)); }) |
-          ex::split();
+          ex::drop_operation_state() | ex::split();
     }
 
     ex::when_all(std::move(sem_sender), ex::just(sem_next, sweep), w_pipeline.readwrite(), tiles_v) |
@@ -1348,7 +1348,7 @@ TridiagResult<T, Device::CPU> BandToTridiag<Backend::MC, D, T>::call_L(
         if (sweep % b == 0) {
           tile_v = panel_v.readwrite(LocalTileIndex{id_block_local, 0}) |
                    ex::then([](Tile&& tile) { return std::make_shared<Tile>(std::move(tile)); }) |
-                   ex::split();
+                   ex::drop_operation_state() | ex::split();
         }
 
         ex::unique_any_sender<SemaphorePtr> sem_sender;

diff --git a/include/dlaf/sender/transform.h b/include/dlaf/sender/transform.h
@@ -51,6 +51,7 @@ template <TransformDispatchType Tag = TransformDispatchType::Plain, Backend B =
           typename F = void, typename Sender = void,
           typename = std::enable_if_t<pika::execution::experimental::is_sender_v<Sender>>>
 [[nodiscard]] decltype(auto) transform(const Policy<B> policy, F&& f, Sender&& sender) {
+  using pika::execution::experimental::drop_operation_state;
   using pika::execution::experimental::then;
   using pika::execution::experimental::transfer;
 
@@ -61,7 +62,8 @@ template <TransformDispatchType Tag = TransformDispatchType::Plain, Backend B =
   using dlaf::common::internal::Unwrapping;
 
   if constexpr (B == Backend::MC) {
-    return then(std::move(transfer_sender), ConsumeRvalues{Unwrapping{std::forward<F>(f)}});
+    return then(std::move(transfer_sender), ConsumeRvalues{Unwrapping{std::forward<F>(f)}}) |
+           drop_operation_state();
   }
   else if constexpr (B == Backend::GPU) {
 #if defined(DLAF_WITH_GPU)
@@ -71,15 +73,18 @@ template <TransformDispatchType Tag = TransformDispatchType::Plain, Backend B =
 
     if constexpr (Tag == TransformDispatchType::Plain) {
       return then_with_stream(std::move(transfer_sender),
-                              ConsumeRvalues{Unwrapping{std::forward<F>(f)}});
+                              ConsumeRvalues{Unwrapping{std::forward<F>(f)}}) |
+             drop_operation_state();
     }
     else if constexpr (Tag == TransformDispatchType::Blas) {
       return then_with_cublas(std::move(transfer_sender), ConsumeRvalues{Unwrapping{std::forward<F>(f)}},
-                              CUBLAS_POINTER_MODE_HOST);
+                              CUBLAS_POINTER_MODE_HOST) |
+             drop_operation_state();
     }
     else if constexpr (Tag == TransformDispatchType::Lapack) {
       return then_with_cusolver(std::move(transfer_sender),
-                                ConsumeRvalues{Unwrapping{std::forward<F>(f)}});
+                                ConsumeRvalues{Unwrapping{std::forward<F>(f)}}) |
+             drop_operation_state();
     }
     else {
       DLAF_STATIC_FAIL(

diff --git a/include/dlaf/sender/transform_mpi.h b/include/dlaf/sender/transform_mpi.h
@@ -11,6 +11,8 @@
 
 #include <type_traits>
 
+#include <pika/execution.hpp>
+
 #include <dlaf/common/consume_rvalues.h>
 #include <dlaf/common/unwrap.h>
 #include <dlaf/communication/communicator.h>
@@ -91,7 +93,8 @@ template <typename F, typename Sender,
   return ex::transfer(std::forward<Sender>(sender),
                       ex::with_priority(dlaf::internal::getMPIScheduler(),
                                         pika::execution::thread_priority::boost)) |
-         ex::then(dlaf::common::internal::ConsumeRvalues{MPICallHelper{std::forward<F>(f)}});
+         ex::then(dlaf::common::internal::ConsumeRvalues{MPICallHelper{std::forward<F>(f)}}) |
+         ex::drop_operation_state();
 }
 
 /// Fire-and-forget transformMPI. This submits the work and returns void.

diff --git a/spack/packages/dla-future/package.py b/spack/packages/dla-future/package.py
@@ -66,7 +66,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("pika@0.16:", when="@0.2.0")
     depends_on("pika@0.17:", when="@0.2.1")
     depends_on("pika@0.18:", when="@0.3.0:")
-    depends_on("pika@0.19:", when="@master")
+    depends_on("pika@0.19.1:", when="@master")
     depends_on("pika-algorithms@0.1:", when="@:0.2")
     depends_on("pika +mpi")
     depends_on("pika +cuda", when="+cuda")