From 78708f2b324ec0bc35ddbeb21030a34301c4d849 Mon Sep 17 00:00:00 2001
From: Jacob Domagala <domagala.jacob@gmail.com>
Date: Mon, 14 Mar 2022 21:27:54 +0100
Subject: [PATCH 1/4] #1544: Add unit test for Collection with indicies over 3
 dimensions

---
 src/vt/topos/mapping/dense/dense.h            |  3 +++
 .../test_collection_construct_common.h        | 18 ++++++++++-----
 tests/unit/collection/test_construct.cc       | 22 ++++++++++++++-----
 .../test_construct_no_idx.extended.cc         |  1 +
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/vt/topos/mapping/dense/dense.h b/src/vt/topos/mapping/dense/dense.h
index ed819498e2..83598acfab 100644
--- a/src/vt/topos/mapping/dense/dense.h
+++ b/src/vt/topos/mapping/dense/dense.h
@@ -74,6 +74,7 @@ using IdxPtr = Index*;
 template <typename T = IdxBase> using Idx1DPtr = IdxType1D<T>*;
 template <typename T = IdxBase> using Idx2DPtr = IdxType2D<T>*;
 template <typename T = IdxBase> using Idx3DPtr = IdxType3D<T>*;
+template <typename T, typename N> using IdxNDPtr = vt::index::IdxType<T, N>*;
 
 template <typename Idx, index::NumDimensionsType ndim>
 NodeType denseBlockMap(IdxPtr<Idx> idx, IdxPtr<Idx> max_idx, NodeType nnodes);
@@ -84,6 +85,8 @@ template <typename T = IdxBase>
 NodeType defaultDenseIndex2DMap(Idx2DPtr<T> idx, Idx2DPtr<T> max, NodeType n);
 template <typename T = IdxBase>
 NodeType defaultDenseIndex3DMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType n);
+template <typename T, typename N>
+NodeType defaultDenseIndex3DMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType n);
 
 template <typename T = IdxBase>
 NodeType dense1DRoundRobinMap(  Idx1DPtr<T> idx, Idx1DPtr<T> max, NodeType n);
diff --git a/tests/unit/collection/test_collection_construct_common.h b/tests/unit/collection/test_collection_construct_common.h
index 997680c326..8aaed7304e 100644
--- a/tests/unit/collection/test_collection_construct_common.h
+++ b/tests/unit/collection/test_collection_construct_common.h
@@ -108,6 +108,14 @@ struct ConstructParams {
 TYPED_TEST_SUITE_P(TestConstruct);
 TYPED_TEST_SUITE_P(TestConstructDist);
 
+template <typename ColT, uint8_t N>
+typename ColT::IndexType CreateRange(typename ColT::IndexType::DenseIndexType range) {
+  std::array<typename ColT::IndexType::DenseIndexType, N> arr;
+  std::fill(arr.begin(), arr.end(), range);
+
+  return arr;
+}
+
 template<typename ColType>
 void test_construct_1(std::string const& label) {
   using MsgType   = typename ColType::MsgType;
@@ -115,8 +123,10 @@ void test_construct_1(std::string const& label) {
   auto const& this_node = theContext()->getNode();
   if (this_node == 0) {
     auto const& col_size = 32;
-    auto rng = TestIndex(col_size);
+
+    auto rng = CreateRange<ColType, ColType::IndexType::ndims()>(col_size);
     auto proxy = ConstructParams<ColType>::construct(label, rng);
+
     proxy.template broadcast<
       MsgType,
       ConstructHandlers::handler<ColType,MsgType>
@@ -129,10 +139,8 @@ void test_construct_distributed_1() {
   using MsgType   = typename ColType::MsgType;
 
   auto const& col_size = 32;
-  auto rng = TestIndex(col_size);
-  auto proxy = ConstructParams<ColType>::constructCollective(
-    rng, "test_construct_distributed_1"
-  );
+  auto rng = CreateRange<ColType, ColType::IndexType::ndims()>(col_size);
+  auto proxy = ConstructParams<ColType>::constructCollective(rng, "test_construct_distributed_1");
   proxy.template broadcast<
     MsgType,
     ConstructHandlers::handler<ColType,MsgType>
diff --git a/tests/unit/collection/test_construct.cc b/tests/unit/collection/test_construct.cc
index 6a54b9ab6d..31d60c9212 100644
--- a/tests/unit/collection/test_construct.cc
+++ b/tests/unit/collection/test_construct.cc
@@ -53,16 +53,26 @@
 namespace vt { namespace tests { namespace unit {
 
 namespace default_ {
-struct ColMsg;
-struct TestCol : Collection<TestCol,vt::Index1D> {
-  using MsgType = ColMsg;
+struct Col1DMsg;
+struct Col4DMsg;
+
+struct TestCol1D : Collection<TestCol1D, vt::Index1D> {
+  using MsgType = Col1DMsg;
+};
+
+struct TestCol4D : Collection<TestCol4D, vt::IndexND<4>> {
+  using MsgType = Col4DMsg;
 };
 
-struct ColMsg : CollectionMessage<TestCol> { };
+struct Col1DMsg : CollectionMessage<TestCol1D> { };
+struct Col4DMsg : CollectionMessage<TestCol4D> { };
 } /* end namespace default_ */
 
-using CollectionTestTypes = testing::Types<default_::TestCol>;
-using CollectionTestDistTypes = testing::Types<default_::TestCol>;
+using CollectionTestTypes =
+  testing::Types<default_::TestCol1D, default_::TestCol4D>;
+
+using CollectionTestDistTypes =
+  testing::Types<default_::TestCol1D, default_::TestCol4D>;
 
 TYPED_TEST_P(TestConstruct, test_construct_basic_1) {
   test_construct_1<TypeParam>("test_construct_basic_1");
diff --git a/tests/unit/collection/test_construct_no_idx.extended.cc b/tests/unit/collection/test_construct_no_idx.extended.cc
index 6cec8eb1da..603afc12a0 100644
--- a/tests/unit/collection/test_construct_no_idx.extended.cc
+++ b/tests/unit/collection/test_construct_no_idx.extended.cc
@@ -57,6 +57,7 @@ struct ColMsg;
 struct TestCol : Collection<TestCol,vt::Index1D> {
   using MsgType = ColMsg;
 };
+
 struct ColMsg : CollectionMessage<TestCol> {};
 } /* end namespace multi_param_no_idx_ */
 

From a4832ac81f60b54b4eab1ed9047820668aae5f10 Mon Sep 17 00:00:00 2001
From: Jacob Domagala <domagala.jacob@gmail.com>
Date: Tue, 5 Apr 2022 15:38:57 +0200
Subject: [PATCH 2/4] #1544: collection: Implement default_map for indices with
 more than 3 dimensions

---
 src/vt/topos/index/dense/dense_array.h       |  2 +-
 src/vt/topos/index/index.h                   |  4 ++++
 src/vt/topos/mapping/dense/dense.h           | 19 ++++++++++++++++---
 src/vt/topos/mapping/dense/dense.impl.h      | 10 ++++++++++
 src/vt/vrt/collection/defaults/default_map.h | 13 +++++++++++--
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/vt/topos/index/dense/dense_array.h b/src/vt/topos/index/dense/dense_array.h
index 51ce06ff66..a40a05d215 100644
--- a/src/vt/topos/index/dense/dense_array.h
+++ b/src/vt/topos/index/dense/dense_array.h
@@ -102,7 +102,7 @@ struct DenseIndexArray : BaseIndex, serialization::ByteCopyTrait {
   DenseIndexArray(std::array<IndexType, ndim> in_array);
   DenseIndexArray(DenseIndexArraySingleInitTag, IndexType const& init_value);
 
-  NumDimensionsType ndims() const { return ndim; }
+  static constexpr NumDimensionsType ndims() { return ndim; }
 
   IndexType& operator[](IndexType const& index);
   IndexType const& operator[](IndexType const& index) const;
diff --git a/src/vt/topos/index/index.h b/src/vt/topos/index/index.h
index fa064bb2a8..4be63a31a5 100644
--- a/src/vt/topos/index/index.h
+++ b/src/vt/topos/index/index.h
@@ -60,6 +60,7 @@ template <typename T = IdxBase> using Index1D  = DenseIndexArray<T, 1>;
 template <typename T = IdxBase> using Index2D  = DenseIndexArray<T, 2>;
 template <typename T = IdxBase> using Index3D  = DenseIndexArray<T, 3>;
 template <typename T, int8_t N> using IdxType = DenseIndexArray<T, N>;
+template <typename T, int8_t N> using IndexND  = DenseIndexArray<T, N>;
 
 static_assert(IndexTraits<Index1D<IdxBase>>::is_index, "Does not conform");
 static_assert(IndexTraits<Index2D<IdxBase>>::is_index, "Does not conform");
@@ -76,11 +77,14 @@ using IdxBase    = index::IdxBase;
 using Index1D  = index::Index1D<index::IdxBase>;
 using Index2D  = index::Index2D<index::IdxBase>;
 using Index3D  = index::Index3D<index::IdxBase>;
+template <int8_t N>
+using IndexND  = index::IndexND<index::IdxBase, N>;
 
 template <typename T, int8_t N> using IdxType   = index::IdxType<T, N>;
 template <typename T>           using IdxType1D = index::Index1D<T>;
 template <typename T>           using IdxType2D = index::Index2D<T>;
 template <typename T>           using IdxType3D = index::Index3D<T>;
+template <typename T, int8_t N> using IdxTypeND = index::IndexND<T, N>;
 
 }  // end namespace vt
 
diff --git a/src/vt/topos/mapping/dense/dense.h b/src/vt/topos/mapping/dense/dense.h
index 83598acfab..f78c8dec3a 100644
--- a/src/vt/topos/mapping/dense/dense.h
+++ b/src/vt/topos/mapping/dense/dense.h
@@ -74,7 +74,7 @@ using IdxPtr = Index*;
 template <typename T = IdxBase> using Idx1DPtr = IdxType1D<T>*;
 template <typename T = IdxBase> using Idx2DPtr = IdxType2D<T>*;
 template <typename T = IdxBase> using Idx3DPtr = IdxType3D<T>*;
-template <typename T, typename N> using IdxNDPtr = vt::index::IdxType<T, N>*;
+template <typename T, int8_t N> using IdxNDPtr = vt::index::IdxType<T, N>*;
 
 template <typename Idx, index::NumDimensionsType ndim>
 NodeType denseBlockMap(IdxPtr<Idx> idx, IdxPtr<Idx> max_idx, NodeType nnodes);
@@ -85,8 +85,8 @@ template <typename T = IdxBase>
 NodeType defaultDenseIndex2DMap(Idx2DPtr<T> idx, Idx2DPtr<T> max, NodeType n);
 template <typename T = IdxBase>
 NodeType defaultDenseIndex3DMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType n);
-template <typename T, typename N>
-NodeType defaultDenseIndex3DMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType n);
+template <typename T, int8_t N>
+NodeType defaultDenseIndexNDMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType n);
 
 template <typename T = IdxBase>
 NodeType dense1DRoundRobinMap(  Idx1DPtr<T> idx, Idx1DPtr<T> max, NodeType n);
@@ -94,6 +94,8 @@ template <typename T = IdxBase>
 NodeType dense2DRoundRobinMap(  Idx2DPtr<T> idx, Idx2DPtr<T> max, NodeType n);
 template <typename T = IdxBase>
 NodeType dense3DRoundRobinMap(  Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType n);
+template <typename T, int8_t N>
+NodeType denseNDRoundRobinMap(  IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType n);
 
 template <typename T = IdxBase>
 NodeType dense1DBlockMap(       Idx1DPtr<T> idx, Idx1DPtr<T> max, NodeType n);
@@ -101,10 +103,13 @@ template <typename T = IdxBase>
 NodeType dense2DBlockMap(       Idx2DPtr<T> idx, Idx2DPtr<T> max, NodeType n);
 template <typename T = IdxBase>
 NodeType dense3DBlockMap(       Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType n);
+template <typename T, int8_t N>
+NodeType denseNDBlockMap(       IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType n);
 
 template <typename T = IdxBase>   using i1D   = IdxType1D<T>;
 template <typename T = IdxBase>   using i2D   = IdxType2D<T>;
 template <typename T = IdxBase>   using i3D   = IdxType3D<T>;
+template <typename T, int8_t N>   using iND   = IdxTypeND<T,N>;
 
 template <typename F, F* f, typename IndexT>
 using Adapt = MapFunctorAdapt<F, f, IndexT>;
@@ -115,18 +120,26 @@ template <typename T = IdxBase>
 using dense2DMapFn    = Adapt<MapAdapter<i2D<T>>, defaultDenseIndex2DMap<T>, i2D<T> >;
 template <typename T = IdxBase>
 using dense3DMapFn    = Adapt<MapAdapter<i3D<T>>, defaultDenseIndex3DMap<T>, i3D<T> >;
+template <typename T, int8_t N>
+using denseNDMapFn    = Adapt<MapAdapter<iND<T, N>>, defaultDenseIndexNDMap<T>, iND<T, N> >;
+
 template <typename T = IdxBase>
 using dense1DRRMapFn  = Adapt<MapAdapter<i1D<T>>, dense1DRoundRobinMap<T>, i1D<T>>;
 template <typename T = IdxBase>
 using dense2DRRMapFn  = Adapt<MapAdapter<i2D<T>>, dense2DRoundRobinMap<T>, i2D<T>>;
 template <typename T = IdxBase>
 using dense3DRRMapFn  = Adapt<MapAdapter<i3D<T>>, dense3DRoundRobinMap<T>, i3D<T>>;
+template <typename T, int8_t N>
+using denseNDRRMapFn  = Adapt<MapAdapter<iND<T, N>>, denseNDRoundRobinMap<T>, iND<T, N> >;
+
 template <typename T = IdxBase>
 using dense1DBlkMapFn = Adapt<MapAdapter<i1D<T>>, dense1DBlockMap<T>, i1D<T>>;
 template <typename T = IdxBase>
 using dense2DBlkMapFn = Adapt<MapAdapter<i2D<T>>, dense2DBlockMap<T>, i2D<T>>;
 template <typename T = IdxBase>
 using dense3DBlkMapFn = Adapt<MapAdapter<i3D<T>>, dense3DBlockMap<T>, i3D<T>>;
+template <typename T, int8_t N>
+using denseNDBlkMapFn = Adapt<MapAdapter<iND<T, N>>, denseNDBlockMap<T>, iND<T, N> >;
 
 }}  // end namespace vt::mapping
 
diff --git a/src/vt/topos/mapping/dense/dense.impl.h b/src/vt/topos/mapping/dense/dense.impl.h
index c608104ec7..2d6d83b8c1 100644
--- a/src/vt/topos/mapping/dense/dense.impl.h
+++ b/src/vt/topos/mapping/dense/dense.impl.h
@@ -68,6 +68,11 @@ NodeType defaultDenseIndex3DMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType nx) {
   return dense3DBlockMap<T>(idx, max, nx);
 }
 
+template <typename T, int8_t N>
+NodeType defaultDenseIndexNDMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType nx) {
+  return denseNDBlockMap<T>(idx, max, nx);
+}
+
 // Default round robin mappings
 template <typename T>
 NodeType dense1DRoundRobinMap(Idx1DPtr<T> idx, Idx1DPtr<T> max, NodeType nx) {
@@ -104,6 +109,11 @@ NodeType dense3DBlockMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType nx) {
   return denseBlockMap<IdxType3D<T>, 3>(idx, max, nx);
 }
 
+template <typename T, int8_t N>
+NodeType denseNDBlockMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType nx) {
+  return denseBlockMap<IdxTypeND<T,N>, N>(idx, max, nx);
+}
+
 template <typename IndexElmType, typename PhysicalType>
 inline NodeType blockMapDenseFlatIndex(
   IndexElmType* flat_idx_ptr, IndexElmType* num_elems_ptr,
diff --git a/src/vt/vrt/collection/defaults/default_map.h b/src/vt/vrt/collection/defaults/default_map.h
index 36b2b5979f..af3091f4f2 100644
--- a/src/vt/vrt/collection/defaults/default_map.h
+++ b/src/vt/vrt/collection/defaults/default_map.h
@@ -61,8 +61,17 @@ struct DefaultMapBase {
   using MapParamPackType = std::tuple<IndexPtrType,IndexPtrType,NodeType>;
 };
 
-template <typename CollectionT, typename Enable=void>
-struct DefaultMap;
+template <typename CollectionT, typename Enable = void>
+struct DefaultMap : DefaultMapBase<CollectionT> {
+  using BaseType = typename CollectionT::IndexType::DenseIndexType;
+  using BlockMapType =
+    ::vt::mapping::denseNDMapFn<BaseType, CollectionT::IndexType::ndims()>;
+  using RRMapType =
+    ::vt::mapping::denseNDRRMapFn<BaseType, CollectionT::IndexType::ndims()>;
+  using DefaultMapType =
+    ::vt::mapping::denseNDMapFn<BaseType, CollectionT::IndexType::ndims()>;
+  using MapType = DefaultMapType;
+};
 
 /*
  * Default mappings for Index1D: RR, Block, etc.

From 25e57dfd2cd385b78a49d79ca436faf7b55c0d63 Mon Sep 17 00:00:00 2001
From: Jacob Domagala <domagala.jacob@gmail.com>
Date: Mon, 18 Apr 2022 20:18:56 +0200
Subject: [PATCH 3/4] #1544: Tests: Reduce number of elements for 4 dim
 Collection in test_construct

---
 src/vt/topos/index/index.h                     |  5 ++---
 src/vt/topos/mapping/dense/dense.impl.h        |  7 +++++++
 .../test_collection_construct_common.h         | 18 ++++++++++++------
 tests/unit/collection/test_construct.cc        |  2 +-
 .../test_construct_no_idx.extended.cc          |  1 -
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/vt/topos/index/index.h b/src/vt/topos/index/index.h
index 4be63a31a5..dda8c096fa 100644
--- a/src/vt/topos/index/index.h
+++ b/src/vt/topos/index/index.h
@@ -60,7 +60,6 @@ template <typename T = IdxBase> using Index1D  = DenseIndexArray<T, 1>;
 template <typename T = IdxBase> using Index2D  = DenseIndexArray<T, 2>;
 template <typename T = IdxBase> using Index3D  = DenseIndexArray<T, 3>;
 template <typename T, int8_t N> using IdxType = DenseIndexArray<T, N>;
-template <typename T, int8_t N> using IndexND  = DenseIndexArray<T, N>;
 
 static_assert(IndexTraits<Index1D<IdxBase>>::is_index, "Does not conform");
 static_assert(IndexTraits<Index2D<IdxBase>>::is_index, "Does not conform");
@@ -78,13 +77,13 @@ using Index1D  = index::Index1D<index::IdxBase>;
 using Index2D  = index::Index2D<index::IdxBase>;
 using Index3D  = index::Index3D<index::IdxBase>;
 template <int8_t N>
-using IndexND  = index::IndexND<index::IdxBase, N>;
+using IndexND  = index::IdxType<index::IdxBase, N>;
 
 template <typename T, int8_t N> using IdxType   = index::IdxType<T, N>;
 template <typename T>           using IdxType1D = index::Index1D<T>;
 template <typename T>           using IdxType2D = index::Index2D<T>;
 template <typename T>           using IdxType3D = index::Index3D<T>;
-template <typename T, int8_t N> using IdxTypeND = index::IndexND<T, N>;
+template <typename T, int8_t N> using IdxTypeND = index::IdxType<T, N>;
 
 }  // end namespace vt
 
diff --git a/src/vt/topos/mapping/dense/dense.impl.h b/src/vt/topos/mapping/dense/dense.impl.h
index 2d6d83b8c1..8c553ade18 100644
--- a/src/vt/topos/mapping/dense/dense.impl.h
+++ b/src/vt/topos/mapping/dense/dense.impl.h
@@ -93,6 +93,13 @@ NodeType dense3DRoundRobinMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType nx) {
   return lin_idx % nx;
 }
 
+template <typename T, int8_t N>
+NodeType denseNDRoundRobinMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType nx) {
+  using IndexElmType = typename IdxTypeND<T, N>::DenseIndexType;
+  auto const& lin_idx = linearizeDenseIndexColMajor<IndexElmType, N>(idx, max);
+  return lin_idx % nx;
+}
+
 // Default block mappings
 template <typename T>
 NodeType dense1DBlockMap(Idx1DPtr<T> idx, Idx1DPtr<T> max, NodeType nx) {
diff --git a/tests/unit/collection/test_collection_construct_common.h b/tests/unit/collection/test_collection_construct_common.h
index 8aaed7304e..c597a0409c 100644
--- a/tests/unit/collection/test_collection_construct_common.h
+++ b/tests/unit/collection/test_collection_construct_common.h
@@ -122,11 +122,12 @@ void test_construct_1(std::string const& label) {
 
   auto const& this_node = theContext()->getNode();
   if (this_node == 0) {
-    auto const& col_size = 32;
+    // We don't want too many elements for 4 dimensions
+    auto constexpr num_dims = ColType::IndexType::ndims();
+    auto constexpr col_size = 8 / num_dims;
 
-    auto rng = CreateRange<ColType, ColType::IndexType::ndims()>(col_size);
+    auto rng = CreateRange<ColType, num_dims>(col_size);
     auto proxy = ConstructParams<ColType>::construct(label, rng);
-
     proxy.template broadcast<
       MsgType,
       ConstructHandlers::handler<ColType,MsgType>
@@ -138,9 +139,14 @@ template<typename ColType>
 void test_construct_distributed_1() {
   using MsgType   = typename ColType::MsgType;
 
-  auto const& col_size = 32;
-  auto rng = CreateRange<ColType, ColType::IndexType::ndims()>(col_size);
-  auto proxy = ConstructParams<ColType>::constructCollective(rng, "test_construct_distributed_1");
+  // We don't want too many elements for 4 dimensions
+  auto constexpr num_dims = ColType::IndexType::ndims();
+  auto constexpr col_size = 8 / num_dims;
+
+  auto rng = CreateRange<ColType, num_dims>(col_size);
+  auto proxy = ConstructParams<ColType>::constructCollective(
+    rng, "test_construct_distributed_1"
+  );
   proxy.template broadcast<
     MsgType,
     ConstructHandlers::handler<ColType,MsgType>
diff --git a/tests/unit/collection/test_construct.cc b/tests/unit/collection/test_construct.cc
index 31d60c9212..35595716cc 100644
--- a/tests/unit/collection/test_construct.cc
+++ b/tests/unit/collection/test_construct.cc
@@ -100,7 +100,7 @@ TEST_F(TestConstructLabel, test_labels) {
   auto const range = Index1D(num_nodes);
   std::string const label = "test_labels";
 
-  auto proxy = makeCollection<default_::TestCol>(label)
+  auto proxy = makeCollection<default_::TestCol1D>(label)
     .bounds(range)
     .bulkInsert()
     .wait();
diff --git a/tests/unit/collection/test_construct_no_idx.extended.cc b/tests/unit/collection/test_construct_no_idx.extended.cc
index 603afc12a0..6cec8eb1da 100644
--- a/tests/unit/collection/test_construct_no_idx.extended.cc
+++ b/tests/unit/collection/test_construct_no_idx.extended.cc
@@ -57,7 +57,6 @@ struct ColMsg;
 struct TestCol : Collection<TestCol,vt::Index1D> {
   using MsgType = ColMsg;
 };
-
 struct ColMsg : CollectionMessage<TestCol> {};
 } /* end namespace multi_param_no_idx_ */
 

From c2f3118f1d7d908d721250c877c1935570d0f4ef Mon Sep 17 00:00:00 2001
From: Jacob Domagala <domagala.jacob@gmail.com>
Date: Wed, 8 Jun 2022 01:07:56 +0200
Subject: [PATCH 4/4] #1544: Mapping: Remove redundant type aliases for N-dim
 indices

---
 src/vt/topos/index/index.h              | 1 -
 src/vt/topos/mapping/dense/dense.h      | 4 ++--
 src/vt/topos/mapping/dense/dense.impl.h | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vt/topos/index/index.h b/src/vt/topos/index/index.h
index dda8c096fa..90056943d2 100644
--- a/src/vt/topos/index/index.h
+++ b/src/vt/topos/index/index.h
@@ -83,7 +83,6 @@ template <typename T, int8_t N> using IdxType   = index::IdxType<T, N>;
 template <typename T>           using IdxType1D = index::Index1D<T>;
 template <typename T>           using IdxType2D = index::Index2D<T>;
 template <typename T>           using IdxType3D = index::Index3D<T>;
-template <typename T, int8_t N> using IdxTypeND = index::IdxType<T, N>;
 
 }  // end namespace vt
 
diff --git a/src/vt/topos/mapping/dense/dense.h b/src/vt/topos/mapping/dense/dense.h
index f78c8dec3a..355065aa82 100644
--- a/src/vt/topos/mapping/dense/dense.h
+++ b/src/vt/topos/mapping/dense/dense.h
@@ -74,7 +74,7 @@ using IdxPtr = Index*;
 template <typename T = IdxBase> using Idx1DPtr = IdxType1D<T>*;
 template <typename T = IdxBase> using Idx2DPtr = IdxType2D<T>*;
 template <typename T = IdxBase> using Idx3DPtr = IdxType3D<T>*;
-template <typename T, int8_t N> using IdxNDPtr = vt::index::IdxType<T, N>*;
+template <typename T, int8_t N> using IdxNDPtr = IdxType<T, N>*;
 
 template <typename Idx, index::NumDimensionsType ndim>
 NodeType denseBlockMap(IdxPtr<Idx> idx, IdxPtr<Idx> max_idx, NodeType nnodes);
@@ -109,7 +109,7 @@ NodeType denseNDBlockMap(       IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType n
 template <typename T = IdxBase>   using i1D   = IdxType1D<T>;
 template <typename T = IdxBase>   using i2D   = IdxType2D<T>;
 template <typename T = IdxBase>   using i3D   = IdxType3D<T>;
-template <typename T, int8_t N>   using iND   = IdxTypeND<T,N>;
+template <typename T, int8_t N>   using iND   = IdxType<T,N>;
 
 template <typename F, F* f, typename IndexT>
 using Adapt = MapFunctorAdapt<F, f, IndexT>;
diff --git a/src/vt/topos/mapping/dense/dense.impl.h b/src/vt/topos/mapping/dense/dense.impl.h
index 8c553ade18..3b8b43ee87 100644
--- a/src/vt/topos/mapping/dense/dense.impl.h
+++ b/src/vt/topos/mapping/dense/dense.impl.h
@@ -95,7 +95,7 @@ NodeType dense3DRoundRobinMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType nx) {
 
 template <typename T, int8_t N>
 NodeType denseNDRoundRobinMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType nx) {
-  using IndexElmType = typename IdxTypeND<T, N>::DenseIndexType;
+  using IndexElmType = typename IdxType<T, N>::DenseIndexType;
   auto const& lin_idx = linearizeDenseIndexColMajor<IndexElmType, N>(idx, max);
   return lin_idx % nx;
 }
@@ -118,7 +118,7 @@ NodeType dense3DBlockMap(Idx3DPtr<T> idx, Idx3DPtr<T> max, NodeType nx) {
 
 template <typename T, int8_t N>
 NodeType denseNDBlockMap(IdxNDPtr<T,N> idx, IdxNDPtr<T,N> max, NodeType nx) {
-  return denseBlockMap<IdxTypeND<T,N>, N>(idx, max, nx);
+  return denseBlockMap<IdxType<T,N>, N>(idx, max, nx);
 }
 
 template <typename IndexElmType, typename PhysicalType>