Lockdown NO_TEST=1 for tests even more (pytorch#11415)

Summary:
Skip torch tests as well when NO_TEST=1 environment variable is set. Also remove the separate ATen code path for not being built with Caffe2, since it will always be built with Caffe2.

cc The controller you requested could not be found.
Pull Request resolved: pytorch#11415

Reviewed By: soumith

Differential Revision: D9758179

Pulled By: orionr

fbshipit-source-id: e3e3327364fccdc57a703aeaad8c4f30452973fb

Author: orionr

aten/src/ATen/CMakeLists.txt

@@ -405,30 +405,32 @@ else()
 endif()
 
 if (NOT CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO)
-  foreach(test_src ${ATen_CPU_TEST_SRCS})
-    get_filename_component(test_name ${test_src} NAME_WE)
-    add_executable(${test_name} "${test_src}")
-    target_include_directories(
-        ${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
-    target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
-    target_include_directories(${test_name} SYSTEM PRIVATE ${ATen_THIRD_PARTY_INCLUDE})
-    target_link_libraries(${test_name} ATen_cpu)
-    add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
-    install(TARGETS ${test_name} DESTINATION test)
-  endforeach()
-
-  if(USE_CUDA OR USE_ROCM)
-    foreach(test_src ${ATen_CUDA_TEST_SRCS})
+  if (BUILD_TEST)
+    foreach(test_src ${ATen_CPU_TEST_SRCS})
       get_filename_component(test_name ${test_src} NAME_WE)
-      torch_cuda_based_add_executable(${test_name} "${test_src}")
+      add_executable(${test_name} "${test_src}")
       target_include_directories(
           ${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
       target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
       target_include_directories(${test_name} SYSTEM PRIVATE ${ATen_THIRD_PARTY_INCLUDE})
-      target_link_libraries(${test_name} -Wl,--no-as-needed ATen_cpu ATen_cuda)
+      target_link_libraries(${test_name} ATen_cpu)
       add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
       install(TARGETS ${test_name} DESTINATION test)
     endforeach()
+
+    if(USE_CUDA OR USE_ROCM)
+      foreach(test_src ${ATen_CUDA_TEST_SRCS})
+        get_filename_component(test_name ${test_src} NAME_WE)
+        torch_cuda_based_add_executable(${test_name} "${test_src}")
+        target_include_directories(
+            ${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
+        target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
+        target_include_directories(${test_name} SYSTEM PRIVATE ${ATen_THIRD_PARTY_INCLUDE})
+        target_link_libraries(${test_name} -Wl,--no-as-needed ATen_cpu ATen_cuda)
+        add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
+        install(TARGETS ${test_name} DESTINATION test)
+      endforeach()
+    endif()
   endif()
 
   # Make sure these don't get built by parent

tools/build_libtorch.py

@@ -12,6 +12,7 @@
     args = parser.parse_args()
 
     os.environ['BUILD_TORCH'] = 'ON'
+    os.environ['BUILD_TEST'] = 'ON'
     os.environ['ONNX_NAMESPACE'] = 'onnx_torch'
     os.environ['PYTORCH_PYTHON'] = sys.executable
 

torch/CMakeLists.txt

@@ -9,7 +9,7 @@ else()
   option(USE_CUDA "Use CUDA" ON)
 endif()
 
-option(BUILD_TORCH_TEST "Build torch test binaries" ON)
+option(BUILD_TEST "Build torch test binaries" ON)
 option(TORCH_STATIC "Build libtorch.a rather than libtorch.so" OFF)
 
 # TODO: Unify with version from setup.py
@@ -403,7 +403,7 @@ install(TARGETS torch
   ARCHIVE DESTINATION "${TORCH_INSTALL_LIB_DIR}")
 
 # JIT Tests. TODO: Put into test/cpp/jit folder
-if (BUILD_TORCH_TEST AND NOT MSVC AND NOT APPLE AND NOT USE_ROCM)
+if (BUILD_TEST AND NOT MSVC AND NOT APPLE AND NOT USE_ROCM)
   add_executable(test_jit ${TORCH_SRC_DIR}/csrc/jit/test_jit.cpp)
   target_link_libraries(test_jit torch ${TORCH_CUDA_LIBRARIES})
   target_compile_definitions(test_jit PUBLIC USE_CATCH _FORCE_INLINES)
@@ -416,7 +416,7 @@ if (BUILD_TORCH_TEST AND NOT MSVC AND NOT APPLE AND NOT USE_ROCM)
   endif()
 endif()
 
-if (BUILD_TORCH_TEST AND NOT NO_API AND NOT USE_ROCM)
+if (BUILD_TEST AND NOT NO_API AND NOT USE_ROCM)
   set(TORCH_API_TEST_DIR "${TORCH_ROOT}/test/cpp/api")
 
   add_executable(test_api