Use our own googletest rather than the bundled one. Get NNPACK to use our own PeachPy rather than the bundled one. diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt index d57d7ebb..5b5622f0 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt @@ -1736,7 +1736,7 @@ if(BUILD_TEST) if(NOT MSVC) add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/affine_quantizer_base.cpp) # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR) - target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main) + target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest) if(USE_FBGEMM) target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm) endif() @@ -1759,7 +1759,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_CPU_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") - target_link_libraries(${t
aboutsummaryrefslogtreecommitdiff
path: root/build-aux/hydra
diff options
context:
space:
mode:
Diffstat (limited to 'build-aux/hydra')
0 files changed, 0 insertions, 0 deletions
############## -if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") +if(FALSE) message(STATUS "Brace yourself, we are building NNPACK") set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party) @@ -114,6 +114,5 @@ endif() # (4) Catch-all: not supported. ############################################################################## -message(WARNING "Unknown platform - I don't know how to build NNPACK. " - "See cmake/External/nnpack.cmake for details.") -set(USE_NNPACK OFF) +set(NNPACK_FOUND TRUE) +set(USE_NNPACK ON) diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt index bf91460c..ef56948f 100644 --- a/test/cpp/c10d/CMakeLists.txt +++ b/test/cpp/c10d/CMakeLists.txt @@ -16,14 +16,14 @@ function(c10d_add_test test_src) add_test(NAME ${test_name} COMMAND $) endfunction() -c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main) -c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main) +c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest) +c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest) if(INSTALL_TEST) install(TARGETS FileStoreTest DESTINATION bin) install(TARGETS TCPStoreTest DESTINATION bin) endif() if(NOT WIN32) - c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main) + c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main gtest) if(INSTALL_TEST) install(TARGETS HashStoreTest DESTINATION bin) endif() @@ -31,11 +31,11 @@ endif() if(USE_CUDA) if(USE_GLOO AND USE_C10D_GLOO) - c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main) + c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main gtest) if(INSTALL_TEST) install(TARGETS ProcessGroupGlooTest DESTINATION bin) endif() - c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main) + c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main gtest) endif() if(USE_NCCL AND USE_C10D_NCCL) # NCCL is a private dependency of libtorch, but the tests include some @@ -56,7 +56,7 @@ if(USE_CUDA) endif() else() if(USE_GLOO AND USE_C10D_GLOO) - c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main) + c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main gtest) endif() endif() diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt index 8fc5a0a1..643202f6 100644 --- a/test/cpp/tensorexpr/CMakeLists.txt +++ b/test/cpp/tensorexpr/CMakeLists.txt @@ -53,7 +53,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) # pthreadpool header. For some build environment we need add the dependency # explicitly. if(USE_PTHREADPOOL) - target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface) + target_link_libraries(test_tensorexpr PRIVATE pthreadpool) endif() if(USE_CUDA) target_link_libraries(test_tensorexpr PRIVATE