gentoo auto-resync : 04:01:2023 - 18:07:08

3 files changed, 28 insertions, 12 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 71f7c70de576..9693fbe8275f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 11de6a38dde1..fb4c810d548d 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,4 +1,4 @@
-AUX caffe2-1.11.0-gentoo.patch 5245 BLAKE2B 46f70234e3073a99297da4d56281a507a396f20592f05c45c1379b1b8f429bcfdd3ba00918f23da3ced4b30cb55cabe4af51a7d3bd3e21ddb2aaf53bf0e22b85 SHA512 ed331b74f126e675032adba5f7a5aa90dd55c8b94584896de99251d2abdf7c5738a9f5ad8a1907be808fe70750faf8e7d8d55d1807fa5b6708903f9c42e0ce88
+AUX caffe2-1.11.0-gentoo.patch 6098 BLAKE2B 5fbbfe3fbe4f0cf6c9e8e7ecb4b37355274294bf49aec3fe486bcba5b4724018f481c69b14f6027337b5eef9cea80d2138a8c1bd3eb69c3dd8ba29fcd466b3e3 SHA512 e04f2b2728ba26d241bf5d9bf05c07b3b9f96b5707e5f37dbcbee3bcfe13669133b2533e7cde10acdf3d9bad4a2fc3dd7227f45102915e061d635205831be3bd
 AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5
 AUX caffe2-1.12.0-install-dirs.patch 6145 BLAKE2B 80ffd3cde9d25951156b1f8b476f19925ec408236c1a9f59205841d82a596fe3de75f896b8d554e091f7b23bf1090a4f7c19d39d5b60924127031da9958ad89c SHA512 37e3e1927a8ada047cee16d4d850433f028ffbe8feaccb91ad329c3ecc7b0a13fe43005e612023f5f90f094e5ed6080c9315d2b63418b118504c0904f4e81c03
 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
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)