* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
@ 2022-10-30 11:13 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-10-30 11:13 UTC (permalink / raw
To: gentoo-commits
commit: bdcc968d38d7f1a211f1a96830e2bdf32e7c8f55
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:12:49 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 11:12:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcc968d
sci-libs/caffe2/files: [QA] use git-format-patch style patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 32 +++++++++++-----------
.../caffe2/files/caffe2-1.12.0-glog-0.6.0.patch | 4 +--
.../caffe2/files/caffe2-1.12.0-install-dirs.patch | 22 ++-------------
3 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index 505af5e6695c..addf1eb0bfba 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -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")
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
index a821ebedf7b7..6c06d2cca654 100644
--- 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
@@ -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.");
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
index d9c403d5882e..078e33f45020 100644
--- a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch
@@ -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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
@ 2022-12-23 11:07 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2022-12-23 11:07 UTC (permalink / raw
To: gentoo-commits
commit: 4e35b1fd5cf76fe594ebc10a3a3d0e874cb78e75
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 11:05:52 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 11:06:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e35b1fd
sci-libs/caffe2: remove -Werror
Closes: https://bugs.gentoo.org/886441
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index addf1eb0bfba..059bcc2b9705 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -49,7 +49,7 @@
set(TORCH_PYTHON_COMPILE_DEFINITIONS)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -750,7 +750,7 @@
+@@ -777,7 +777,7 @@
# ---[ Build flags
if(NOT MSVC)
@@ -58,6 +58,26 @@
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
+@@ -783,7 +783,6 @@
+ # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
+ string(APPEND CMAKE_CXX_FLAGS " -Wall")
+ string(APPEND CMAKE_CXX_FLAGS " -Wextra")
+- string(APPEND CMAKE_CXX_FLAGS " -Werror=return-type")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-type-limits")
+ string(APPEND CMAKE_CXX_FLAGS " -Wno-array-bounds")
+@@ -883,11 +882,9 @@
+ string(APPEND CMAKE_CXX_FLAGS " -fno-trapping-math")
+ check_cxx_compiler_flag("-Werror=format" HAS_WERROR_FORMAT)
+ if(HAS_WERROR_FORMAT)
+- string(APPEND CMAKE_CXX_FLAGS " -Werror=format")
+ endif()
+ check_cxx_compiler_flag("-Werror=cast-function-type" HAS_WERROR_CAST_FUNCTION_TYPE)
+ if(HAS_WERROR_CAST_FUNCTION_TYPE)
+- string(APPEND CMAKE_CXX_FLAGS " -Werror=cast-function-type")
+ endif()
+ check_cxx_compiler_flag("-Werror=sign-compare" HAS_WERROR_SIGN_COMPARE)
+ # This doesn't work globally so we use the test on specific
--- a/cmake/public/utils.cmake
+++ b/cmake/public/utils.cmake
@@ -512,8 +512,6 @@
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
@ 2023-01-04 14:02 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2023-01-04 14:02 UTC (permalink / raw
To: gentoo-commits
commit: d63f5f531caa6c5a6cd5db49ba9efd96006a7325
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 14:00:46 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 14:01:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63f5f53
sci-libs/caffe2: remove last Werror
Closes: https://bugs.gentoo.org/889444
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 38 +++++++++++++++++-------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
index 059bcc2b9705..67d4281c8b95 100644
--- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -1,6 +1,6 @@
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
-@@ -1512,7 +1512,6 @@
+@@ -1523,7 +1523,6 @@
if(NOT USE_SYSTEM_ONNX)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx EXCLUDE_FROM_ALL)
endif()
@@ -8,7 +8,7 @@
add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
if(NOT USE_SYSTEM_ONNX)
-@@ -1810,7 +1809,6 @@
+@@ -1821,7 +1820,6 @@
#
set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
@@ -16,7 +16,7 @@
# Disable compiler feature checks for `fmt`.
#
-@@ -1819,9 +1817,7 @@
+@@ -1830,9 +1828,7 @@
# 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.
@@ -25,10 +25,10 @@
-list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
- if(USE_BREAKPAD)
+ # ---[ Kineto
--- a/c10/CMakeLists.txt
+++ b/c10/CMakeLists.txt
-@@ -59,7 +59,7 @@
+@@ -62,7 +62,7 @@
if(${USE_GLOG})
target_link_libraries(c10 PUBLIC glog::glog)
endif()
@@ -39,9 +39,9 @@
if(Backtrace_FOUND)
--- a/torch/CMakeLists.txt
+++ b/torch/CMakeLists.txt
-@@ -82,7 +82,6 @@
-
- set(TORCH_PYTHON_LINK_LIBRARIES
+@@ -86,7 +86,6 @@
+ python::python
+ pybind::pybind11
shm
- fmt::fmt-header-only
ATEN_CPU_FILES_GEN_LIB)
@@ -80,7 +80,7 @@
# This doesn't work globally so we use the test on specific
--- a/cmake/public/utils.cmake
+++ b/cmake/public/utils.cmake
-@@ -512,8 +512,6 @@
+@@ -510,8 +510,6 @@
endif()
# Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression)
@@ -102,7 +102,7 @@
endif()
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
-@@ -109,7 +109,7 @@
+@@ -111,7 +111,7 @@
# Note: the folders that are being commented out have not been properly
# addressed yet.
@@ -111,7 +111,23 @@
if(NOT TARGET fxdiv)
set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
-@@ -967,7 +967,6 @@
+@@ -557,7 +557,6 @@
+ if(NOT MSVC)
+ set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp PROPERTIES COMPILE_FLAGS -Wno-noexcept-type)
+ # Force -Werror on several files
+- set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp PROPERTIES COMPILE_FLAGS "-Werror")
+ endif()
+ # Disable certain warnings for GCC-9.X
+ if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0.0))
+@@ -825,7 +824,6 @@
+ torch_compile_options(torch_cpu) # see cmake/public/utils.cmake
+ if(HAS_WERROR_SIGN_COMPARE AND WERROR)
+ # target_compile_options(torch_cpu PRIVATE "-Werror=sign-compare")
+- set_property(SOURCE ${ATen_CORE_SRCS} ${ATen_CPU_SRCS} APPEND PROPERTY COMPILE_OPTIONS "-Werror=sign-compare")
+ endif()
+
+ set_property(SOURCE ${ATen_CORE_SRCS} APPEND
+@@ -1017,7 +1015,6 @@
endif()
if(NOT MSVC AND USE_XNNPACK)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/
@ 2024-12-23 18:40 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2024-12-23 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 0a916de9da679ab13ef5bbb3a3c006120269b8e0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Dec 23 17:57:20 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 18:39:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a916de9
sci-libs/caffe2: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/39829
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../files/caffe2-2.5.1-exclude-aotriton.patch | 22 ----------------------
.../files/caffe2-2.5.1-fix-functorch-install.patch | 8 --------
.../caffe2/files/caffe2-2.5.1-install-dirs.patch | 11 -----------
3 files changed, 41 deletions(-)
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch b/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch
deleted file mode 100644
index 340d6e45c95a..000000000000
--- a/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disables aotriton download when both USE_FLASH_ATTENTION and USE_MEM_EFF_ATTENTION cmake flags are OFF
-Backports upstream PR to 2.3.0: https://github.com/pytorch/pytorch/pull/130197
---- a/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp
-+++ b/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp
-@@ -659,7 +659,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) {
- array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16);
- constexpr auto less_than_sm80_mem_efficient_dtypes =
- array_of<at::ScalarType>(at::kHalf, at::kFloat);
--#ifdef USE_ROCM
-+#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION)
- constexpr auto aotriton_mem_efficient_dtypes =
- array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16);
- #endif
-@@ -709,7 +709,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) {
- }
- }
-
--#ifdef USE_ROCM
-+#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION)
- return check_tensor_dtype(params, aotriton_mem_efficient_dtypes, debug);
- #else
- auto dprop = at::cuda::getCurrentDeviceProperties();
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch
deleted file mode 100644
index ffce0028a556..000000000000
--- a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/functorch/CMakeLists.txt 2024-11-10 11:18:29.151992840 +0100
-+++ b/functorch/CMakeLists.txt 2024-11-10 11:20:19.642389982 +0100
-@@ -42,4 +42,4 @@
- if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "")
- set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS})
- endif()
--install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
-+install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}")
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch b/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch
deleted file mode 100644
index e99b7e59cb5b..000000000000
--- a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/c10/CMakeLists.txt
-+++ b/c10/CMakeLists.txt
-@@ -162,7 +162,7 @@ if(NOT BUILD_LIBTORCHLESS)
- # 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
- # individual libraries like libc10.so and libcaffe2.so are still self-contained.
-- install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib)
-+ install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
- install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-23 18:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-30 11:13 [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-12-23 11:07 Alfredo Tupone
2023-01-04 14:02 Alfredo Tupone
2024-12-23 18:40 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox