misc/py-pytorch: update 2.2.2 → 2.3.1

2 files changed, 16 insertions, 16 deletions

diff --git a/misc/py-pytorch/files/patch-CMakeLists.txt b/misc/py-pytorch/files/patch-CMakeLists.txt
index 1dce2402724a..3fddac84c520 100644
--- a/misc/py-pytorch/files/patch-CMakeLists.txt
+++ b/misc/py-pytorch/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2024-01-31 00:58:01 UTC
+--- CMakeLists.txt.orig	2024-06-05 19:17:56 UTC
 +++ CMakeLists.txt
-@@ -145,7 +145,7 @@ set(CPU_INTEL OFF)
+@@ -148,7 +148,7 @@ set(CPU_INTEL OFF)
  set(CPU_AARCH64 OFF)
  set(CPU_INTEL OFF)
  
@@ -9,7 +9,7 @@
    set(CPU_INTEL ON)
  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
    set(CPU_AARCH64 ON)
-@@ -170,7 +170,7 @@ option(BUILD_DOCS "Build Caffe2 documentation" OFF)
+@@ -173,7 +173,7 @@ option(BUILD_DOCS "Build Caffe2 documentation" OFF)
  option(ATEN_NO_TEST "Do not build ATen test binaries" OFF)
  option(BUILD_BINARY "Build C++ binaries" OFF)
  option(BUILD_DOCS "Build Caffe2 documentation" OFF)
@@ -18,7 +18,7 @@
  option(BUILD_PYTHON "Build Python binaries" ON)
  option(BUILD_CAFFE2 "Master flag to build Caffe2" OFF)
  option(BUILD_LITE_INTERPRETER "Master flag to build Lite Interpreter" OFF)
-@@ -224,7 +224,7 @@ option(USE_LEVELDB "Use LEVELDB" OFF)
+@@ -226,7 +226,7 @@ option(USE_LEVELDB "Use LEVELDB" OFF)
  option(USE_GFLAGS "Use GFLAGS" OFF)
  option(USE_GLOG "Use GLOG" OFF)
  option(USE_LEVELDB "Use LEVELDB" OFF)
@@ -27,7 +27,7 @@
  option(USE_LMDB "Use LMDB" OFF)
  option(USE_MAGMA "Use MAGMA" ON)
  option(USE_METAL "Use Metal for Caffe2 iOS build" ON)
-@@ -405,15 +405,15 @@ option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo
+@@ -409,15 +409,15 @@ option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo
  # USE_SYSTEM_LIBS being "OFF".
  option(USE_SYSTEM_LIBS "Use all available system-provided libraries." OFF)
  option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo." OFF)
diff --git a/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt b/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt
index 059eaaedadcf..cb63845b4f12 100644
--- a/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt
+++ b/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt
@@ -1,25 +1,25 @@
---- third_party/cpuinfo/CMakeLists.txt.orig	2023-10-16 12:32:17 UTC
+--- third_party/cpuinfo/CMakeLists.txt.orig	2024-06-05 19:17:57 UTC
 +++ third_party/cpuinfo/CMakeLists.txt
-@@ -77,7 +77,7 @@ IF(NOT CMAKE_SYSTEM_PROCESSOR)
+@@ -92,7 +92,7 @@ IF(NOT CMAKE_SYSTEM_PROCESSOR)
        "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
      SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
    ENDIF()
--ELSEIF(NOT CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?|armv[5-8].*|aarch64|arm64|ARM64)$")
-+ELSEIF(NOT CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|amd64|x86(_64)?|armv[5-8].*|aarch64|arm64|ARM64)$")
+-ELSEIF(NOT CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?|armv[5-8].*|aarch64|arm64.*|ARM64.*)$")
++ELSEIF(NOT CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|amd64|x86(_64)?|armv[5-8].*|aarch64|arm64.*|ARM64.*)$")
    MESSAGE(WARNING
      "Target processor architecture \"${CPUINFO_TARGET_PROCESSOR}\" is not supported in cpuinfo. "
      "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
-@@ -89,7 +89,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
+@@ -105,7 +105,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
        "Target operating system is not specified. "
        "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
    SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
 -ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android)$")
 +ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|FreeBSD|Android)$")
-   IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS")
+   IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
      MESSAGE(WARNING
        "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
-@@ -135,7 +135,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
-   src/cache.c)
+@@ -158,7 +158,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
+ SET(CPUINFO_SRCS src/api.c src/cache.c src/init.c src/log.c)
  
  IF(CPUINFO_SUPPORTED_PLATFORM)
 -  IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten" AND (CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$" OR IOS_ARCH MATCHES "^(i386|x86_64)$"))
@@ -27,7 +27,7 @@
      LIST(APPEND CPUINFO_SRCS
        src/x86/init.c
        src/x86/info.c
-@@ -341,7 +341,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_T
+@@ -354,7 +354,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_T
  # ---[ cpuinfo mock library and mock tests
  IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS)
    SET(CPUINFO_MOCK_SRCS "${CPUINFO_SRCS}")
@@ -36,7 +36,7 @@
      LIST(APPEND CPUINFO_MOCK_SRCS src/x86/mockcpuid.c)
    ENDIF()
    IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
-@@ -785,7 +785,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_T
+@@ -798,7 +798,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_T
      ADD_TEST(NAME get-current-test COMMAND get-current-test)
    ENDIF()
  
@@ -45,7 +45,7 @@
      ADD_EXECUTABLE(brand-string-test test/name/brand-string.cc)
      CPUINFO_TARGET_ENABLE_CXX11(brand-string-test)
      CPUINFO_TARGET_RUNTIME_LIBRARY(brand-string-test)
-@@ -852,7 +852,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS)
+@@ -865,7 +865,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS)
      CPUINFO_TARGET_RUNTIME_LIBRARY(cpuinfo-dump)
    ENDIF()