Skip to content

Fix test build failures from RegCache rename #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavanbalaji wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix test build failures from RegCache rename #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions comms/ncclx/v2_27/meta/tests/CommRegisterTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <nccl.h>
#include "comms/ctran/Ctran.h"
#include "comms/ctran/mapper/CtranMapperRegMem.h"
#include "comms/ctran/regcache/RegCache.h"
#include "comms/testinfra/TestUtils.h"
#include "comms/testinfra/TestsDistUtils.h"
#include "comms/utils/cvars/nccl_cvars.h"
Expand Down Expand Up @@ -64,7 +64,7 @@ TEST_P(CommRegisterTestParam, RegularUsage) {
}

// Cleanup cached segments in global cache before we test memory leak
auto regCache = CtranMapperRegCache::getInstance();
auto regCache = ctran::RegCache::getInstance();
EXPECT_EQ(regCache->destroy(), commSuccess);

testFreeBuf(buf, nbytes, memType);
Expand Down Expand Up @@ -131,7 +131,8 @@ INSTANTIATE_TEST_SUITE_P(
// CTRAN_MIN_REGISTRATION_SIZE)
std::make_tuple(1, kMemNcclMemAlloc, NCCL_CTRAN_REGISTER::eager),
std::make_tuple(1, kMemNcclMemAlloc, NCCL_CTRAN_REGISTER::lazy)),
[&](const testing::TestParamInfo<CommRegisterTestParam::ParamType>& info) {
[&](const ::testing::TestParamInfo<CommRegisterTestParam::ParamType>&
info) {
return std::to_string(std::get<0>(info.param)) + "bytes_" +
testMemAllocTypeToStr(std::get<1>(info.param)) + "_" +
testCtranRegisterModeToStr(std::get<2>(info.param));
Expand Down
4 changes: 2 additions & 2 deletions comms/ncclx/v2_27/meta/wrapper/tests/CtranExDistCommFailureUT.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ INSTANTIATE_TEST_SUITE_P(
CtranExCommFailureTest,
CtranExCommFailureParamFixture,
::testing::Values(TestWaitType::TEST, TestWaitType::WAIT),
[&](const testing::TestParamInfo<CtranExCommFailureParamFixture::ParamType>&
info) {
[&](const ::testing::TestParamInfo<
CtranExCommFailureParamFixture::ParamType>& info) {
const std::string waitType =
info.param == TestWaitType::TEST ? "Test" : "Wait";
return waitType;
Expand Down
7 changes: 4 additions & 3 deletions comms/ncclx/v2_27/meta/wrapper/tests/CtranExDistCommUT.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <stdlib.h>
#include "comms/ctran/CtranEx.h"
#include "comms/ctran/regcache/RegCache.h"
#include "comms/testinfra/TestUtils.h"
#include "comms/testinfra/TestsDistUtils.h"
#include "meta/wrapper/CtranExComm.h"
Expand All @@ -20,7 +21,7 @@ class CtranExCommTest : public CtranExBaseTest {
void SetUp() override {
CtranExBaseTest::SetUp();

regCache_ = CtranMapperRegCache::getInstance();
regCache_ = RegCache::getInstance();
ASSERT_NE(regCache_, nullptr);
}

Expand Down Expand Up @@ -56,7 +57,7 @@ class CtranExCommTest : public CtranExBaseTest {
return errs;
}

std::shared_ptr<CtranMapperRegCache> regCache_{nullptr};
std::shared_ptr<RegCache> regCache_{nullptr};
};

TEST_F(CtranExCommTest, Initialized) {
Expand Down Expand Up @@ -316,7 +317,7 @@ INSTANTIATE_TEST_SUITE_P(
::testing::Values(kTestInPlace, kTestOutOfPlace),
// concurrentColl
::testing::Values(true)),
[&](const testing::TestParamInfo<CtranExCommBroadcastFixture::ParamType>&
[&](const ::testing::TestParamInfo<CtranExCommBroadcastFixture::ParamType>&
info) {
return std::to_string(std::get<0>(info.param)) + "int_" +
testInPlaceTypeToStr(std::get<1>(info.param)) + "_concurrentColl_" +
Expand Down
Loading