Fix association of tests to cmake target groups and missing EOLs before EOFs

Author: capi1500

include/dr/mp/halo/instance.hpp

@@ -95,4 +95,4 @@ class span_halo : public span_halo_impl<T, Memory> {
     return halo;
   }
 };
-} // namespace dr::mp
+} // namespace dr::mp

test/gtest/mp/CMakeLists.txt

@@ -43,9 +43,7 @@ add_executable(
   stencil.cpp
   segments.cpp
   slide_view.cpp
-  wave_kernel.cpp
-  wide-halo-1d-3.cpp
-  wide-halo-2d-3.cpp)
+  wave_kernel.cpp)
 
 add_executable(
         mp-tests-3

test/gtest/mp/mdstar.cpp

@@ -35,7 +35,7 @@ class Mdspan : public ::testing::Test {
 
 TEST_F(Mdspan, StaticAssert) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
-  auto mdspan = xp::views::mdspan(dist, extents2d);
+  auto mdspan = xp::views::mdspan(dist, extents2d, dist2d_1d);
   static_assert(rng::forward_range<decltype(mdspan)>);
   static_assert(dr::distributed_range<decltype(mdspan)>);
   auto segments = dr::ranges::segments(mdspan);
@@ -47,7 +47,7 @@ TEST_F(Mdspan, StaticAssert) {
 
 TEST_F(Mdspan, Iterator) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
-  auto mdspan = xp::views::mdspan(dist, extents2d);
+  auto mdspan = xp::views::mdspan(dist, extents2d, dist2d_1d);
 
   *mdspan.begin() = 17;
   xp::fence();
@@ -57,7 +57,7 @@ TEST_F(Mdspan, Iterator) {
 
 TEST_F(Mdspan, Mdindex2D) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
-  auto dmdspan = xp::views::mdspan(dist, extents2d);
+  auto dmdspan = xp::views::mdspan(dist, extents2d, dist2d_1d);
 
   std::size_t i = 1, j = 2;
   dmdspan.mdspan()(i, j) = 17;
@@ -68,7 +68,7 @@ TEST_F(Mdspan, Mdindex2D) {
 
 TEST_F(Mdspan, Mdindex3D) {
   xp::distributed_vector<T> dist(n3d, dist3d_1d);
-  auto dmdspan = xp::views::mdspan(dist, extents3d);
+  auto dmdspan = xp::views::mdspan(dist, extents3d, dist3d_1d);
 
   std::size_t i = 1, j = 2, k = 0;
   dmdspan.mdspan()(i, j, k) = 17;
@@ -79,7 +79,7 @@ TEST_F(Mdspan, Mdindex3D) {
 
 TEST_F(Mdspan, Pipe) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
-  auto mdspan = dist | xp::views::mdspan(extents2d);
+  auto mdspan = dist | xp::views::mdspan(extents2d, dist2d_1d);
 
   *mdspan.begin() = 17;
   xp::fence();
@@ -89,7 +89,7 @@ TEST_F(Mdspan, Pipe) {
 
 TEST_F(Mdspan, SegmentExtents) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
-  auto dmdspan = xp::views::mdspan(dist, extents2d);
+  auto dmdspan = xp::views::mdspan(dist, extents2d, dist2d_1d);
 
   // Sum of leading dimension matches original
   std::size_t x = 0;
@@ -106,7 +106,7 @@ TEST_F(Mdspan, Subrange) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
   auto inner = rng::subrange(dist.begin() + ydim, dist.end() - ydim);
   std::array<std::size_t, 2> inner_extents({extents2d[0] - 2, extents2d[1]});
-  auto dmdspan = xp::views::mdspan(inner, inner_extents);
+  auto dmdspan = xp::views::mdspan(inner, inner_extents, dist2d_1d);
 
   // Summing up leading dimension size of segments should equal
   // original minus 2 rows
@@ -123,7 +123,7 @@ TEST_F(Mdspan, Subrange) {
 TEST_F(Mdspan, GridExtents) {
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
   xp::iota(dist, 100);
-  auto dmdspan = xp::views::mdspan(dist, extents2d);
+  auto dmdspan = xp::views::mdspan(dist, extents2d, dist2d_1d);
   auto grid = dmdspan.grid();
 
   auto x = 0;
@@ -147,7 +147,7 @@ TEST_F(Mdspan, GridLocalReference) {
 
   xp::distributed_vector<T> dist(n2d, dist2d_1d);
   xp::iota(dist, 100);
-  auto dmdspan = xp::views::mdspan(dist, extents2d);
+  auto dmdspan = xp::views::mdspan(dist, extents2d, dist2d_1d);
   auto grid = dmdspan.grid();
 
   auto tile = grid(0, 0).mdspan();

test/gtest/mp/wide-halo-1d-3.cpp

@@ -4,25 +4,25 @@
 
 #include "xp-tests.hpp"
 
-template <typename T> class WideHalo3 : public testing::Test {};
+template <typename T> class WideHalo3_1D : public testing::Test {};
 
 using T = int;
 using Array = dr::mp::distributed_vector<T>;
 
-const std::size_t redundancy = 2;
-const std::size_t size = 6;
+static const std::size_t redundancy = 2;
+static const std::size_t size = 6;
 
-dr::mp::distribution get_distribution() {
+static dr::mp::distribution get_distribution() {
   return dr::mp::distribution().halo(1).redundancy(redundancy);
 }
 
-int &get(Array &v, std::size_t i) { return *(v.begin() + i).local(); }
+static int &get(Array &v, std::size_t i) { return *(v.begin() + i).local(); }
 
-TEST(WideHalo3, suite_works_for_3_processes_only) {
+TEST(WideHalo3_1D, suite_works_for_3_processes_only) {
   EXPECT_EQ(dr::mp::default_comm().size(), 3);
 }
 
-TEST(WideHalo3, halo_is_visible_after_exchange_not_earlier) {
+TEST(WideHalo3_1D, halo_is_visible_after_exchange_not_earlier) {
   dr::mp::distribution dist = get_distribution();
   Array dv(size, dist);
   Array dv_out(size, dist);
@@ -141,7 +141,7 @@ TEST(WideHalo3, halo_is_visible_after_exchange_not_earlier) {
   }
 }
 
-TEST(WideHalo3, halo_api_works) {
+TEST(WideHalo3_1D, halo_api_works) {
   dr::mp::distribution dist = get_distribution();
   Array dv(size, dist);
   Array dv_out(size, dist);

test/gtest/mp/wide-halo-2d-3.cpp

@@ -4,27 +4,27 @@
 
 #include "xp-tests.hpp"
 
-template <typename T> class WideHalo3 : public testing::Test {};
+template <typename T> class WideHalo3_2D : public testing::Test {};
 
 using T = int;
 using Array = dr::mp::distributed_mdarray<T, 2>;
 
-const std::size_t redundancy = 2;
-const std::array<std::size_t, 2> size = {6, 6};
+static const std::size_t redundancy = 2;
+static const std::array<std::size_t, 2> size = {6, 6};
 
-dr::mp::distribution get_distribution() {
+static dr::mp::distribution get_distribution() {
   return dr::mp::distribution().halo(1).redundancy(redundancy);
 }
 
-int &get(Array &v, std::size_t i, std::size_t j) {
+static int &get(Array &v, std::size_t i, std::size_t j) {
   return *(v.begin() + i * size[0] + j).local();
 }
 
-TEST(WideHalo3, suite_works_for_3_processes_only) {
+TEST(WideHalo3_2D, suite_works_for_3_processes_only) {
   EXPECT_EQ(dr::mp::default_comm().size(), 3);
 }
 
-TEST(WideHalo3, halo2d_is_visible_after_exchange_not_earlier) {
+TEST(WideHalo3_2D, halo2d_is_visible_after_exchange_not_earlier) {
   dr::mp::distribution dist = get_distribution();
   Array dv(size, dist);
   Array dv_out(size, dist);
@@ -178,7 +178,7 @@ TEST(WideHalo3, halo2d_is_visible_after_exchange_not_earlier) {
   }
 }
 
-TEST(WideHalo3, halo2d_api_works) {
+TEST(WideHalo3_2D, halo2d_api_works) {
   dr::mp::distribution dist = get_distribution();
   Array dv(size, dist);
   Array dv_out(size, dist);