diff --git a/test/AllReduce_GroupCall.cpp b/test/AllReduce_GroupCall.cpp index 5b2ad88030..2b6d7ec77f 100644 --- a/test/AllReduce_GroupCall.cpp +++ b/test/AllReduce_GroupCall.cpp @@ -26,6 +26,8 @@ namespace RcclUnitTesting for (int totalRanks = testBed.ev.minGpus; totalRanks <= testBed.ev.maxGpus && isCorrect; ++totalRanks) for (int isMultiProcess = 0; isMultiProcess <= 1 && isCorrect; ++isMultiProcess) { + if (!(testBed.ev.processMask & (1 << isMultiProcess))) continue; + // Test either single process all GPUs, or 1 process per GPU int const numProcesses = isMultiProcess ? totalRanks : 1; testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, totalRanks), numCollPerGroup); diff --git a/test/AllReduce_PreMultScalar.cpp b/test/AllReduce_PreMultScalar.cpp index 2674fa7a5e..ddf03c58a0 100644 --- a/test/AllReduce_PreMultScalar.cpp +++ b/test/AllReduce_PreMultScalar.cpp @@ -26,6 +26,8 @@ namespace RcclUnitTesting for (int totalRanks = testBed.ev.minGpus; totalRanks <= testBed.ev.maxGpus && isCorrect; ++totalRanks) for (int isMultiProcess = 0; isMultiProcess <= 1; ++isMultiProcess) { + if (!(testBed.ev.processMask & (1 << isMultiProcess))) continue; + int const numProcesses = isMultiProcess ? totalRanks : 1; testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, totalRanks)); diff --git a/test/SendRecv_SinglePairs.cpp b/test/SendRecv_SinglePairs.cpp old mode 100755 new mode 100644 index 158788a84c..857acbe1a9 --- a/test/SendRecv_SinglePairs.cpp +++ b/test/SendRecv_SinglePairs.cpp @@ -21,6 +21,8 @@ namespace RcclUnitTesting int totalRanks = testBed.ev.maxGpus; for (int isMultiProcess = 0; isMultiProcess <= 1 && isCorrect; ++isMultiProcess) { + if (!(testBed.ev.processMask & (1 << isMultiProcess))) continue; + int const numProcesses = isMultiProcess ? totalRanks : 1; testBed.InitComms(TestBed::GetDeviceIdsList(numProcesses, totalRanks), 1); @@ -32,7 +34,7 @@ namespace RcclUnitTesting { testBed.SetCollectiveArgs(ncclCollSend, dataTypes[dataIdx], - ncclSum, // This should be moved to optional variables struct + ncclSum, recvRank, numElements[numIdx], numElements[numIdx], @@ -40,7 +42,6 @@ namespace RcclUnitTesting sendRank); if (recvRank == 0) { - testBed.AllocateMem(inPlace, useManagedMem, 0, sendRank); testBed.PrepareData(0, sendRank); } @@ -57,7 +58,7 @@ namespace RcclUnitTesting testBed.SetCollectiveArgs(ncclCollRecv, dataTypes[dataIdx], - ncclSum, // This should be moved to optional variables struct + ncclSum, sendRank, numElements[numIdx], numElements[numIdx], @@ -76,4 +77,4 @@ namespace RcclUnitTesting } testBed.Finalize(); } -} \ No newline at end of file +}