From 59e62c807b18b6a290fc4600ab5d54e8978fc11d Mon Sep 17 00:00:00 2001
From: akolliasAMD <99202231+akolliasAMD@users.noreply.github.com>
Date: Thu, 29 Jun 2023 08:08:17 -0600
Subject: [PATCH] Re-enabled graph tests (#736)

* enabled graph tests
* joined multi and single process CI testing

[ROCm/rccl commit: cf8cfa88a8061f63f78a2bce80a3179588cfbba5]
---
 projects/rccl/.jenkins/common.groovy      | 3 +--
 projects/rccl/.jenkins/extended.groovy    | 4 ++--
 projects/rccl/.jenkins/precheckin.groovy  | 2 +-
 projects/rccl/test/AllGatherTests.cpp     | 6 +++---
 projects/rccl/test/AllReduceTests.cpp     | 6 +++---
 projects/rccl/test/AllToAllTests.cpp      | 4 ++--
 projects/rccl/test/AllToAllVTests.cpp     | 2 +-
 projects/rccl/test/BroadcastTests.cpp     | 6 +++---
 projects/rccl/test/GatherTests.cpp        | 6 +++---
 projects/rccl/test/ReduceScatterTests.cpp | 6 +++---
 projects/rccl/test/ReduceTests.cpp        | 6 +++---
 projects/rccl/test/ScatterTests.cpp       | 6 +++---
 12 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/projects/rccl/.jenkins/common.groovy b/projects/rccl/.jenkins/common.groovy
index 55768304ee..ac471859df 100644
--- a/projects/rccl/.jenkins/common.groovy
+++ b/projects/rccl/.jenkins/common.groovy
@@ -24,8 +24,7 @@ def runTestCommand (platform, project, gfilter, envars)
                 cd ${project.paths.project_build_prefix}/build/release/test
                 ${sudo} ulimit -l unlimited
                 ulimit -a
-                ${sudo} ${envars} UT_PROCESS_MASK=1 RCCL_ENABLE_SIGNALHANDLER=0 NCCL_DEBUG=INFO HSA_FORCE_FINE_GRAIN_PCIE=1 ./rccl-UnitTests --gtest_filter=${gfilter} --gtest_output=xml --gtest_color=yes
-                ${sudo} ${envars} UT_PROCESS_MASK=2 RCCL_ENABLE_SIGNALHANDLER=0 NCCL_DEBUG=INFO HSA_FORCE_FINE_GRAIN_PCIE=1 ./rccl-UnitTests --gtest_filter=${gfilter} --gtest_output=xml --gtest_color=yes
+                ${sudo} ${envars} RCCL_ENABLE_SIGNALHANDLER=0 NCCL_DEBUG=INFO HSA_FORCE_FINE_GRAIN_PCIE=1 ./rccl-UnitTests --gtest_filter=${gfilter} --gtest_output=xml --gtest_color=yes
             """
 
    platform.runCommand(this, command)
diff --git a/projects/rccl/.jenkins/extended.groovy b/projects/rccl/.jenkins/extended.groovy
index f2cb5d0846..7a2ff008c2 100644
--- a/projects/rccl/.jenkins/extended.groovy
+++ b/projects/rccl/.jenkins/extended.groovy
@@ -17,7 +17,7 @@ def runCI =
     def prj  = new rocProject('rccl', 'Extended')
 
     prj.timeout.test = 600
-    prj.paths.build_command = './install.sh -t --npkit-enable'
+    prj.paths.build_command = './install.sh -t'
 
     // Define test architectures, optional rocm version argument is available
     def nodes = new dockerNodes(nodeDetails, jobName, prj)
@@ -38,7 +38,7 @@ def runCI =
     {
         platform, project->
 
-        commonGroovy.runTestCommand(platform, project, "-*Graph", "")
+        commonGroovy.runTestCommand(platform, project, "*", "")
     }
 
     def packageCommand =
diff --git a/projects/rccl/.jenkins/precheckin.groovy b/projects/rccl/.jenkins/precheckin.groovy
index 7c8eef8690..92bef95467 100644
--- a/projects/rccl/.jenkins/precheckin.groovy
+++ b/projects/rccl/.jenkins/precheckin.groovy
@@ -39,7 +39,7 @@ def runCI =
     {
         platform, project->
 
-        commonGroovy.runTestCommand(platform, project, "-*Graph", "UT_POW2_GPUS=1")
+        commonGroovy.runTestCommand(platform, project, "*", "UT_POW2_GPUS=1")
     }
 
     def packageCommand =
diff --git a/projects/rccl/test/AllGatherTests.cpp b/projects/rccl/test/AllGatherTests.cpp
index 2269ec65ef..edb0f31052 100644
--- a/projects/rccl/test/AllGatherTests.cpp
+++ b/projects/rccl/test/AllGatherTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllGather, DISABLED_OutOfPlaceGraph)
+  TEST(AllGather, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllGather, DISABLED_InPlaceGraph)
+  TEST(AllGather, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -102,7 +102,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllGather, DISABLED_ManagedMemGraph)
+  TEST(AllGather, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/AllReduceTests.cpp b/projects/rccl/test/AllReduceTests.cpp
index ce9fea1e5a..fa771cd89f 100644
--- a/projects/rccl/test/AllReduceTests.cpp
+++ b/projects/rccl/test/AllReduceTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllReduce, DISABLED_OutOfPlaceGraph)
+  TEST(AllReduce, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllReduce, DISABLED_InPlaceGraph)
+  TEST(AllReduce, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -102,7 +102,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllReduce, DISABLED_ManagedMemGraph)
+  TEST(AllReduce, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/AllToAllTests.cpp b/projects/rccl/test/AllToAllTests.cpp
index 64632b739a..418edb3189 100644
--- a/projects/rccl/test/AllToAllTests.cpp
+++ b/projects/rccl/test/AllToAllTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllToAll, DISABLED_OutOfPlaceGraph)
+  TEST(AllToAll, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(AllToAll, DISABLED_ManagedMemGraph)
+  TEST(AllToAll, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/AllToAllVTests.cpp b/projects/rccl/test/AllToAllVTests.cpp
index 31fb27e4c1..bc6fd29706 100644
--- a/projects/rccl/test/AllToAllVTests.cpp
+++ b/projects/rccl/test/AllToAllVTests.cpp
@@ -109,7 +109,7 @@ namespace RcclUnitTesting
   }
 
 
-  TEST(AllToAllv, DISABLED_OutOfPlaceGraph)
+  TEST(AllToAllv, OutOfPlaceGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/BroadcastTests.cpp b/projects/rccl/test/BroadcastTests.cpp
index d5f4e0cc76..a50c879c9e 100644
--- a/projects/rccl/test/BroadcastTests.cpp
+++ b/projects/rccl/test/BroadcastTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Broadcast, DISABLED_OutOfPlaceGraph)
+  TEST(Broadcast, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Broadcast, DISABLED_InPlaceGraph)
+  TEST(Broadcast, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -102,7 +102,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Broadcast, DISABLED_ManagedMemGraph)
+  TEST(Broadcast, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/GatherTests.cpp b/projects/rccl/test/GatherTests.cpp
index bf2cd0a983..17aad21be9 100644
--- a/projects/rccl/test/GatherTests.cpp
+++ b/projects/rccl/test/GatherTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Gather, DISABLED_OutOfPlaceGraph)
+  TEST(Gather, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -65,7 +65,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Gather, DISABLED_InPlaceGraph)
+  TEST(Gather, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -103,7 +103,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Gather, DISABLED_ManagedMemGraph)
+  TEST(Gather, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/ReduceScatterTests.cpp b/projects/rccl/test/ReduceScatterTests.cpp
index 29568b4144..ef7f8f701b 100644
--- a/projects/rccl/test/ReduceScatterTests.cpp
+++ b/projects/rccl/test/ReduceScatterTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(ReduceScatter, DISABLED_OutOfPlaceGraph)
+  TEST(ReduceScatter, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(ReduceScatter, DISABLED_InPlaceGraph)
+  TEST(ReduceScatter, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -102,7 +102,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(ReduceScatter, DISABLED_ManagedMemGraph)
+  TEST(ReduceScatter, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/ReduceTests.cpp b/projects/rccl/test/ReduceTests.cpp
index 0da4306d90..73280b0952 100644
--- a/projects/rccl/test/ReduceTests.cpp
+++ b/projects/rccl/test/ReduceTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Reduce, DISABLED_OutOfPlaceGraph)
+  TEST(Reduce, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Reduce, DISABLED_InPlaceGraph)
+  TEST(Reduce, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -102,7 +102,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Reduce, DISABLED_ManagedMemGraph)
+  TEST(Reduce, ManagedMemGraph)
   {
     TestBed testBed;
 
diff --git a/projects/rccl/test/ScatterTests.cpp b/projects/rccl/test/ScatterTests.cpp
index db646cbde7..c0b906475b 100644
--- a/projects/rccl/test/ScatterTests.cpp
+++ b/projects/rccl/test/ScatterTests.cpp
@@ -26,7 +26,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Scatter, DISABLED_OutOfPlaceGraph)
+  TEST(Scatter, OutOfPlaceGraph)
   {
     TestBed testBed;
 
@@ -64,7 +64,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Scatter, DISABLED_InPlaceGraph)
+  TEST(Scatter, InPlaceGraph)
   {
     TestBed testBed;
 
@@ -102,7 +102,7 @@ namespace RcclUnitTesting
     testBed.Finalize();
   }
 
-  TEST(Scatter, DISABLED_ManagedMemGraph)
+  TEST(Scatter, ManagedMemGraph)
   {
     TestBed testBed;