Skip to content

Commit 8459aa8

Browse files
authored
Remove disable_skip (#5752)
Do you still need it?
1 parent 8a9ea0b commit 8459aa8

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

tests/cpp/multidevice.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <sys/types.h>
1111
#include <unistd.h>
12-
#include <mutex>
1312

1413
#ifdef NVFUSER_DISTRIBUTED
1514
#include <torch/csrc/distributed/c10d/debug.h>
@@ -43,7 +42,6 @@ MultiDeviceTest::MultiDeviceTest() {
4342
tensor_options_ =
4443
at::TensorOptions().dtype(at::kFloat).device(communicator_->device());
4544
debug_print = getNvFuserEnv("MULTIDEVICE_DEBUG_PRINT") != nullptr;
46-
disable_skip = getNvFuserEnv("MULTIDEVICE_DISABLE_SKIP") != nullptr;
4745
}
4846

4947
MultiDeviceTest::~MultiDeviceTest() {
@@ -57,10 +55,9 @@ MultiDeviceTest::~MultiDeviceTest() {
5755
}
5856

5957
void MultiDeviceTest::SetUp() {
60-
// Set the same random seed for all processes.
6158
NVFuserTest::SetUp();
6259

63-
if (!disable_skip && !communicator_->is_available()) {
60+
if (!communicator_->is_available()) {
6461
GTEST_SKIP() << "This test needs an available communicator.";
6562
}
6663
}

tests/cpp/multidevice.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class MultiDeviceTest : public NVFuserTest {
4949
Communicator* communicator_;
5050
c10::TensorOptions tensor_options_;
5151
bool debug_print;
52-
bool disable_skip;
5352
};
5453

5554
// This macro is supposed to be used in a test case of a MultiDeviceTest or its

tests/cpp/test_multidevice_pipeline.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ TEST_P(PipelineTestTwoStages, Communication) {
287287
do_reduction,
288288
sharded_dim,
289289
use_fusion_executor_cache] = GetParam();
290-
if (!disable_skip && !communicator_->isBackendAvailable(backend)) {
290+
if (!communicator_->isBackendAvailable(backend)) {
291291
GTEST_SKIP() << "Backend not available";
292292
}
293293
communicator_->setDefaultBackend(backend);

tests/cpp/test_multidevice_sharding.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
namespace nvfuser {
2121

22-
using testing::Contains;
2322
using testing::Each;
2423
using testing::ElementsAre;
2524
using testing::Not;
@@ -1283,4 +1282,5 @@ TEST_F(MultiDeviceTest, MultipleIncompatibleReshapes) {
12831282
EXPECT_FALSE(runtime->isSegmented());
12841283
}
12851284
}
1285+
12861286
} // namespace nvfuser

0 commit comments

Comments
 (0)