mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
sci-libs/caffe2/files: [QA] use git-format-patch style patches
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
--- a/cmake/Dependencies.cmake 2022-06-17 22:12:34.451841710 +0200
|
||||
+++ b/cmake/Dependencies.cmake 2022-06-17 22:12:48.302786501 +0200
|
||||
--- a/cmake/Dependencies.cmake
|
||||
+++ b/cmake/Dependencies.cmake
|
||||
@@ -1512,7 +1512,6 @@
|
||||
if(NOT USE_SYSTEM_ONNX)
|
||||
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx EXCLUDE_FROM_ALL)
|
||||
@@ -26,8 +26,8 @@
|
||||
set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
|
||||
|
||||
if(USE_BREAKPAD)
|
||||
--- a/c10/CMakeLists.txt 2022-06-17 22:40:53.573306905 +0200
|
||||
+++ b/c10/CMakeLists.txt 2022-06-17 22:41:16.920219686 +0200
|
||||
--- a/c10/CMakeLists.txt
|
||||
+++ b/c10/CMakeLists.txt
|
||||
@@ -59,7 +59,7 @@
|
||||
if(${USE_GLOG})
|
||||
target_link_libraries(c10 PUBLIC glog::glog)
|
||||
@@ -37,8 +37,8 @@
|
||||
|
||||
find_package(Backtrace)
|
||||
if(Backtrace_FOUND)
|
||||
--- a/torch/CMakeLists.txt 2022-06-17 22:42:20.396982644 +0200
|
||||
+++ b/torch/CMakeLists.txt 2022-06-17 22:43:20.214759326 +0200
|
||||
--- a/torch/CMakeLists.txt
|
||||
+++ b/torch/CMakeLists.txt
|
||||
@@ -82,7 +82,6 @@
|
||||
|
||||
set(TORCH_PYTHON_LINK_LIBRARIES
|
||||
@@ -47,8 +47,8 @@
|
||||
ATEN_CPU_FILES_GEN_LIB)
|
||||
|
||||
set(TORCH_PYTHON_COMPILE_DEFINITIONS)
|
||||
--- a/CMakeLists.txt 2022-06-18 20:35:01.451116185 +0200
|
||||
+++ b/CMakeLists.txt 2022-06-18 20:35:08.219023569 +0200
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -750,7 +750,7 @@
|
||||
|
||||
# ---[ Build flags
|
||||
@@ -58,8 +58,8 @@
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing")
|
||||
# Eigen fails to build with some versions, so convert this to a warning
|
||||
# Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
|
||||
--- a/cmake/public/utils.cmake 2022-06-18 20:50:39.314263395 +0200
|
||||
+++ b/cmake/public/utils.cmake 2022-06-18 20:51:49.611291709 +0200
|
||||
--- a/cmake/public/utils.cmake
|
||||
+++ b/cmake/public/utils.cmake
|
||||
@@ -512,8 +512,6 @@
|
||||
endif()
|
||||
|
||||
@@ -69,8 +69,8 @@
|
||||
|
||||
endfunction()
|
||||
|
||||
--- a/cmake/Codegen.cmake 2022-06-18 21:33:13.366381817 +0200
|
||||
+++ b/cmake/Codegen.cmake 2022-06-18 21:33:30.249157610 +0200
|
||||
--- a/cmake/Codegen.cmake
|
||||
+++ b/cmake/Codegen.cmake
|
||||
@@ -57,7 +57,7 @@
|
||||
if(MSVC)
|
||||
set(OPT_FLAG "/fp:strict ")
|
||||
@@ -80,8 +80,8 @@
|
||||
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
|
||||
set(OPT_FLAG " ")
|
||||
endif()
|
||||
--- a/caffe2/CMakeLists.txt 2022-07-01 21:56:49.643490049 +0200
|
||||
+++ b/caffe2/CMakeLists.txt 2022-07-01 21:57:17.091489479 +0200
|
||||
--- a/caffe2/CMakeLists.txt
|
||||
+++ b/caffe2/CMakeLists.txt
|
||||
@@ -109,7 +109,7 @@
|
||||
# Note: the folders that are being commented out have not been properly
|
||||
# addressed yet.
|
||||
@@ -99,8 +99,8 @@
|
||||
endif()
|
||||
|
||||
# ==========================================================
|
||||
--- a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200
|
||||
+++ b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200
|
||||
--- a/cmake/External/nnpack.cmake
|
||||
+++ b/cmake/External/nnpack.cmake
|
||||
@@ -58,7 +58,7 @@
|
||||
set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory")
|
||||
set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
https://github.com/pytorch/pytorch/issues/58054
|
||||
|
||||
--- /c10/util/Logging.cpp
|
||||
+++ /c10/util/Logging.cpp
|
||||
--- a/c10/util/Logging.cpp
|
||||
+++ b/c10/util/Logging.cpp
|
||||
@@ -192,23 +192,13 @@
|
||||
google::GLOG_WARNING,
|
||||
"The minimum log level that caffe2 will output.");
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
--- a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200
|
||||
+++ b/c10/CMakeLists.txt 2022-06-19 09:58:51.663356075 +0200
|
||||
--- a/c10/CMakeLists.txt
|
||||
+++ b/c10/CMakeLists.txt
|
||||
@@ -107,7 +107,7 @@
|
||||
# Note: for now, we will put all export path into one single Caffe2Targets group
|
||||
# to deal with the cmake deployment need. Inside the Caffe2Targets set, the
|
||||
@@ -9,8 +9,6 @@
|
||||
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt
|
||||
index a95bd278e2..4a33b4e4ed 100644
|
||||
--- a/c10/cuda/CMakeLists.txt
|
||||
+++ b/c10/cuda/CMakeLists.txt
|
||||
@@ -63,7 +63,7 @@ add_subdirectory(test)
|
||||
@@ -22,8 +20,6 @@ index a95bd278e2..4a33b4e4ed 100644
|
||||
foreach(file ${C10_CUDA_HEADERS})
|
||||
get_filename_component( dir ${file} DIRECTORY )
|
||||
install( FILES ${file} DESTINATION include/c10/cuda/${dir} )
|
||||
diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt
|
||||
index 6a0e0e41a1..7582c73919 100644
|
||||
--- a/c10/hip/CMakeLists.txt
|
||||
+++ b/c10/hip/CMakeLists.txt
|
||||
@@ -55,7 +55,7 @@ target_include_directories(
|
||||
@@ -35,8 +31,6 @@ index 6a0e0e41a1..7582c73919 100644
|
||||
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
diff --git a/modules/detectron/CMakeLists.txt b/modules/detectron/CMakeLists.txt
|
||||
index bffc074e39..e1697e65f2 100644
|
||||
--- a/modules/detectron/CMakeLists.txt
|
||||
+++ b/modules/detectron/CMakeLists.txt
|
||||
@@ -17,7 +17,7 @@ if(BUILD_CAFFE2_OPS)
|
||||
@@ -66,8 +60,6 @@ index bffc074e39..e1697e65f2 100644
|
||||
if(MSVC)
|
||||
install(FILES $<TARGET_PDB_FILE:caffe2_detectron_ops> DESTINATION lib OPTIONAL)
|
||||
endif()
|
||||
diff --git a/modules/module_test/CMakeLists.txt b/modules/module_test/CMakeLists.txt
|
||||
index f72120d535..c293ce025d 100644
|
||||
--- a/modules/module_test/CMakeLists.txt
|
||||
+++ b/modules/module_test/CMakeLists.txt
|
||||
@@ -16,7 +16,7 @@ if(BUILD_TEST AND NOT BUILD_LITE_INTERPRETER)
|
||||
@@ -79,8 +71,6 @@ index f72120d535..c293ce025d 100644
|
||||
if(MSVC AND BUILD_SHARED_LIBS)
|
||||
install(FILES $<TARGET_PDB_FILE:caffe2_module_test_dynamic> DESTINATION lib OPTIONAL)
|
||||
endif()
|
||||
diff --git a/modules/observers/CMakeLists.txt b/modules/observers/CMakeLists.txt
|
||||
index 050b8a1461..0309a273b7 100644
|
||||
--- a/modules/observers/CMakeLists.txt
|
||||
+++ b/modules/observers/CMakeLists.txt
|
||||
@@ -21,7 +21,7 @@ endif()
|
||||
@@ -92,8 +82,6 @@ index 050b8a1461..0309a273b7 100644
|
||||
caffe2_interface_library(caffe2_observers caffe2_observers_library)
|
||||
if(MSVC AND BUILD_SHARED_LIBS)
|
||||
install(FILES $<TARGET_PDB_FILE:caffe2_observers> DESTINATION lib OPTIONAL)
|
||||
diff --git a/modules/rocksdb/CMakeLists.txt b/modules/rocksdb/CMakeLists.txt
|
||||
index 78651989aa..52bfd149a2 100644
|
||||
--- a/modules/rocksdb/CMakeLists.txt
|
||||
+++ b/modules/rocksdb/CMakeLists.txt
|
||||
@@ -59,7 +59,7 @@ add_library(caffe2_rocksdb ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb.cc)
|
||||
@@ -105,8 +93,6 @@ index 78651989aa..52bfd149a2 100644
|
||||
|
||||
# ---[ Last, Append the library to Caffe2_MODULES, if we are building with
|
||||
# the main repo.
|
||||
diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt
|
||||
index bf91460c4b..ebbd476fa9 100644
|
||||
--- a/test/cpp/c10d/CMakeLists.txt
|
||||
+++ b/test/cpp/c10d/CMakeLists.txt
|
||||
@@ -51,7 +51,7 @@ if(USE_CUDA)
|
||||
@@ -118,8 +104,6 @@ index bf91460c4b..ebbd476fa9 100644
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
diff --git a/test/cpp/jit/CMakeLists.txt b/test/cpp/jit/CMakeLists.txt
|
||||
index 60b43b81fc..9cf34a1620 100644
|
||||
--- a/test/cpp/jit/CMakeLists.txt
|
||||
+++ b/test/cpp/jit/CMakeLists.txt
|
||||
@@ -32,9 +32,9 @@ endif()
|
||||
@@ -135,8 +119,6 @@ index 60b43b81fc..9cf34a1620 100644
|
||||
endif()
|
||||
|
||||
# Build the cpp gtest binary containing the cpp-only tests.
|
||||
diff --git a/torch/csrc/deploy/CMakeLists.txt b/torch/csrc/deploy/CMakeLists.txt
|
||||
index 61fe8c1bb8..28575979dd 100644
|
||||
--- a/torch/csrc/deploy/CMakeLists.txt
|
||||
+++ b/torch/csrc/deploy/CMakeLists.txt
|
||||
@@ -80,4 +80,4 @@ if(INSTALL_TEST)
|
||||
|
||||
Reference in New Issue
Block a user