Skip to content

Commit ea81c2e

Browse files
mlunar-metameta-codesync[bot]
authored andcommitted
Fixing simplectraninit and fastinit tests by addressing the new colltrace enable.
Summary: The latest changes enable the new colltrace by default. As a result, tests that expects the legacy colltrace are failing during the colltrace check. In this diff I have updated a those chekings to keep these tests alive. For reference: https://fb.workplace.com/groups/752760876991686/permalink/985386930395745/ Reviewed By: YulunW Differential Revision: D85580342 fbshipit-source-id: a892f6da417d4953482328b57c115a7b4a04cfdc
1 parent 6d361cb commit ea81c2e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

comms/ncclx/v2_27/meta/tests/FastInitTest.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void validateCtranInitialization(
3535
ASSERT_NE(nullptr, comm->ctranComm_);
3636
ASSERT_NE(nullptr, comm->ctranComm_->statex_);
3737
ASSERT_NE(nullptr, comm->ctranComm_->bootstrap_);
38-
ASSERT_NE(nullptr, comm->ctranComm_->collTrace_);
38+
ASSERT_NE(nullptr, comm->ctranComm_->colltraceNew_);
3939
ASSERT_NE(nullptr, comm->ctranComm_->ctran_);
4040
EXPECT_TRUE(ctranInitialized(comm->ctranComm_.get()));
4141
EXPECT_EQ(comm->commHash, comm->ctranComm_->statex_->commHash());
@@ -431,6 +431,7 @@ INSTANTIATE_TEST_SUITE_P(
431431
{"NCCL_FASTINIT_MODE", "ring_hybrid"},
432432
{"NCCL_CTRAN_ENABLE", "1"},
433433
{"NCCL_COLLTRACE", "trace"},
434+
{"NCCL_COLLTRACE_USE_NEW_COLLTRACE", "1"},
434435
})),
435436
[](const testing::TestParamInfo<NcclxBaseTestFixture::ParamType>& info) {
436437
// generate test-name for a given NcclxEnvs

comms/ncclx/v2_27/meta/tests/SimpleCtranInitTest.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class SimpleCtranInitTest : public ::testing::Test {
1313
void SetUp() override {
1414
setenv("NCCL_CTRAN_ENABLE", "1", 1);
1515
setenv("NCCL_COLLTRACE", "trace", 1);
16+
setenv("NCCL_COLLTRACE_USE_NEW_COLLTRACE", "1", 1);
1617
setenv("NCCL_USE_MEM_CACHE", "1", 1);
1718
setenv("NCCL_LAZY_SETUP_CHANNELS", "1", 1);
1819
setenv("NCCL_RUNTIME_CONNECT", "1", 1);
@@ -39,7 +40,7 @@ TEST_F(SimpleCtranInitTest, VerifyCtranCommStructures) {
3940
ASSERT_NE(nullptr, comm->ctranComm_->statex_);
4041
ASSERT_NE(nullptr, comm->ctranComm_->bootstrap_);
4142
ASSERT_NE(nullptr, comm->ctranComm_->memCache_);
42-
ASSERT_NE(nullptr, comm->ctranComm_->collTrace_);
43+
ASSERT_NE(nullptr, comm->ctranComm_->colltraceNew_);
4344
ASSERT_NE(nullptr, comm->ctranComm_->ctran_);
4445
EXPECT_TRUE(ctranInitialized(comm->ctranComm_.get()));
4546
EXPECT_EQ(comm->commHash, comm->ctranComm_->statex_->commHash());

0 commit comments

Comments
 (0)