From 3d21dc900bdb4fb5ce30ebbacded3230150f6623 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi Date: Thu, 20 Jul 2023 18:50:44 +0200 Subject: [PATCH] fix comments and remove not needed ensure_started --- .../dlaf/eigensolver/tridiag_solver/merge.h | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/dlaf/eigensolver/tridiag_solver/merge.h b/include/dlaf/eigensolver/tridiag_solver/merge.h index 6864065136..e6c2767d7a 100644 --- a/include/dlaf/eigensolver/tridiag_solver/merge.h +++ b/include/dlaf/eigensolver/tridiag_solver/merge.h @@ -743,7 +743,7 @@ void mergeSubproblems(const SizeType i_begin, const SizeType i_split, const Size // Step #2 // // i2 (in) : initial <--- pre_sorted - // i5 (out) : initial <--- sorted by coltype + // i5 (out) : initial <--- sorted by coltype // i3 (out) : initial <--- deflated // i4 (out) : deflated <--- sorted by coltype // @@ -756,14 +756,13 @@ void mergeSubproblems(const SizeType i_begin, const SizeType i_split, const Size // by coltype) // - set deflated diagonal entries of `U` to 1 (temporary solution until optimized GEMM is implemented) // - // | U | U | D | D | | | DF | DF | U: UpperHalf - // | U | U | D | D | | | DF | DF | D: Dense - // | | | D | D | L | L | DF | DF | L: LowerHalf + // | U | U | D | D | | | DF | DF | U: UpperHalf + // | U | U | D | D | | | DF | DF | D: Dense + // | | | D | D | L | L | DF | DF | L: LowerHalf // | | | D | D | L | L | DF | DF | DF: Deflated // | | | D | D | L | L | DF | DF | // - auto k = ex::ensure_started(stablePartitionIndexForDeflation(i_begin, i_end, ws_h.c, ws_hm.i2, ws_h.i3, - ws_hm.i5)) | + auto k = stablePartitionIndexForDeflation(i_begin, i_end, ws_h.c, ws_hm.i2, ws_h.i3, ws_hm.i5) | ex::split(); copy(idx_begin_tiles_vec, sz_tiles_vec, ws_hm.i5, ws.i5); @@ -774,15 +773,15 @@ void mergeSubproblems(const SizeType i_begin, const SizeType i_split, const Size copy(idx_begin_tiles_vec, sz_tiles_vec, ws_hm.d1, ws_h.d0); // - // i3 (in) : initial <--- deflated - // i2 (out) : initial ---> deflated + // i3 (in) : initial <--- deflated + // i2 (out) : deflated <--- initial // invertIndex(i_begin, i_end, ws_h.i3, ws_hm.i2); // - // i5 (in) : sort by coltype ---> initial - // i2 (in) : initial ---> deflated - // i4 (out) : sort by col type ---> deflated + // i5 (in) : initial <--- sort by coltype + // i2 (in) : deflated <--- initial + // i4 (out) : deflated <--- sort by col type // // This allows to work in rank1 solver with columns sorted by type, so that they are well-shaped for // an optimized gemm, but still keeping track of where the actual position sorted by eigenvalues is.