dr::views::iota tests and missing functions; dr::mhp::subrange tests (#300)

Author: mateuszpn

doc/spec/source/algorithms/copy.rst

@@ -16,7 +16,7 @@ Interface
 MHP
 ---
 
-.. doxygenfunction:: dr::mhp::copy(dr::distributed_range auto &&in, dr::distributed_iterator auto out)
+.. doxygenfunction:: dr::mhp::copy(rng::forward_range auto &&in, dr::distributed_iterator auto out)
    :outline:
 .. doxygenfunction:: dr::mhp::copy(DI_IN &&first, DI_IN &&last, dr::distributed_iterator auto &&out)
    :outline:

doc/spec/source/algorithms/transform.rst

@@ -16,7 +16,7 @@ Interface
 MHP
 ---
 
-.. doxygenfunction:: dr::mhp::transform(dr::distributed_range auto &&in, dr::distributed_iterator auto out, auto op)
+.. doxygenfunction:: dr::mhp::transform(rng::forward_range auto &&in, dr::distributed_iterator auto out, auto op)
 .. doxygenfunction:: dr::mhp::transform(DI_IN &&first, DI_IN &&last, dr::distributed_iterator auto &&out, auto op)
 
 SHP

include/dr/mhp/algorithms/copy.hpp

@@ -9,7 +9,7 @@
 namespace dr::mhp {
 
 /// Copy
-void copy(dr::distributed_range auto &&in, dr::distributed_iterator auto out) {
+void copy(rng::forward_range auto &&in, dr::distributed_iterator auto out) {
   if (rng::empty(in)) {
     return;
   }

include/dr/mhp/algorithms/transform.hpp

@@ -17,8 +17,8 @@
 
 namespace dr::mhp {
 
-void transform(dr::distributed_range auto &&in,
-               dr::distributed_iterator auto out, auto op) {
+void transform(rng::forward_range auto &&in, dr::distributed_iterator auto out,
+               auto op) {
   if (rng::empty(in)) {
     return;
   }
@@ -32,7 +32,7 @@ void transform(dr::distributed_range auto &&in,
   for_each(zip, transform_op);
 }
 
-template <dr::distributed_iterator DI_IN>
+template <rng::forward_iterator DI_IN>
 void transform(DI_IN &&first, DI_IN &&last, dr::distributed_iterator auto &&out,
                auto op) {
   mhp::transform(rng::subrange(first, last), out, op);

include/dr/mhp/views/zip.hpp

@@ -150,7 +150,7 @@ class zip_iterator {
     return iter;
   }
 
-  auto operator==(zip_iterator other) const {
+  bool operator==(zip_iterator other) const {
     return rng_iter_ == other.rng_iter_;
   }
   auto operator<=>(zip_iterator other) const {

test/gtest/common/iota_view.cpp

@@ -0,0 +1,63 @@
+// SPDX-FileCopyrightText: Intel Corporation
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+#include "xhp-tests.hpp"
+
+template <typename DistVecT> class IotaView : public testing::Test {
+public:
+};
+
+TYPED_TEST_SUITE(IotaView, AllTypes);
+
+TYPED_TEST(IotaView, ZipWithDR) {
+  xhp::distributed_vector<int> dv(10);
+  auto v = dr::views::iota(1, 10);
+
+  auto z = xhp::views::zip(dv, v);
+
+  xhp::for_each(z, [](auto ze) {
+    auto [dve, ve] = ze;
+    dve = ve;
+  });
+
+  EXPECT_TRUE(equal(std::vector<int>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, dv));
+}
+
+TYPED_TEST(IotaView, Copy) {
+  TypeParam dv(10);
+  auto v = dr::views::iota(1, 11);
+
+  xhp::copy(v, dv.begin());
+
+  barrier();
+  EXPECT_TRUE(equal(std::vector<int>{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, dv));
+}
+
+TYPED_TEST(IotaView, Transform) {
+  TypeParam dv(10);
+  auto v = dr::views::iota(1, 11);
+  auto negate = [](auto v) { return -v; };
+
+  xhp::transform(v, dv.begin(), negate);
+
+  EXPECT_TRUE(
+      equal(dv, std::vector<int>{-1, -2, -3, -4, -5, -6, -7, -8, -9, -10}));
+}
+
+TYPED_TEST(IotaView, ForEach) {
+  TypeParam dv(10);
+  auto v = dr::views::iota(1, 11);
+
+  auto negate = [](auto v) {
+    auto &[in, out] = v;
+    out = -in;
+  };
+
+  auto z = xhp::views::zip(v, dv);
+
+  xhp::for_each(z, negate);
+
+  EXPECT_TRUE(
+      equal(dv, std::vector<int>{-1, -2, -3, -4, -5, -6, -7, -8, -9, -10}));
+}

test/gtest/common/subrange.cpp

@@ -27,3 +27,40 @@ TYPED_TEST(Subrange, Mutate) {
       ops, rng::subrange(ops.vec.begin() + 1, ops.vec.end() - 1),
       rng::subrange(ops.dist_vec.begin() + 1, ops.dist_vec.end() - 1)));
 }
+
+TYPED_TEST(Subrange, ForEach) {
+  Ops1<TypeParam> ops(23);
+
+  auto local = rng::subrange(ops.vec.begin() + 1, ops.vec.end() - 2);
+  auto dist = rng::subrange(ops.dist_vec.begin() + 1, ops.dist_vec.end() - 2);
+
+  auto negate = [](auto v) { return -v; };
+  rng::for_each(local, negate);
+  xhp::for_each(dist, negate);
+  EXPECT_EQ(ops.vec, ops.dist_vec);
+}
+
+TYPED_TEST(Subrange, Transform) {
+  TypeParam v1(13), v2(13);
+  xhp::iota(v1, 10);
+  xhp::fill(v2, -1);
+
+  auto s1 = rng::subrange(v1.begin() + 1, v1.end() - 2);
+  auto s2 = rng::subrange(v2.begin() + 1, v2.end() - 2);
+
+  auto null_op = [](auto v) { return v; };
+  xhp::transform(s1, s2.begin(), null_op);
+
+  EXPECT_TRUE(equal(v2, std::vector<int>{-1, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+                                         20, -1, -1}));
+}
+
+TYPED_TEST(Subrange, Reduce) {
+  Ops1<TypeParam> ops(23);
+
+  auto local = rng::subrange(ops.vec.begin() + 1, ops.vec.end() - 2);
+  auto dist = rng::subrange(ops.dist_vec.begin() + 1, ops.dist_vec.end() - 2);
+
+  EXPECT_EQ(std::reduce(local.begin(), local.end(), 3, std::plus{}),
+            xhp::reduce(dist, 3, std::plus{}));
+}

test/gtest/mhp/CMakeLists.txt

@@ -18,6 +18,7 @@ add_executable(
   ../common/for_each.cpp
   ../common/inclusive_scan.cpp
   ../common/iota.cpp
+  ../common/iota_view.cpp
   ../common/reduce.cpp
   ../common/subrange.cpp
   ../common/take.cpp
@@ -62,6 +63,7 @@ if(NOT MPI_IMPL STREQUAL "openmpi")
   # MPI_Win_create fails for communicator with size 1
   add_mpi_test(mhp-tests-1 mhp-tests 1)
 endif()
+
 add_mpi_test(mhp-tests-2 mhp-tests 2)
 add_mpi_test(mhp-tests-3 mhp-tests 3)
 add_mpi_test(mhp-tests-4 mhp-tests 4)

test/gtest/shp/CMakeLists.txt

@@ -16,6 +16,7 @@ add_executable(
   ../common/fill.cpp
   ../common/for_each.cpp
   ../common/iota.cpp
+  # ../common/iota_view.cpp
   ../common/reduce.cpp
   ../common/subrange.cpp
   ../common/take.cpp