adapt after rebase on new master

eth-cscs · Nov 30, 2023 · 65349b5 · 65349b5
1 parent d8ea3dd
commit 65349b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/include/dlaf/eigensolver/tridiag_solver/merge.h b/include/dlaf/eigensolver/tridiag_solver/merge.h
@@ -492,8 +492,9 @@ SizeType stablePartitionIndexForDeflationArrays(const matrix::Distribution& dist
     offsets_t& rank_offsets = offsets[to_sizet(rank)];
 
     const SizeType jjj_el_lc = to_SizeType(rank_offsets[ev_sort_order(coltype)]++);
+    using matrix::internal::distribution::global_element_from_local_element_on_rank;
     const SizeType jjj_el =
-        dist_sub.template globalElementFromLocalElementAndRank<Coord::Col>(rank, jjj_el_lc);
+        global_element_from_local_element_on_rank<Coord::Col>(dist_sub, rank, jjj_el_lc);
 
     index_sorted_coltype[to_sizet(jjj_el)] = jj_el;
   }

diff --git a/include/dlaf/permutations/general/impl.h b/include/dlaf/permutations/general/impl.h
@@ -27,6 +27,8 @@
 #include <dlaf/lapack/gpu/lacpy.h>
 #include <dlaf/lapack/tile.h>
 #include <dlaf/matrix/copy_tile.h>
+#include <dlaf/matrix/distribution.h>
+#include <dlaf/matrix/distribution_extensions.h>
 #include <dlaf/matrix/index.h>
 #include <dlaf/matrix/matrix.h>
 #include <dlaf/matrix/matrix_ref.h>
@@ -210,10 +212,12 @@ void permuteJustLocal(const SizeType i_begin, const SizeType i_end, Matrix<const
 
   const matrix::Distribution& distr = mat_in.distribution();
 
-  const SubMatrixSpec sub_spec{
-      distr.globalElementIndex({i_begin, i_begin}, {0, 0}),
-      distr.globalTileElementDistance({i_begin, i_begin}, {i_end, i_end}),
-  };
+  using matrix::internal::distribution::global_tile_element_distance;
+  const SubMatrixSpec sub_spec{distr.globalElementIndex({i_begin, i_begin}, {0, 0}),
+                               {
+                                   global_tile_element_distance<Coord::Row>(distr, i_begin, i_end),
+                                   global_tile_element_distance<Coord::Col>(distr, i_begin, i_end),
+                               }};
   MatrixRef<const T, D> mat_sub_in(mat_in, sub_spec);
   MatrixRef<T, D> mat_sub_out(mat_out, sub_spec);