Remove obselete #if defined(USE_CUDA) (pytorch#2341)

xwang233 · Jan 19, 2023 · 63044e6 · 63044e6
1 parent df39a1f
commit 63044e6
Show file tree

Hide file tree

Showing 25 changed files with 0 additions and 54 deletions.
diff --git a/third_party/nvfuser/CMakeLists.txt b/third_party/nvfuser/CMakeLists.txt
@@ -345,11 +345,6 @@ if(BUILD_TEST)
   torch_compile_options(${NVFUSER_TESTS})
 
   target_compile_definitions(${NVFUSER_TESTS} PRIVATE USE_GTEST)
-  if(NOT USE_ROCM)
-    target_compile_definitions(${NVFUSER_TESTS} PRIVATE USE_CUDA)
-  else()
-    target_compile_definitions(${NVFUSER_TESTS} PRIVATE USE_ROCM)
-  endif()
   target_include_directories(${NVFUSER_TESTS} PRIVATE "${NVFUSER_ROOT}" "${TORCH_ROOT}/torch/csrc/api/include/")
   target_link_libraries(${NVFUSER_TESTS} PRIVATE ${NVFUSER_CODEGEN} torch ${TORCHLIB_FLAVOR} gtest_main gmock_main)
   if(NOT MSVC)

diff --git a/third_party/nvfuser/csrc/kernel_db/test/test_nvfuser_kernel_db_open.cpp b/third_party/nvfuser/csrc/kernel_db/test/test_nvfuser_kernel_db_open.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -110,4 +109,3 @@ TEST_F(NVFuserTest, KernelDb_Open_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/csrc/kernel_db/test/test_nvfuser_kernel_db_query.cpp b/third_party/nvfuser/csrc/kernel_db/test/test_nvfuser_kernel_db_query.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -79,4 +78,3 @@ TEST_F(NVFuserTest, KernelDb_Query_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/csrc/kernel_db/test/test_nvfuser_kernel_db_write.cpp b/third_party/nvfuser/csrc/kernel_db/test/test_nvfuser_kernel_db_write.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -74,4 +73,3 @@ TEST_F(NVFuserTest, KernelDb_Write_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/csrc/python_frontend/test/test_nvfuser_fusion_cache.cpp b/third_party/nvfuser/csrc/python_frontend/test/test_nvfuser_fusion_cache.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -262,4 +261,3 @@ TEST_F(NVFuserTest, PyFusionCache_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/csrc/python_frontend/test/test_nvfuser_fusion_definition.cpp b/third_party/nvfuser/csrc/python_frontend/test/test_nvfuser_fusion_definition.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -193,4 +192,3 @@ TEST_F(NVFuserTest, FusionDefinition_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/csrc/python_frontend/test/test_nvfuser_fusion_record.cpp b/third_party/nvfuser/csrc/python_frontend/test/test_nvfuser_fusion_record.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -133,4 +132,3 @@ TEST_F(NVFuserTest, RecordFunctorEquality_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu1.cpp b/third_party/nvfuser/test/test_gpu1.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -8798,4 +8797,3 @@ TEST_F(NVFuserTest, FusionSmemDynamicTiledGemm_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu2.cpp b/third_party/nvfuser/test/test_gpu2.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -9826,4 +9825,3 @@ TEST_F(NVFuserTest, FusionRfactorIndirectRoot_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu3.cpp b/third_party/nvfuser/test/test_gpu3.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -7277,4 +7276,3 @@ TEST_F(NVFuserTest, FusionRepro2241_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_compute_with.cpp b/third_party/nvfuser/test/test_gpu_compute_with.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -475,4 +474,3 @@ TEST_F(NVFuserTest, FusionComputeWith6_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_expr_simplifier.cpp b/third_party/nvfuser/test/test_gpu_expr_simplifier.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gtest/gtest.h>
 
 #include <arith.h>
@@ -463,4 +462,3 @@ TEST_F(NVFuserTest, FusionDistributeMul_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_external_src.cpp b/third_party/nvfuser/test/test_gpu_external_src.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -178,4 +177,3 @@ TEST_F(NVFuserTest, FusionExternalSrcMatmul_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_fused_reduction.cpp b/third_party/nvfuser/test/test_gpu_fused_reduction.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gtest/gtest.h>
 
 #include <arith.h>
@@ -2506,4 +2505,3 @@ TEST_F(NVFuserTest, FusionGeluBwdReduction_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_gather_ops.cpp b/third_party/nvfuser/test/test_gpu_gather_ops.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -341,4 +340,3 @@ TEST_F(NVFuserTest, FusionTorchGatherIndexTvExtentIsOne_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_indexing.cpp b/third_party/nvfuser/test/test_gpu_indexing.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -790,4 +789,3 @@ TEST_F(NVFuserTest, FusionIndexing17_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_indexing_ops.cpp b/third_party/nvfuser/test/test_gpu_indexing_ops.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gtest/gtest.h>
 
 #include <kernel_cache.h>
@@ -676,4 +675,3 @@ TEST_F(NVFuserTest, FusionIndexSelectDim2InRank4_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_outer_reduction.cpp b/third_party/nvfuser/test/test_gpu_outer_reduction.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -1345,4 +1344,3 @@ TEST_F(
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_shift.cpp b/third_party/nvfuser/test/test_gpu_shift.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gtest/gtest.h>
 
 #include <arith.h>
@@ -5464,4 +5463,3 @@ TEST_F(NVFuserTest, FusionContigPredicateShift_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_swizzle.cpp b/third_party/nvfuser/test/test_gpu_swizzle.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gtest/gtest.h>
 
 #include <kernel_cache.h>
@@ -611,4 +610,3 @@ TEST_F(NVFuserTest, FusionSwizzleExampleCyclicShift_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_tensor_factories.cpp b/third_party/nvfuser/test/test_gpu_tensor_factories.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -396,4 +395,3 @@ __global__ void CUDAGeneratedKernel(int64_t i0, int64_t i1, int64_t i2, Tensor<i
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_tensorcore.cpp b/third_party/nvfuser/test/test_gpu_tensorcore.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gtest/gtest.h>
 
 #include <arith.h>
@@ -2859,5 +2858,3 @@ TEST_F(NVFuserTest, FusionTuringMatmulLargeLoad_CUDA) {
 
 } // namespace jit
 } // namespace torch
-
-#endif
diff --git a/third_party/nvfuser/test/test_gpu_transpose.cpp b/third_party/nvfuser/test/test_gpu_transpose.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -1065,4 +1064,3 @@ TEST_F(NVFuserTest, FusionTransposeBankConflict8_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_utils.cpp b/third_party/nvfuser/test/test_gpu_utils.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -1216,4 +1215,3 @@ TEST_F(NVFuserTest, FusionVectorizeSpanningTree_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)
diff --git a/third_party/nvfuser/test/test_gpu_view.cpp b/third_party/nvfuser/test/test_gpu_view.cpp
@@ -1,4 +1,3 @@
-#if defined(USE_CUDA)
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
 
@@ -2288,4 +2287,3 @@ TEST_F(NVFuserTest, FusionIssue2076_v2_CUDA) {
 
 } // namespace jit
 } // namespace torch
-#endif // #if defined(USE_CUDA)