Change to not use pair

Author: Nicholas Sarkauskas

tests/cpp/test_multidevice_lower_communication.cpp

@@ -63,18 +63,15 @@ void assertIsCompiledToHostIrContainer(
     }                                                                 \
   } while (0)
 
-using InOutMesh = std::pair<DeviceMesh, DeviceMesh>;
-
 static constexpr int kTensorSize = 4;
 
 class LowerGatherTest
     : public MultiDeviceTest,
-      public testing::WithParamInterface<std::tuple<InOutMesh, bool>> {};
+      public testing::WithParamInterface<std::tuple<DeviceMesh, DeviceMesh, bool>> {};
 
 TEST_P(LowerGatherTest, ) {
   EnableOptionsGuard opt_guard;
-  const auto& [meshes, enable_host_ir_lowering] = GetParam();
-  const auto& [in_mesh, out_mesh] = meshes;
+  const auto& [in_mesh, out_mesh, enable_host_ir_lowering] = GetParam();
 
   if (enable_host_ir_lowering) {
     EnableOptionsGuard::getCurOptions().set(EnableOption::HostIrLowering);
@@ -112,17 +109,14 @@ TEST_P(LowerGatherTest, ) {
 INSTANTIATE_TEST_SUITE_P(
     HostIrLowering,
     LowerGatherTest,
-    // Create product of InOutMesh configurations and HostIrLowering options
+    // Create product of mesh configurations and HostIrLowering options
     testing::Combine(
-        testing::ValuesIn(std::vector<InOutMesh>(
-            {{{0, 1}, {0}}, {{0, 1}, {1}}, {{1, 2}, {0, 2}}})),
+        testing::ValuesIn(std::vector<DeviceMesh>({{0, 1}, {0, 1}, {1, 2}})),
+        testing::ValuesIn(std::vector<DeviceMesh>({{0}, {1}, {0, 2}})),
         testing::Values(false)), // TODO: testing::Bool() after implementing
                                  // communication lowering
-    [](const testing::TestParamInfo<std::tuple<InOutMesh, bool>>& info) {
-      const auto& meshes = std::get<0>(info.param);
-      const auto& in_mesh = meshes.first;
-      const auto& out_mesh = meshes.second;
-      const auto enable_hir = std::get<1>(info.param);
+    [](const testing::TestParamInfo<std::tuple<DeviceMesh, DeviceMesh, bool>>& info) {
+      const auto& [in_mesh, out_mesh, enable_hir] = info.param;
 
       std::stringstream ss;
       ss << "InMesh";
@@ -140,12 +134,11 @@ INSTANTIATE_TEST_SUITE_P(
 
 class LowerScatterTest
     : public MultiDeviceTest,
-      public testing::WithParamInterface<std::tuple<InOutMesh, bool>> {};
+      public testing::WithParamInterface<std::tuple<DeviceMesh, DeviceMesh, bool>> {};
 
 TEST_P(LowerScatterTest, ) {
   EnableOptionsGuard opt_guard;
-  const auto& [meshes, enable_host_ir_lowering] = GetParam();
-  const auto& [in_mesh, out_mesh] = meshes;
+  const auto& [in_mesh, out_mesh, enable_host_ir_lowering] = GetParam();
 
   if (enable_host_ir_lowering) {
     EnableOptionsGuard::getCurOptions().set(EnableOption::HostIrLowering);
@@ -184,17 +177,12 @@ INSTANTIATE_TEST_SUITE_P(
     HostIrLowering,
     LowerScatterTest,
     testing::Combine(
-        testing::ValuesIn(std::vector<InOutMesh>(
-            {{{0}, {0, 1}},
-             {{1}, {0, 1}},
-             {{0, 2}, {1, 2}}})),
+        testing::ValuesIn(std::vector<DeviceMesh>({{0}, {1}, {0, 2}})),
+        testing::ValuesIn(std::vector<DeviceMesh>({{0, 1}, {0, 1}, {1, 2}})),
         testing::Values(false)), // TODO: testing::Bool() after implementing
                                  // communication lowering
-    [](const testing::TestParamInfo<std::tuple<InOutMesh, bool>>& info) {
-      const auto& meshes = std::get<0>(info.param);
-      const auto& in_mesh = meshes.first;
-      const auto& out_mesh = meshes.second;
-      const auto enable_hir = std::get<1>(info.param);
+    [](const testing::TestParamInfo<std::tuple<DeviceMesh, DeviceMesh, bool>>& info) {
+      const auto& [in_mesh, out_mesh, enable_hir] = info.param;
 
       std::stringstream ss;
       ss << "InMesh";
@@ -212,12 +200,11 @@ INSTANTIATE_TEST_SUITE_P(
 
 class LowerSendRecvTest
     : public MultiDeviceTest,
-      public testing::WithParamInterface<std::tuple<InOutMesh, bool>> {};
+      public testing::WithParamInterface<std::tuple<DeviceMesh, DeviceMesh, bool>> {};
 
 TEST_P(LowerSendRecvTest, ) {
   EnableOptionsGuard opt_guard;
-  const auto& [meshes, enable_host_ir_lowering] = GetParam();
-  const auto& [in_mesh, out_mesh] = meshes;
+  const auto& [in_mesh, out_mesh, enable_host_ir_lowering] = GetParam();
 
   if (enable_host_ir_lowering) {
     EnableOptionsGuard::getCurOptions().set(EnableOption::HostIrLowering);
@@ -258,15 +245,12 @@ INSTANTIATE_TEST_SUITE_P(
     HostIrLowering,
     LowerSendRecvTest,
     testing::Combine(
-        testing::ValuesIn(std::vector<InOutMesh>(
-            {{{0}, {1}}, {{1}, {0}}, {{1, 2}, {0, 1}}, {{1, 2}, {1, 0}}})),
+        testing::ValuesIn(std::vector<DeviceMesh>({{0}, {1}, {1, 2}, {1, 2}})),
+        testing::ValuesIn(std::vector<DeviceMesh>({{1}, {0}, {0, 1}, {1, 0}})),
         testing::Values(false)), // TODO: testing::Bool() after implementing
                                  // communication lowering
-    [](const testing::TestParamInfo<std::tuple<InOutMesh, bool>>& info) {
-      const auto& meshes = std::get<0>(info.param);
-      const auto& in_mesh = meshes.first;
-      const auto& out_mesh = meshes.second;
-      const auto enable_hir = std::get<1>(info.param);
+    [](const testing::TestParamInfo<std::tuple<DeviceMesh, DeviceMesh, bool>>& info) {
+      const auto& [in_mesh, out_mesh, enable_hir] = info.param;
 
       std::stringstream ss;
       ss << "InMesh";