From 249ad84d3a46dc1b7fd4259ac3a8ab2fae2caf11 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 15 Apr 2024 22:13:10 +0000 Subject: [PATCH] adjusting some tests --- test/mp_unit/communicator_tests.cu | 14 +++++++------- test/mp_unit/proxy_channel_tests.cu | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/mp_unit/communicator_tests.cu b/test/mp_unit/communicator_tests.cu index 10526b0ed..c06977a87 100644 --- a/test/mp_unit/communicator_tests.cu +++ b/test/mp_unit/communicator_tests.cu @@ -101,7 +101,7 @@ void CommunicatorTest::SetUp() { ASSERT_EQ((deviceBufferSize / sizeof(int)) % gEnv->worldSize, 0); - connectMesh(false, false, true); + connectMesh(true, true, false); devicePtr.resize(numBuffers); localMemory.resize(numBuffers); @@ -116,10 +116,10 @@ void CommunicatorTest::SetUp() { for (size_t n = 0; n < numBuffers; n++) { devicePtr[n] = mscclpp::allocSharedCuda(deviceBufferSize / sizeof(int)); - //registerMemoryPairs(devicePtr[n].get(), deviceBufferSize, mscclpp::Transport::CudaIpc | ibTransport, 0, remoteRanks, - // localMemory[n], remoteMemory[n]); - registerMemoryPairs(devicePtr[n].get(), deviceBufferSize, mscclpp::Transport::Ethernet, 0, remoteRanks, - localMemory[n], remoteMemory[n]); + registerMemoryPairs(devicePtr[n].get(), deviceBufferSize, mscclpp::Transport::CudaIpc | ibTransport, 0, remoteRanks, + localMemory[n], remoteMemory[n]); + //registerMemoryPairs(devicePtr[n].get(), deviceBufferSize, mscclpp::Transport::Ethernet, 0, remoteRanks, + // localMemory[n], remoteMemory[n]); } } @@ -289,7 +289,7 @@ TEST_F(CommunicatorTest, WriteWithHostSemaphores) { communicator->bootstrap()->barrier(); } -TEST_F(CommunicatorTest, TestEthernetConnection) { +/*TEST_F(CommunicatorTest, TestEthernetConnection) { if (gEnv->rank >= numRanksToUse) return; deviceBufferInit(); @@ -309,4 +309,4 @@ TEST_F(CommunicatorTest, TestEthernetConnection) { } } while (!ready); communicator->bootstrap()->barrier(); -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/test/mp_unit/proxy_channel_tests.cu b/test/mp_unit/proxy_channel_tests.cu index 7bf52308b..ce13db580 100644 --- a/test/mp_unit/proxy_channel_tests.cu +++ b/test/mp_unit/proxy_channel_tests.cu @@ -219,7 +219,7 @@ void ProxyChannelOneToOneTest::testPingPongPerf(bool useIPC, bool useIB, bool us auto* testInfo = ::testing::UnitTest::GetInstance()->current_test_info(); const std::string testName = std::string(testInfo->test_suite_name()) + "." + std::string(testInfo->name()); - const int nTries = 1000000; + const int nTries = 1000; // Warm-up kernelProxyPingPong<<<1, 1024>>>(buff.get(), gEnv->rank, 1, waitWithPoll, nTries, ret.get());