Add back cpp_build tests for Mac (#7810)

orionr · web-flow · commit 65f8465f6f4a · 2018-05-29T12:54:12.000-07:00
diff --git a/.jenkins/pytorch/macos-build-test.sh b/.jenkins/pytorch/macos-build-test.sh
@@ -35,11 +35,10 @@ rm -rf $CPP_BUILD
 mkdir -p $CPP_BUILD
 WERROR=1 VERBOSE=1 tools/cpp_build/build_all.sh "$CPP_BUILD"
 
-# TODO; Enable tests on Mac as soon as possible
-#python tools/download_mnist.py --quiet -d test/cpp/api/mnist
-#
-# # Unfortunately it seems like the test can't load from miniconda3
-# # without these paths being set
-# export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/miniconda3/lib"
-# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/miniconda3/lib"
-# "$CPP_BUILD"/libtorch/bin/test_api
+python tools/download_mnist.py --quiet -d test/cpp/api/mnist
+
+# Unfortunately it seems like the test can't load from miniconda3
+# without these paths being set
+export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$PWD/miniconda3/lib"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/miniconda3/lib"
+"$CPP_BUILD"/libtorch/bin/test_api
diff --git a/tools/cpp_build/libtorch/CMakeLists.txt b/tools/cpp_build/libtorch/CMakeLists.txt
@@ -6,6 +6,7 @@ else()
   cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
   include(CMakeDependentOption)
   option(USE_CUDA "Use CUDA" ON)
+  option(TORCH_BUILD_TEST "Build torch test binaries" ON)
 
   # Legacy options, which we will eventually remove
   cmake_dependent_option(
@@ -19,13 +20,6 @@ if (NOT USE_CUDA)
   set(NO_CUDA ON)
 endif()
 
-# TODO: Enable tests on Mac as soon as possible
-if (APPLE)
-  set(TORCH_BUILD_TEST OFF)
-else()
-  set(TORCH_BUILD_TEST ON)
-endif()
-
 cmake_policy(VERSION 3.0)
 
 set(CMAKE_CXX_STANDARD 11)
