rename according to STEllAR-GROUP/hpx#5644

eth-cscs · Dec 1, 2021 · 1c3c59c · 1c3c59c
1 parent 3df633e
commit 1c3c59c
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 45 deletions.
diff --git a/include/dlaf/eigensolver/gen_to_std/impl.h b/include/dlaf/eigensolver/gen_to_std/impl.h
@@ -43,7 +43,7 @@ void hegstDiagTile(hpx::threads::thread_priority priority, AKKSender&& a_kk, LKK
   dlaf::internal::whenAllLift(1, blas::Uplo::Lower, std::forward<AKKSender>(a_kk),
                               std::forward<LKKSender>(l_kk)) |
       dlaf::tile::hegst(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class LKKSender, class AIKSender>
@@ -54,7 +54,7 @@ void trsmPanelTile(hpx::threads::thread_priority priority, LKKSender&& l_kk, AIK
                               blas::Diag::NonUnit, ElementType(1.0), std::forward<LKKSender>(l_kk),
                               std::forward<AIKSender>(a_ik)) |
       dlaf::tile::trsm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class AKKSender, class LIKSender, class AIKSender>
@@ -66,7 +66,7 @@ void hemmPanelTile(hpx::threads::thread_priority priority, AKKSender&& a_kk, LIK
                               std::forward<AKKSender>(a_kk), std::forward<LIKSender>(l_ik),
                               ElementType(1.0), std::forward<AIKSender>(a_ik)) |
       dlaf::tile::hemm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class AJKSender, class LJKSender, class AKKSender>
@@ -78,7 +78,7 @@ void her2kTrailingDiagTile(hpx::threads::thread_priority priority, AJKSender&& a
                               std::forward<AJKSender>(a_jk), std::forward<LJKSender>(l_jk),
                               BaseType<ElementType>(1.0), std::forward<AKKSender>(a_kk)) |
       dlaf::tile::her2k(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class MatIKSender, class MatJKSender, class AIJSender>
@@ -90,7 +90,7 @@ void gemmTrailingMatrixTile(hpx::threads::thread_priority priority, MatIKSender&
                               std::forward<MatIKSender>(mat_ik), std::forward<MatJKSender>(mat_jk),
                               ElementType(1.0), std::forward<AIJSender>(a_ij)) |
       dlaf::tile::gemm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class LJJSender, class AJKSender>
@@ -101,7 +101,7 @@ void trsmPanelUpdateTile(hpx::threads::thread_priority priority, LJJSender&& l_j
                               blas::Diag::NonUnit, ElementType(1.0), std::forward<LJJSender>(l_jj),
                               std::forward<AJKSender>(a_jk)) |
       dlaf::tile::trsm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class LIJSender, class AJKSender, class AIKSender>
@@ -113,7 +113,7 @@ void gemmPanelUpdateTile(hpx::threads::thread_priority priority, LIJSender&& l_i
                               std::forward<LIJSender>(l_ij), std::forward<AJKSender>(a_jk),
                               ElementType(1.0), std::forward<AIKSender>(a_ik)) |
       dlaf::tile::gemm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 }
 
@@ -123,7 +123,7 @@ void hegstDiagTile(hpx::threads::thread_priority priority, AKKSender&& a_kk, LKK
   dlaf::internal::whenAllLift(1, blas::Uplo::Upper, std::forward<AKKSender>(a_kk),
                               std::forward<LKKSender>(l_kk)) |
       dlaf::tile::hegst(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class LKKSender, class AIKSender>
@@ -134,7 +134,7 @@ void trsmPanelTile(hpx::threads::thread_priority priority, LKKSender&& l_kk, AIK
                               blas::Diag::NonUnit, ElementType(1.0), std::forward<LKKSender>(l_kk),
                               std::forward<AIKSender>(a_ik)) |
       dlaf::tile::trsm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class AKKSender, class LIKSender, class AIKSender>
@@ -146,7 +146,7 @@ void hemmPanelTile(hpx::threads::thread_priority priority, AKKSender&& a_kk, LIK
                               std::forward<AKKSender>(a_kk), std::forward<LIKSender>(l_ik),
                               ElementType(1.0), std::forward<AIKSender>(a_ik)) |
       dlaf::tile::hemm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class AJKSender, class LJKSender, class AKKSender>
@@ -158,7 +158,7 @@ void her2kTrailingDiagTile(hpx::threads::thread_priority priority, AJKSender&& a
                               std::forward<AJKSender>(a_jk), std::forward<LJKSender>(l_jk),
                               BaseType<ElementType>(1.0), std::forward<AKKSender>(a_kk)) |
       dlaf::tile::her2k(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class MatIKSender, class MatJKSender, class AIJSender>
@@ -170,7 +170,7 @@ void gemmTrailingMatrixTile(hpx::threads::thread_priority priority, MatIKSender&
                               std::forward<MatIKSender>(mat_ik), std::forward<MatJKSender>(mat_jk),
                               ElementType(1.0), std::forward<AIJSender>(a_ij)) |
       dlaf::tile::gemm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class LJJSender, class AJKSender>
@@ -181,7 +181,7 @@ void trsmPanelUpdateTile(hpx::threads::thread_priority priority, LJJSender&& l_j
                               blas::Diag::NonUnit, ElementType(1.0), std::forward<LJJSender>(l_jj),
                               std::forward<AJKSender>(a_jk)) |
       dlaf::tile::trsm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class LIJSender, class AJKSender, class AIKSender>
@@ -193,7 +193,7 @@ void gemmPanelUpdateTile(hpx::threads::thread_priority priority, LIJSender&& l_i
                               std::forward<LIJSender>(l_ij), std::forward<AJKSender>(a_jk),
                               ElementType(1.0), std::forward<AIKSender>(a_ik)) |
       dlaf::tile::gemm(dlaf::internal::Policy<backend>(priority)) |
-      hpx::execution::experimental::detach();
+      hpx::execution::experimental::start_detached();
 }
 }
 

diff --git a/include/dlaf/factorization/cholesky/impl.h b/include/dlaf/factorization/cholesky/impl.h
@@ -40,7 +40,8 @@ namespace cholesky_l {
 template <Backend backend, class MatrixTileSender>
 void potrfDiagTile(hpx::threads::thread_priority priority, MatrixTileSender&& matrix_tile) {
   dlaf::internal::whenAllLift(blas::Uplo::Lower, std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::potrf(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::potrf(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class KKTileSender, class MatrixTileSender>
@@ -51,7 +52,8 @@ void trsmPanelTile(hpx::threads::thread_priority priority, KKTileSender&& kk_til
   dlaf::internal::whenAllLift(blas::Side::Right, blas::Uplo::Lower, blas::Op::ConjTrans,
                               blas::Diag::NonUnit, ElementType(1.0), std::forward<KKTileSender>(kk_tile),
                               std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::trsm(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::trsm(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class PanelTileSender, class MatrixTileSender>
@@ -62,7 +64,8 @@ void herkTrailingDiagTile(hpx::threads::thread_priority priority, PanelTileSende
   dlaf::internal::whenAllLift(blas::Uplo::Lower, blas::Op::NoTrans, BaseElementType(-1.0),
                               std::forward<PanelTileSender>(panel_tile), BaseElementType(1.0),
                               std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::herk(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::herk(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class PanelTileSender, class ColPanelSender, class MatrixTileSender>
@@ -74,15 +77,17 @@ void gemmTrailingMatrixTile(hpx::threads::thread_priority priority, PanelTileSen
                               std::forward<PanelTileSender>(panel_tile),
                               std::forward<ColPanelSender>(col_panel), ElementType(1.0),
                               std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::gemm(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::gemm(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 }
 
 namespace cholesky_u {
 template <Backend backend, class MatrixTileSender>
 void potrfDiagTile(hpx::threads::thread_priority priority, MatrixTileSender&& matrix_tile) {
   dlaf::internal::whenAllLift(blas::Uplo::Upper, std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::potrf(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::potrf(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class KKTileSender, class MatrixTileSender>
@@ -93,7 +98,8 @@ void trsmPanelTile(hpx::threads::thread_priority priority, KKTileSender&& kk_til
   dlaf::internal::whenAllLift(blas::Side::Left, blas::Uplo::Upper, blas::Op::ConjTrans,
                               blas::Diag::NonUnit, ElementType(1.0), std::forward<KKTileSender>(kk_tile),
                               std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::trsm(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::trsm(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class PanelTileSender, class MatrixTileSender>
@@ -104,7 +110,8 @@ void herkTrailingDiagTile(hpx::threads::thread_priority priority, PanelTileSende
   dlaf::internal::whenAllLift(blas::Uplo::Upper, blas::Op::ConjTrans, base_element_type(-1.0),
                               std::forward<PanelTileSender>(panel_tile), base_element_type(1.0),
                               std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::herk(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::herk(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 
 template <Backend backend, class PanelTileSender, class ColPanelSender, class MatrixTileSender>
@@ -116,7 +123,8 @@ void gemmTrailingMatrixTile(hpx::threads::thread_priority priority, PanelTileSen
                               std::forward<PanelTileSender>(panel_tile),
                               std::forward<ColPanelSender>(col_panel), ElementType(1.0),
                               std::forward<MatrixTileSender>(matrix_tile)) |
-      tile::gemm(dlaf::internal::Policy<backend>(priority)) | hpx::execution::experimental::detach();
+      tile::gemm(dlaf::internal::Policy<backend>(priority)) |
+      hpx::execution::experimental::start_detached();
 }
 }
 

diff --git a/include/dlaf/matrix/copy.h b/include/dlaf/matrix/copy.h
@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <hpx/local/execution.hpp>
 #include <hpx/local/future.hpp>
 #include <hpx/local/unwrap.hpp>
 
@@ -43,7 +44,7 @@ void copy(Matrix<const T, Source>& source, Matrix<T, Destination>& dest) {
       ex::when_all(source.read_sender(LocalTileIndex(i, j)),
                    dest.readwrite_sender(LocalTileIndex(i, j))) |
           copy(dlaf::internal::Policy<internal::CopyBackend<Source, Destination>::value>{}) |
-          ex::detach();
+          ex::start_detached();
     }
   }
 }

diff --git a/include/dlaf/sender/transform.h b/include/dlaf/sender/transform.h
@@ -52,9 +52,9 @@ struct Transform<Backend::MC> {
   template <typename S, typename F>
   static auto call(const Policy<Backend::MC> policy, S&& s, F&& f) {
     namespace ex = hpx::execution::experimental;
-    return ex::transform(ex::on(std::forward<S>(s),
-                                ex::with_priority(ex::thread_pool_scheduler{}, policy.priority())),
-                         hpx::unwrapping(std::forward<F>(f)));
+    return ex::then(ex::on(std::forward<S>(s),
+                           ex::with_priority(ex::thread_pool_scheduler{}, policy.priority())),
+                    hpx::unwrapping(std::forward<F>(f)));
   }
 };
 
@@ -245,7 +245,7 @@ template <Backend B, typename F, typename... Ts>
 /// when_all sender of the lifted senders.
 template <Backend B, typename F, typename... Ts>
 void transformLiftDetach(const Policy<B> policy, F&& f, Ts&&... ts) {
-  hpx::execution::experimental::detach(
+  hpx::execution::experimental::start_detached(
       transformLift<B>(policy, std::forward<F>(f), std::forward<Ts>(ts)...));
 }
 }