Fixing GoogleTest to 1.8.1 and making changes to tests to support older API

test/test_ReduceScatter.cpp

@@ -33,33 +33,33 @@ namespace CorrectnessTests
                               comms[i], streams[i]);
         }
 
+
         // Wait for reduction to complete
-        for (int i = 0; i < numDevices; i++)
-            hipStreamSynchronize(streams[i]);
+        Synchronize();
 
         // Check results
         ValidateResults(dataset);
     }
 
-    INSTANTIATE_TEST_SUITE_P(ReduceScatterCorrectnessSweep,
-                             ReduceScatterCorrectnessTest,
-                             testing::Combine(
-                                 // Reduction operator
-                                 testing::Values(ncclSum, ncclProd, ncclMax, ncclMin),
-                                 // Data types
-                                 testing::Values(ncclInt8,
-                                                 ncclUint8,
-                                                 ncclInt32,
-                                                 ncclUint32,
-                                                 ncclInt64,
-                                                 ncclUint64,
-                                                 //ncclFloat16,
-                                                 ncclFloat32,
-                                                 ncclFloat64),
-                                 // Number of elements
-                                 testing::Values(3072, 3145728),
-                                 // Number of devices
-                                 testing::Values(2,3,4),
-                                 // In-place or not
-                                 testing::Values(false, true)));
+    INSTANTIATE_TEST_CASE_P(ReduceScatterCorrectnessSweep,
+                            ReduceScatterCorrectnessTest,
+                            testing::Combine(
+                                // Reduction operator
+                                testing::Values(ncclSum, ncclProd, ncclMax, ncclMin),
+                                // Data types
+                                testing::Values(ncclInt8,
+                                                ncclUint8,
+                                                ncclInt32,
+                                                ncclUint32,
+                                                ncclInt64,
+                                                ncclUint64,
+                                                //ncclFloat16,
+                                                ncclFloat32,
+                                                ncclFloat64),
+                                // Number of elements
+                                testing::Values(3072, 3145728),
+                                // Number of devices
+                                testing::Values(2,3,4),
+                                // In-place or not
+                                testing::Values(false, true)));
 } // namespace