projects/guix·blob javascript-team · refs

445 lines · 21.1 KiB

1Patch build files to also system libraries instead of bundled ones for the
2libraries not supported or working only by specifying USE_SYSTEM_LIBS. This
3includes using the clog, cpuinfo, fbgemm, foxi, fp16, fxdiv, googletest,
4httlib, ideep, miniz, nnpack, oneapi-dnnl, pocketfft, pthreadpool,
5qnnpack-pytorch, tensorpipe, valgrind and xnnpack packages.
6
7diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt
8index 085af373e..3287429b4 100644
9--- a/aten/src/ATen/CMakeLists.txt
10+++ b/aten/src/ATen/CMakeLists.txt
11@@ -468,9 +468,9 @@ if(AT_NNPACK_ENABLED)
12 list(APPEND ATen_CPU_DEPENDENCY_LIBS nnpack) # cpuinfo is added below
13 endif()
14
15-if(MKLDNN_FOUND)
16- list(APPEND ATen_CPU_DEPENDENCY_LIBS ${MKLDNN_LIBRARIES})
17-endif(MKLDNN_FOUND)
18+if(USE_MKLDNN)
19+ list(APPEND ATen_CPU_DEPENDENCY_LIBS DNNL::dnnl)
20+endif(USE_MKLDNN)
21
22 if(USE_MKLDNN_ACL)
23 list(APPEND ATen_CPU_INCLUDE ${ACL_INCLUDE_DIRS})
24diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
25index d2d23b7ab..1a7e5a042 100644
26--- a/caffe2/CMakeLists.txt
27+++ b/caffe2/CMakeLists.txt
28@@ -91,9 +91,6 @@ if(NOT MSVC AND USE_XNNPACK)
29 if(NOT TARGET fxdiv)
30 set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
31 set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
32- add_subdirectory(
33- "${FXDIV_SOURCE_DIR}"
34- "${CMAKE_BINARY_DIR}/FXdiv")
35 endif()
36 endif()
37
38@@ -1135,7 +1132,6 @@ if(USE_XPU)
39 endif()
40
41 if(NOT MSVC AND USE_XNNPACK)
42- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)
43 endif()
44
45 # ==========================================================
46@@ -1254,8 +1250,8 @@ endif()
47 target_include_directories(torch_cpu PRIVATE
48 ${TORCH_ROOT}/third_party/cpp-httplib)
49
50-target_include_directories(torch_cpu PRIVATE
51- ${TORCH_ROOT}/third_party/nlohmann/include)
52+find_package(httplib REQUIRED)
53+target_link_libraries(torch_cpu PUBLIC httplib::httplib)
54
55 install(DIRECTORY "${TORCH_SRC_DIR}/csrc"
56 DESTINATION ${TORCH_INSTALL_INCLUDE_DIR}/torch
57@@ -1494,6 +1490,7 @@ target_link_libraries(torch_cpu PUBLIC c10)
58 target_link_libraries(torch_cpu PUBLIC ${Caffe2_PUBLIC_DEPENDENCY_LIBS})
59 target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_LIBS})
60 target_link_libraries(torch_cpu PRIVATE ${Caffe2_DEPENDENCY_WHOLE_LINK_LIBS})
61+target_link_libraries(torch_cpu PRIVATE miniz clog)
62 if(USE_MPI)
63 target_link_libraries(torch_cpu PRIVATE MPI::MPI_CXX)
64 endif()
65@@ -1728,7 +1725,7 @@ if(BUILD_STATIC_RUNTIME_BENCHMARK)
66 add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}")
67 add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}")
68 target_link_libraries(static_runtime_bench torch_library benchmark)
69- target_link_libraries(static_runtime_test torch_library gtest_main)
70+ target_link_libraries(static_runtime_test torch_library gtest_main gtest)
71 endif()
72
73 if(BUILD_MOBILE_BENCHMARK)
74@@ -1747,7 +1744,7 @@ if(BUILD_MOBILE_TEST)
75 foreach(test_src ${ATen_MOBILE_TEST_SRCS})
76 get_filename_component(test_name ${test_src} NAME_WE)
77 add_executable(${test_name} "${test_src}")
78- target_link_libraries(${test_name} torch_library gtest_main)
79+ target_link_libraries(${test_name} torch_library gtest_main gtest)
80 target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
81 target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
82 target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE})
83@@ -1768,7 +1765,7 @@ if(BUILD_TEST)
84 if(NOT MSVC)
85 add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/AffineQuantizerBase.cpp)
86 # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR)
87- target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main nlohmann)
88+ target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest_main gtest nlohmann)
89 if(USE_FBGEMM)
90 target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm)
91 endif()
92@@ -1782,7 +1779,7 @@ if(BUILD_TEST)
93 endif()
94 else()
95 add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}")
96- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library sleef gtest_main)
97+ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library sleef gtest_main gtest)
98 endif()
99 target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<INSTALL_INTERFACE:include>)
100 target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
101@@ -1799,7 +1796,7 @@ if(BUILD_TEST)
102 foreach(test_src ${Caffe2_CPU_TEST_SRCS})
103 get_filename_component(test_name ${test_src} NAME_WE)
104 add_executable(${test_name} "${test_src}")
105- target_link_libraries(${test_name} torch_library gtest_main)
106+ target_link_libraries(${test_name} torch_library gtest_main gtest)
107 if(NOT MSVC)
108 target_link_libraries(${test_name} stdc++)
109 endif()
110@@ -1823,7 +1820,7 @@ if(BUILD_TEST)
111 add_executable(${test_name} "${test_src}")
112 find_library(metal NAMES Metal)
113 find_library(foundation NAMES Foundation)
114- target_link_libraries(${test_name} torch_library gtest_main ${metal} ${foundation})
115+ target_link_libraries(${test_name} torch_library gtest_main gtest ${metal} ${foundation})
116 target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
117 target_include_directories(${test_name} PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
118 target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
119@@ -1843,7 +1840,7 @@ if(BUILD_TEST)
120 foreach(test_src ${Caffe2_GPU_TEST_SRCS})
121 get_filename_component(test_name ${test_src} NAME_WE)
122 add_executable(${test_name} "${test_src}")
123- target_link_libraries(${test_name} torch_library gtest_main)
124+ target_link_libraries(${test_name} torch_library gtest_main gtest)
125 if(USE_CUDNN AND ${test_name} MATCHES "cudnn")
126 target_link_libraries(${test_name} torch::cudnn)
127 endif()
128@@ -1865,7 +1862,7 @@ if(BUILD_TEST)
129 foreach(test_src ${Caffe2_XPU_TEST_SRCS})
130 get_filename_component(test_name ${test_src} NAME_WE)
131 add_executable(${test_name} "${test_src}")
132- target_link_libraries(${test_name} torch_library gtest_main)
133+ target_link_libraries(${test_name} torch_library gtest_main gtest)
134 target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
135 target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
136 add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
137@@ -1880,7 +1877,7 @@ if(BUILD_TEST)
138 foreach(test_src ${Caffe2_VULKAN_TEST_SRCS})
139 get_filename_component(test_name ${test_src} NAME_WE)
140 add_executable(${test_name} "${test_src}")
141- target_link_libraries(${test_name} torch_library gtest_main)
142+ target_link_libraries(${test_name} torch_library gtest_main gtest)
143 target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
144 target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE})
145 add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
146@@ -1899,7 +1896,7 @@ if(BUILD_TEST)
147 foreach(test_src ${Caffe2_HIP_TEST_SRCS})
148 get_filename_component(test_name ${test_src} NAME_WE)
149 add_executable(${test_name} "${test_src}")
150- target_link_libraries(${test_name} torch_library gtest_main)
151+ target_link_libraries(${test_name} torch_library gtest_main gtest)
152 target_include_directories(${test_name} PRIVATE $<INSTALL_INTERFACE:include>)
153 target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE})
154 target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS})
155diff --git a/caffe2/serialize/CMakeLists.txt b/caffe2/serialize/CMakeLists.txt
156index ebbff0f29..dcded2590 100644
157--- a/caffe2/serialize/CMakeLists.txt
158+++ b/caffe2/serialize/CMakeLists.txt
159@@ -2,7 +2,6 @@ file(GLOB tmp *_test.cc)
160
161 set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS} ${tmp})
162 list(APPEND Caffe2_CPU_SRCS
163- ${PROJECT_SOURCE_DIR}/third_party/miniz-3.0.2/miniz.c
164 ${CMAKE_CURRENT_SOURCE_DIR}/inline_container.cc
165 ${CMAKE_CURRENT_SOURCE_DIR}/istream_adapter.cc
166 ${CMAKE_CURRENT_SOURCE_DIR}/file_adapter.cc
167diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
168index be45936a8..bb1aa1cc1 100644
169--- a/cmake/Dependencies.cmake
170+++ b/cmake/Dependencies.cmake
171@@ -276,7 +276,7 @@ endif()
172 # --- [ PocketFFT
173 set(AT_POCKETFFT_ENABLED 0)
174 if(NOT AT_MKL_ENABLED)
175- set(POCKETFFT_INCLUDE_DIR "${Torch_SOURCE_DIR}/third_party/pocketfft/")
176+ set(POCKETFFT_INCLUDE_DIR "#POCKETFFT_INCLUDE_DIR")
177 if(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}")
178 message(FATAL_ERROR "pocketfft directory not found, expected ${POCKETFFT_INCLUDE_DIR}")
179 elif(NOT EXISTS "${POCKETFFT_INCLUDE_DIR}/pocketfft_hdronly.h")
180@@ -460,15 +460,6 @@ if(USE_PYTORCH_QNNPACK)
181 set(PYTORCH_QNNPACK_BUILD_TESTS OFF CACHE BOOL "")
182 set(PYTORCH_QNNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "")
183 set(PYTORCH_QNNPACK_LIBRARY_TYPE "static" CACHE STRING "")
184- add_subdirectory(
185- "${PYTORCH_QNNPACK_SOURCE_DIR}"
186- "${CONFU_DEPENDENCIES_BINARY_DIR}/pytorch_qnnpack")
187- # We build static versions of QNNPACK and pthreadpool but link
188- # them into a shared library for Caffe2, so they need PIC.
189- set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON)
190- set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON)
191- # QNNPACK depends on gemmlowp headers
192- target_include_directories(pytorch_qnnpack PRIVATE "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp")
193 endif()
194
195 list(APPEND Caffe2_DEPENDENCY_LIBS pytorch_qnnpack)
196@@ -558,16 +549,15 @@ if(USE_XNNPACK AND NOT USE_SYSTEM_XNNPACK)
197 list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK microkernels-prod)
198 elseif(NOT TARGET XNNPACK AND USE_SYSTEM_XNNPACK)
199 add_library(XNNPACK SHARED IMPORTED)
200- add_library(microkernels-prod SHARED IMPORTED)
201+ add_library(microkernels-prod INTERFACE IMPORTED)
202 find_library(XNNPACK_LIBRARY XNNPACK)
203- find_library(microkernels-prod_LIBRARY microkernels-prod)
204 set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION "${XNNPACK_LIBRARY}")
205- set_property(TARGET microkernels-prod PROPERTY IMPORTED_LOCATION "${microkernels-prod_LIBRARY}")
206- if(NOT XNNPACK_LIBRARY or NOT microkernels-prod_LIBRARY)
207+ set_property(TARGET microkernels-prod PROPERTY INTERFACE_LINK_LIBRARIES XNNPACK)
208+ if(NOT XNNPACK_LIBRARY)
209 message(FATAL_ERROR "Cannot find XNNPACK")
210 endif()
211 message("-- Found XNNPACK: ${XNNPACK_LIBRARY}")
212- list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK microkernels-prod)
213+ list(APPEND Caffe2_DEPENDENCY_LIBS XNNPACK)
214 endif()
215
216 # ---[ Vulkan deps
217@@ -650,11 +640,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST)
218 # this shouldn't be necessary anymore.
219 get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
220 set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
221- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest)
222- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp})
223-
224- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include)
225- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include)
226
227 # We will not need to test benchmark lib itself.
228 set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.")
229@@ -732,16 +717,6 @@ if(USE_FBGEMM)
230 if(USE_ASAN)
231 set(USE_SANITIZER "address,undefined" CACHE STRING "-fsanitize options for FBGEMM")
232 endif()
233- add_subdirectory("${FBGEMM_SOURCE_DIR}")
234- set_property(TARGET fbgemm_generic PROPERTY POSITION_INDEPENDENT_CODE ON)
235- set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
236- set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
237- set_property(TARGET fbgemm PROPERTY POSITION_INDEPENDENT_CODE ON)
238- if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0.0)
239- # See https://github.com/pytorch/pytorch/issues/74352
240- target_compile_options_if_supported(asmjit -Wno-deprecated-copy)
241- target_compile_options_if_supported(asmjit -Wno-unused-but-set-variable)
242- endif()
243 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
244 target_compile_options_if_supported(asmjit -Wno-extra-semi)
245 target_compile_options_if_supported(fbgemm -Wno-extra-semi)
246@@ -829,7 +804,7 @@ if(NOT TARGET fp16 AND NOT USE_SYSTEM_FP16)
247 "${CONFU_DEPENDENCIES_BINARY_DIR}/FP16")
248 endif()
249 elseif(NOT TARGET fp16 AND USE_SYSTEM_FP16)
250- add_library(fp16 STATIC "/usr/include/fp16.h")
251+ add_library(fp16 STATIC "#FP16_INCLUDE_DIR")
252 set_target_properties(fp16 PROPERTIES LINKER_LANGUAGE C)
253 endif()
254 list(APPEND Caffe2_DEPENDENCY_LIBS fp16)
255@@ -1170,10 +1145,9 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
256 message(WARNING "Archived TensorPipe forces CMake compatibility mode")
257 set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
258 endif()
259- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
260 # Suppress warning to unblock libnop comiplation by clang-17
261 # See https://github.com/pytorch/pytorch/issues/151316
262 target_compile_options_if_supported(tensorpipe -Wno-missing-template-arg-list-after-template-kw)
263 if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0")
264 unset(CMAKE_POLICY_VERSION_MINIMUM)
265 endif()
266@@ -1340,7 +1314,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX)
267 endif()
268 set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY})
269 message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}")
270- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx)
271+ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer)
272 endif()
273 # Recover the build shared libs option.
274 set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS})
275@@ -1500,9 +1474,8 @@ if(NOT INTERN_BUILD_MOBILE)
276 endif()
277 if(USE_MKLDNN)
278 include(${CMAKE_CURRENT_LIST_DIR}/public/mkldnn.cmake)
279- if(MKLDNN_FOUND)
280+ if(DNNL_FOUND)
281 set(AT_MKLDNN_ENABLED 1)
282- include_directories(AFTER SYSTEM ${MKLDNN_INCLUDE_DIR})
283 else()
284 message(WARNING "MKLDNN could not be found.")
285 caffe2_update_option(USE_MKLDNN OFF)
286@@ -1583,7 +1556,7 @@ endif()
287 #
288 set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
289 set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
290-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
291+find_package(fmt)
292
293 # Disable compiler feature checks for `fmt`.
294 #
295@@ -1592,7 +1565,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
296 # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
297 # `fmt` is compatible with a superset of the compilers that PyTorch is, it
298 # shouldn't be too bad to just disable the checks.
299-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
300
301 list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
302 set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
303diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake
304index 8a4a310d6..f413d2e61 100644
305--- a/cmake/External/nnpack.cmake
306+++ b/cmake/External/nnpack.cmake
307@@ -40,7 +40,7 @@ endif()
308 # (3) Android, iOS, Linux, macOS - supported
309 ##############################################################################
310
311-if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
312+if(FALSE)
313 message(STATUS "Brace yourself, we are building NNPACK")
314 set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party)
315
316@@ -94,6 +94,5 @@ endif()
317 # (4) Catch-all: not supported.
318 ##############################################################################
319
320-message(WARNING "Unknown platform - I don't know how to build NNPACK. "
321- "See cmake/External/nnpack.cmake for details.")
322-set(USE_NNPACK OFF)
323+set(NNPACK_FOUND TRUE)
324+set(USE_NNPACK ON)
325diff --git a/cmake/public/mkldnn.cmake b/cmake/public/mkldnn.cmake
326index 87935625f..9f8fa3df8 100644
327--- a/cmake/public/mkldnn.cmake
328+++ b/cmake/public/mkldnn.cmake
329@@ -4,7 +4,7 @@ if(CPU_AARCH64)
330 include(${CMAKE_CURRENT_LIST_DIR}/ComputeLibrary.cmake)
331 endif()
332
333-find_package(MKLDNN QUIET)
334+find_package(DNNL REQUIRED)
335
336 if(NOT TARGET caffe2::mkldnn)
337 add_library(caffe2::mkldnn INTERFACE IMPORTED)
338@@ -15,4 +15,4 @@ set_property(
339 ${MKLDNN_INCLUDE_DIR})
340 set_property(
341 TARGET caffe2::mkldnn PROPERTY INTERFACE_LINK_LIBRARIES
342- ${MKLDNN_LIBRARIES})
343+ DNNL::dnnl)
344diff --git a/setup.py b/setup.py
345index 61ee9363f..3691cc35c 100644
346--- a/setup.py
347+++ b/setup.py
348@@ -508,13 +508,9 @@ def build_deps():
349 # Windows has very poor support for them.
350 sym_files = [
351 "tools/shared/_utils_internal.py",
352- "torch/utils/benchmark/utils/valgrind_wrapper/callgrind.h",
353- "torch/utils/benchmark/utils/valgrind_wrapper/valgrind.h",
354 ]
355 orig_files = [
356 "torch/_utils_internal.py",
357- "third_party/valgrind-headers/callgrind.h",
358- "third_party/valgrind-headers/valgrind.h",
359 ]
360 for sym_file, orig_file in zip(sym_files, orig_files):
361 same = False
362diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt
363index 5b423241d..e069accd6 100644
364--- a/test/cpp/c10d/CMakeLists.txt
365+++ b/test/cpp/c10d/CMakeLists.txt
366@@ -26,17 +26,17 @@ function(c10d_add_test test_src)
367 endif()
368 endfunction()
369
370-c10d_add_test(BackoffTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST OFF)
371-c10d_add_test(FileStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST ${INSTALL_TEST})
372-c10d_add_test(TCPStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST ${INSTALL_TEST})
373+c10d_add_test(BackoffTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST OFF)
374+c10d_add_test(FileStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST ${INSTALL_TEST})
375+c10d_add_test(TCPStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST ${INSTALL_TEST})
376 if(NOT WIN32)
377- c10d_add_test(HashStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST ${INSTALL_TEST})
378+ c10d_add_test(HashStoreTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST ${INSTALL_TEST})
379 endif()
380
381 if(USE_CUDA)
382 if(USE_GLOO AND USE_C10D_GLOO)
383- c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main INSTALL_TEST ${INSTALL_TEST})
384- c10d_add_test(ProcessGroupGlooAsyncTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main INSTALL_TEST ${INSTALL_TEST})
385+ c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest INSTALL_TEST ${INSTALL_TEST})
386+ c10d_add_test(ProcessGroupGlooAsyncTest.cpp LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest INSTALL_TEST ${INSTALL_TEST})
387 endif()
388 if(USE_NCCL AND USE_C10D_NCCL)
389 # NCCL is a private dependency of libtorch, but the tests include some
390@@ -45,10 +45,10 @@ if(USE_CUDA)
391 # a private dependency of the tests as well.
392 c10d_add_test(
393 ProcessGroupNCCLTest.cpp
394- LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main __caffe2_nccl INSTALL_TEST ${INSTALL_TEST})
395+ LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl INSTALL_TEST ${INSTALL_TEST})
396 c10d_add_test(
397 ProcessGroupNCCLErrorsTest.cpp
398- LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main __caffe2_nccl INSTALL_TEST ${INSTALL_TEST})
399+ LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest __caffe2_nccl INSTALL_TEST ${INSTALL_TEST})
400 if(INSTALL_TEST)
401 install(TARGETS c10d_cuda_test DESTINATION lib)
402 endif()
403@@ -60,14 +60,14 @@ if(USE_CUDA)
404 # a private dependency of the tests as well.
405 c10d_add_test(
406 ProcessGroupUCCTest.cpp
407- LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main __caffe2_ucc INSTALL_TEST ${INSTALL_TEST})
408+ LINK_LIBRARIES torch_cpu c10d_cuda_test gtest_main gtest __caffe2_ucc INSTALL_TEST ${INSTALL_TEST})
409 if(INSTALL_TEST)
410 install(TARGETS c10d_cuda_test DESTINATION lib)
411 endif()
412 endif()
413 else()
414 if(USE_GLOO AND USE_C10D_GLOO)
415- c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu gtest_main INSTALL_TEST OFF)
416+ c10d_add_test(ProcessGroupGlooTest.cpp LINK_LIBRARIES torch_cpu gtest_main gtest INSTALL_TEST OFF)
417 endif()
418 endif()
419
420diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt
421index 9c409e078..6cddd8de4 100644
422--- a/test/cpp/tensorexpr/CMakeLists.txt
423+++ b/test/cpp/tensorexpr/CMakeLists.txt
424@@ -51,7 +51,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE})
425 # pthreadpool header. For some build environment we need add the dependency
426 # explicitly.
427 if(USE_PTHREADPOOL)
428- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface)
429+ target_link_libraries(test_tensorexpr PRIVATE pthreadpool)
430 endif()
431 if(USE_CUDA)
432 target_compile_definitions(test_tensorexpr PRIVATE USE_CUDA)
433diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
434index 8b8ebdc6e..034b5e56c 100644
435--- a/torch/CMakeLists.txt
436+++ b/torch/CMakeLists.txt
437@@ -82,8 +82,6 @@ set(TORCH_PYTHON_LINK_LIBRARIES
438 Python::Module
439 pybind::pybind11
440 opentelemetry::api
441- httplib
442- nlohmann
443 shm
444 fmt::fmt-header-only
445 ATEN_CPU_FILES_GEN_LIB)