65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From c46146dc31ed3dc0ebb6ca28c01330db8ba5d4f2 Mon Sep 17 00:00:00 2001
|
|
From: Tom Rix <trix@redhat.com>
|
|
Date: Sat, 3 Feb 2024 08:16:04 -0500
|
|
Subject: [PATCH] no third_party fmt
|
|
|
|
---
|
|
c10/CMakeLists.txt | 2 +-
|
|
cmake/Dependencies.cmake | 6 +++---
|
|
torch/CMakeLists.txt | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
|
|
index cb81556ff2..7529b2aec9 100644
|
|
--- a/c10/CMakeLists.txt
|
|
+++ b/c10/CMakeLists.txt
|
|
@@ -87,7 +87,7 @@ endif()
|
|
if(C10_USE_GLOG)
|
|
target_link_libraries(c10 PUBLIC glog::glog)
|
|
endif()
|
|
-target_link_libraries(c10 PRIVATE fmt::fmt-header-only)
|
|
+target_link_libraries(c10 PRIVATE fmt)
|
|
|
|
if(C10_USE_NUMA)
|
|
target_include_directories(c10 PRIVATE ${Numa_INCLUDE_DIR})
|
|
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
|
|
index 8310f29e01..c99d0d762a 100644
|
|
--- a/cmake/Dependencies.cmake
|
|
+++ b/cmake/Dependencies.cmake
|
|
@@ -1834,7 +1834,7 @@ endif()
|
|
#
|
|
set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
|
|
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
|
|
-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
|
|
+# add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
|
|
|
|
# Disable compiler feature checks for `fmt`.
|
|
#
|
|
@@ -1843,9 +1843,9 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
|
|
# CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
|
|
# `fmt` is compatible with a superset of the compilers that PyTorch is, it
|
|
# shouldn't be too bad to just disable the checks.
|
|
-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
|
|
+# set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
|
|
|
|
-list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
|
|
+# list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
|
|
set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
|
|
|
|
# ---[ Kineto
|
|
diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
|
|
index 24903a207e..3a7751dc00 100644
|
|
--- a/torch/CMakeLists.txt
|
|
+++ b/torch/CMakeLists.txt
|
|
@@ -80,7 +80,7 @@ set(TORCH_PYTHON_LINK_LIBRARIES
|
|
python::python
|
|
pybind::pybind11
|
|
shm
|
|
- fmt::fmt-header-only
|
|
+ fmt
|
|
ATEN_CPU_FILES_GEN_LIB)
|
|
|
|
if(USE_ASAN AND TARGET Sanitizer::address)
|
|
--
|
|
2.43.0
|
|
|