1 |
commit: bdcc968d38d7f1a211f1a96830e2bdf32e7c8f55 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 30 11:12:49 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 30 11:12:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcc968d |
7 |
|
8 |
sci-libs/caffe2/files: [QA] use git-format-patch style patches |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 32 +++++++++++----------- |
13 |
.../caffe2/files/caffe2-1.12.0-glog-0.6.0.patch | 4 +-- |
14 |
.../caffe2/files/caffe2-1.12.0-install-dirs.patch | 22 ++------------- |
15 |
3 files changed, 20 insertions(+), 38 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch |
18 |
index 505af5e6695c..addf1eb0bfba 100644 |
19 |
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch |
20 |
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch |
21 |
@@ -1,5 +1,5 @@ |
22 |
---- a/cmake/Dependencies.cmake 2022-06-17 22:12:34.451841710 +0200 |
23 |
-+++ b/cmake/Dependencies.cmake 2022-06-17 22:12:48.302786501 +0200 |
24 |
+--- a/cmake/Dependencies.cmake |
25 |
++++ b/cmake/Dependencies.cmake |
26 |
@@ -1512,7 +1512,6 @@ |
27 |
if(NOT USE_SYSTEM_ONNX) |
28 |
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx EXCLUDE_FROM_ALL) |
29 |
@@ -26,8 +26,8 @@ |
30 |
set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) |
31 |
|
32 |
if(USE_BREAKPAD) |
33 |
---- a/c10/CMakeLists.txt 2022-06-17 22:40:53.573306905 +0200 |
34 |
-+++ b/c10/CMakeLists.txt 2022-06-17 22:41:16.920219686 +0200 |
35 |
+--- a/c10/CMakeLists.txt |
36 |
++++ b/c10/CMakeLists.txt |
37 |
@@ -59,7 +59,7 @@ |
38 |
if(${USE_GLOG}) |
39 |
target_link_libraries(c10 PUBLIC glog::glog) |
40 |
@@ -37,8 +37,8 @@ |
41 |
|
42 |
find_package(Backtrace) |
43 |
if(Backtrace_FOUND) |
44 |
---- a/torch/CMakeLists.txt 2022-06-17 22:42:20.396982644 +0200 |
45 |
-+++ b/torch/CMakeLists.txt 2022-06-17 22:43:20.214759326 +0200 |
46 |
+--- a/torch/CMakeLists.txt |
47 |
++++ b/torch/CMakeLists.txt |
48 |
@@ -82,7 +82,6 @@ |
49 |
|
50 |
set(TORCH_PYTHON_LINK_LIBRARIES |
51 |
@@ -47,8 +47,8 @@ |
52 |
ATEN_CPU_FILES_GEN_LIB) |
53 |
|
54 |
set(TORCH_PYTHON_COMPILE_DEFINITIONS) |
55 |
---- a/CMakeLists.txt 2022-06-18 20:35:01.451116185 +0200 |
56 |
-+++ b/CMakeLists.txt 2022-06-18 20:35:08.219023569 +0200 |
57 |
+--- a/CMakeLists.txt |
58 |
++++ b/CMakeLists.txt |
59 |
@@ -750,7 +750,7 @@ |
60 |
|
61 |
# ---[ Build flags |
62 |
@@ -58,8 +58,8 @@ |
63 |
string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing") |
64 |
# Eigen fails to build with some versions, so convert this to a warning |
65 |
# Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 |
66 |
---- a/cmake/public/utils.cmake 2022-06-18 20:50:39.314263395 +0200 |
67 |
-+++ b/cmake/public/utils.cmake 2022-06-18 20:51:49.611291709 +0200 |
68 |
+--- a/cmake/public/utils.cmake |
69 |
++++ b/cmake/public/utils.cmake |
70 |
@@ -512,8 +512,6 @@ |
71 |
endif() |
72 |
|
73 |
@@ -69,8 +69,8 @@ |
74 |
|
75 |
endfunction() |
76 |
|
77 |
---- a/cmake/Codegen.cmake 2022-06-18 21:33:13.366381817 +0200 |
78 |
-+++ b/cmake/Codegen.cmake 2022-06-18 21:33:30.249157610 +0200 |
79 |
+--- a/cmake/Codegen.cmake |
80 |
++++ b/cmake/Codegen.cmake |
81 |
@@ -57,7 +57,7 @@ |
82 |
if(MSVC) |
83 |
set(OPT_FLAG "/fp:strict ") |
84 |
@@ -80,8 +80,8 @@ |
85 |
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") |
86 |
set(OPT_FLAG " ") |
87 |
endif() |
88 |
---- a/caffe2/CMakeLists.txt 2022-07-01 21:56:49.643490049 +0200 |
89 |
-+++ b/caffe2/CMakeLists.txt 2022-07-01 21:57:17.091489479 +0200 |
90 |
+--- a/caffe2/CMakeLists.txt |
91 |
++++ b/caffe2/CMakeLists.txt |
92 |
@@ -109,7 +109,7 @@ |
93 |
# Note: the folders that are being commented out have not been properly |
94 |
# addressed yet. |
95 |
@@ -99,8 +99,8 @@ |
96 |
endif() |
97 |
|
98 |
# ========================================================== |
99 |
---- a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200 |
100 |
-+++ b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200 |
101 |
+--- a/cmake/External/nnpack.cmake |
102 |
++++ b/cmake/External/nnpack.cmake |
103 |
@@ -58,7 +58,7 @@ |
104 |
set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") |
105 |
set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") |
106 |
|
107 |
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch |
108 |
index a821ebedf7b7..6c06d2cca654 100644 |
109 |
--- a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch |
110 |
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch |
111 |
@@ -1,7 +1,7 @@ |
112 |
https://github.com/pytorch/pytorch/issues/58054 |
113 |
|
114 |
---- /c10/util/Logging.cpp |
115 |
-+++ /c10/util/Logging.cpp |
116 |
+--- a/c10/util/Logging.cpp |
117 |
++++ b/c10/util/Logging.cpp |
118 |
@@ -192,23 +192,13 @@ |
119 |
google::GLOG_WARNING, |
120 |
"The minimum log level that caffe2 will output."); |
121 |
|
122 |
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch |
123 |
index d9c403d5882e..078e33f45020 100644 |
124 |
--- a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch |
125 |
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch |
126 |
@@ -1,5 +1,5 @@ |
127 |
---- a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200 |
128 |
-+++ b/c10/CMakeLists.txt 2022-06-19 09:58:51.663356075 +0200 |
129 |
+--- a/c10/CMakeLists.txt |
130 |
++++ b/c10/CMakeLists.txt |
131 |
@@ -107,7 +107,7 @@ |
132 |
# Note: for now, we will put all export path into one single Caffe2Targets group |
133 |
# to deal with the cmake deployment need. Inside the Caffe2Targets set, the |
134 |
@@ -9,8 +9,6 @@ |
135 |
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} |
136 |
DESTINATION include |
137 |
FILES_MATCHING PATTERN "*.h") |
138 |
-diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt |
139 |
-index a95bd278e2..4a33b4e4ed 100644 |
140 |
--- a/c10/cuda/CMakeLists.txt |
141 |
+++ b/c10/cuda/CMakeLists.txt |
142 |
@@ -63,7 +63,7 @@ add_subdirectory(test) |
143 |
@@ -22,8 +20,6 @@ index a95bd278e2..4a33b4e4ed 100644 |
144 |
foreach(file ${C10_CUDA_HEADERS}) |
145 |
get_filename_component( dir ${file} DIRECTORY ) |
146 |
install( FILES ${file} DESTINATION include/c10/cuda/${dir} ) |
147 |
-diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt |
148 |
-index 6a0e0e41a1..7582c73919 100644 |
149 |
--- a/c10/hip/CMakeLists.txt |
150 |
+++ b/c10/hip/CMakeLists.txt |
151 |
@@ -55,7 +55,7 @@ target_include_directories( |
152 |
@@ -35,8 +31,6 @@ index 6a0e0e41a1..7582c73919 100644 |
153 |
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} |
154 |
DESTINATION include |
155 |
FILES_MATCHING PATTERN "*.h") |
156 |
-diff --git a/modules/detectron/CMakeLists.txt b/modules/detectron/CMakeLists.txt |
157 |
-index bffc074e39..e1697e65f2 100644 |
158 |
--- a/modules/detectron/CMakeLists.txt |
159 |
+++ b/modules/detectron/CMakeLists.txt |
160 |
@@ -17,7 +17,7 @@ if(BUILD_CAFFE2_OPS) |
161 |
@@ -66,8 +60,6 @@ index bffc074e39..e1697e65f2 100644 |
162 |
if(MSVC) |
163 |
install(FILES $<TARGET_PDB_FILE:caffe2_detectron_ops> DESTINATION lib OPTIONAL) |
164 |
endif() |
165 |
-diff --git a/modules/module_test/CMakeLists.txt b/modules/module_test/CMakeLists.txt |
166 |
-index f72120d535..c293ce025d 100644 |
167 |
--- a/modules/module_test/CMakeLists.txt |
168 |
+++ b/modules/module_test/CMakeLists.txt |
169 |
@@ -16,7 +16,7 @@ if(BUILD_TEST AND NOT BUILD_LITE_INTERPRETER) |
170 |
@@ -79,8 +71,6 @@ index f72120d535..c293ce025d 100644 |
171 |
if(MSVC AND BUILD_SHARED_LIBS) |
172 |
install(FILES $<TARGET_PDB_FILE:caffe2_module_test_dynamic> DESTINATION lib OPTIONAL) |
173 |
endif() |
174 |
-diff --git a/modules/observers/CMakeLists.txt b/modules/observers/CMakeLists.txt |
175 |
-index 050b8a1461..0309a273b7 100644 |
176 |
--- a/modules/observers/CMakeLists.txt |
177 |
+++ b/modules/observers/CMakeLists.txt |
178 |
@@ -21,7 +21,7 @@ endif() |
179 |
@@ -92,8 +82,6 @@ index 050b8a1461..0309a273b7 100644 |
180 |
caffe2_interface_library(caffe2_observers caffe2_observers_library) |
181 |
if(MSVC AND BUILD_SHARED_LIBS) |
182 |
install(FILES $<TARGET_PDB_FILE:caffe2_observers> DESTINATION lib OPTIONAL) |
183 |
-diff --git a/modules/rocksdb/CMakeLists.txt b/modules/rocksdb/CMakeLists.txt |
184 |
-index 78651989aa..52bfd149a2 100644 |
185 |
--- a/modules/rocksdb/CMakeLists.txt |
186 |
+++ b/modules/rocksdb/CMakeLists.txt |
187 |
@@ -59,7 +59,7 @@ add_library(caffe2_rocksdb ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb.cc) |
188 |
@@ -105,8 +93,6 @@ index 78651989aa..52bfd149a2 100644 |
189 |
|
190 |
# ---[ Last, Append the library to Caffe2_MODULES, if we are building with |
191 |
# the main repo. |
192 |
-diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt |
193 |
-index bf91460c4b..ebbd476fa9 100644 |
194 |
--- a/test/cpp/c10d/CMakeLists.txt |
195 |
+++ b/test/cpp/c10d/CMakeLists.txt |
196 |
@@ -51,7 +51,7 @@ if(USE_CUDA) |
197 |
@@ -118,8 +104,6 @@ index bf91460c4b..ebbd476fa9 100644 |
198 |
endif() |
199 |
endif() |
200 |
else() |
201 |
-diff --git a/test/cpp/jit/CMakeLists.txt b/test/cpp/jit/CMakeLists.txt |
202 |
-index 60b43b81fc..9cf34a1620 100644 |
203 |
--- a/test/cpp/jit/CMakeLists.txt |
204 |
+++ b/test/cpp/jit/CMakeLists.txt |
205 |
@@ -32,9 +32,9 @@ endif() |
206 |
@@ -135,8 +119,6 @@ index 60b43b81fc..9cf34a1620 100644 |
207 |
endif() |
208 |
|
209 |
# Build the cpp gtest binary containing the cpp-only tests. |
210 |
-diff --git a/torch/csrc/deploy/CMakeLists.txt b/torch/csrc/deploy/CMakeLists.txt |
211 |
-index 61fe8c1bb8..28575979dd 100644 |
212 |
--- a/torch/csrc/deploy/CMakeLists.txt |
213 |
+++ b/torch/csrc/deploy/CMakeLists.txt |
214 |
@@ -80,4 +80,4 @@ if(INSTALL_TEST) |