Skip to content

Indexing test cleanup #3028

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

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Indexing test cleanup #3028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6854459
test cleanup
naoyam Sep 26, 2024
cd249d9
disable idmodel validation with computeatmap
naoyam Sep 26, 2024
090e8f8
format
naoyam Sep 26, 2024
eefaa18
format
naoyam Sep 26, 2024
9192e6d
Merge branch 'main' into indexing_test_cleanup
naoyam Sep 26, 2024
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
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,14 +529,13 @@ list(APPEND JIT_TEST_SRCS
${NVFUSER_ROOT}/tests/cpp/test_gpu3.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_compute_with.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_fused_reduction.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_indexing.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_indexing_ops.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_outer_reduction.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_transpose.cpp
${NVFUSER_ROOT}/tests/cpp/test_gpu_utils.cpp
${NVFUSER_ROOT}/tests/cpp/test_id_model.cpp
${NVFUSER_ROOT}/tests/cpp/test_indexing.cpp
${NVFUSER_ROOT}/tests/cpp/test_inlining.cpp
${NVFUSER_ROOT}/tests/cpp/test_indexing_advanced.cpp
${NVFUSER_ROOT}/tests/cpp/test_iter_visitor.cpp
${NVFUSER_ROOT}/tests/cpp/test_linked_hash_map.cpp
${NVFUSER_ROOT}/tests/cpp/test_loop_rotation.cpp
Expand Down
10 changes: 0 additions & 10 deletions csrc/device_lower/lower2device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,21 +417,11 @@ void GpuLower::analysis(Fusion* fusion) {
// names
if (this->requiresIdModel() || isOptionEnabled(EnableOption::IdModel)) {
// Enable validation in the DEBUG build mode
#ifdef NDEBUG
// Not DEBUG build
id_model_ = std::make_unique<IdModel>(
fusion_,
/*build_graphs=*/true,
/*allow_self_mapping=*/false,
/*validate=*/false);
#else
Copy link
Collaborator Author

@naoyam naoyam Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disabled the validation with ComputeAtMap since we now deal with non-conventional graph structures, so ComputeAtMap does not always work.

// DEBUG build
id_model_ = std::make_unique<IdModel>(
fusion_,
/*build_graphs=*/true,
/*allow_self_mapping=*/false,
/*validate=*/true);
#endif
id_model_->validateAndPropagatePType();
}

Expand Down
33 changes: 0 additions & 33 deletions tests/cpp/test_gpu3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3765,39 +3765,6 @@ TEST_F(NVFuserTest, FusionScheduleTransposeRepro1_CUDA) {
testValidate(&fusion, cg_outputs, {input0, input1}, __LINE__, __FILE__);
}

// Repro for issue #1873
Copy link
Collaborator Author

@naoyam naoyam Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to test_indexing_advanced.cpp

TEST_F(NVFuserTest, FusionInlineBroadcastIndexing0_CUDA) {
Fusion fusion;
FusionGuard fg(&fusion);

auto tv0 = makeContigTensor(1);
auto tv1 = makeContigTensor(2);
fusion.addInput(tv0);
fusion.addInput(tv1);
auto tv2 = set(tv0);
auto tv3 = broadcast(tv2, {true, false});
auto tv4 = add(tv3, tv1);
fusion.addOutput(tv4);

tv4->merge(0);
tv4->split(0, 32);

tv0->computeAt(tv4, 1);

tv2->split(-1, 8);

auto options = at::TensorOptions().dtype(at::kFloat).device(at::kCUDA, 0);
at::Tensor t0 = at::randn({123}, options);
at::Tensor t1 = at::randn({3, 123}, options);

FusionExecutor fe;
fe.compileFusion(&fusion, {t0, t1});

auto outputs = fe.runFusion({t0, t1});

testValidate(&fusion, outputs, {t0, t1}, __LINE__, __FILE__);
}

TEST_F(NVFuserTest, FusionPredicateUnshare_CUDA) {
// https://github.com/csarofeen/pytorch/issues/1926
std::unique_ptr<Fusion> fusion_ptr = std::make_unique<Fusion>();
Expand Down
Loading
Loading