Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions recipe/patches/0001-Use-Intel-LLVM-openmp.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,70 @@
From c2837ae768bdeece91fa274aaed996682ed08470 Mon Sep 17 00:00:00 2001
From cb18d362243bd7838c91360c15359d18c581063f Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Mon, 22 Sep 2025 09:48:20 -0500
Subject: [PATCH 11/16] remove `DESTINATION lib` from CMake `install(TARGETS`
directives

Suggested-By: Silvio Traversaro <[email protected]>
---
c10/CMakeLists.txt | 2 +-
c10/cuda/CMakeLists.txt | 2 +-
c10/hip/CMakeLists.txt | 2 +-
c10/xpu/CMakeLists.txt | 2 +-
torch/lib/libshm_windows/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
index 8e9d267352d..6c4a4472325 100644
--- a/c10/CMakeLists.txt
+++ b/c10/CMakeLists.txt
@@ -164,7 +164,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)
endif()

install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt
index 2604f677858..dcad42167ea 100644
--- a/c10/cuda/CMakeLists.txt
+++ b/c10/cuda/CMakeLists.txt
@@ -83,7 +83,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_cuda EXPORT Caffe2Targets DESTINATION lib)
+install(TARGETS c10_cuda EXPORT Caffe2Targets)

endif()

diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt
index ef24471dba8..a410383de27 100644
--- a/c10/hip/CMakeLists.txt
+++ b/c10/hip/CMakeLists.txt
@@ -56,7 +56,7 @@ if(NOT BUILD_LIBTORCHLESS)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
$<INSTALL_INTERFACE:include>)
- install(TARGETS c10_hip EXPORT Caffe2Targets DESTINATION lib)
+ install(TARGETS c10_hip EXPORT Caffe2Targets)
set(C10_HIP_LIB c10_hip)
endif()

diff --git a/c10/xpu/CMakeLists.txt b/c10/xpu/CMakeLists.txt
index 95b9f031c3e..f1ce6d1ad14 100644
--- a/c10/xpu/CMakeLists.txt
+++ b/c10/xpu/CMakeLists.txt
@@ -46,7 +46,7 @@ if(NOT BUILD_LIBTORCHLESS)
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
$<INSTALL_INTERFACE:include>
)
- install(TARGETS c10_xpu EXPORT Caffe2Targets DESTINATION lib)
+ install(TARGETS c10_xpu EXPORT Caffe2Targets)
set(C10_XPU_LIB c10_xpu)
add_subdirectory(test)
endif()
diff --git a/torch/lib/libshm_windows/CMakeLists.txt b/torch/lib/libshm_windows/CMakeLists.txt
index df2a1064938..5fa15e6be31 100644
--- a/torch/lib/libshm_windows/CMakeLists.txt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,76 +1,20 @@
From 477688d3ceb627e7e807221c4a1b6fd0ec815faa Mon Sep 17 00:00:00 2001
From 2fada2d3742c171290fbf1450552581595ca344e Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Thu, 30 Jan 2025 08:33:44 +1100
Subject: [PATCH 12/16] avoid deprecated `find_package(CUDA)` in caffe2 CMake
metadata

vendor the not-available-anymore function torch_cuda_get_nvcc_gencode_flag from CMake
---
c10/CMakeLists.txt | 2 +-
c10/cuda/CMakeLists.txt | 2 +-
c10/hip/CMakeLists.txt | 2 +-
c10/xpu/CMakeLists.txt | 2 +-
caffe2/CMakeLists.txt | 32 +++++-----
cmake/Summary.cmake | 10 +--
cmake/TorchConfig.cmake.in | 2 +-
cmake/public/cuda.cmake | 48 ++++----------
cmake/public/utils.cmake | 127 +++++++++++++++++++++++++++++++++++++
setup.py | 2 +-
torch/CMakeLists.txt | 2 +-
11 files changed, 167 insertions(+), 64 deletions(-)
7 files changed, 163 insertions(+), 60 deletions(-)

diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt
index 8e9d267352d..6c4a4472325 100644
--- a/c10/CMakeLists.txt
+++ b/c10/CMakeLists.txt
@@ -164,7 +164,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)
endif()

install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt
index 2604f677858..dcad42167ea 100644
--- a/c10/cuda/CMakeLists.txt
+++ b/c10/cuda/CMakeLists.txt
@@ -83,7 +83,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_cuda EXPORT Caffe2Targets DESTINATION lib)
+install(TARGETS c10_cuda EXPORT Caffe2Targets)

endif()

diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt
index ef24471dba8..a410383de27 100644
--- a/c10/hip/CMakeLists.txt
+++ b/c10/hip/CMakeLists.txt
@@ -56,7 +56,7 @@ if(NOT BUILD_LIBTORCHLESS)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
$<INSTALL_INTERFACE:include>)
- install(TARGETS c10_hip EXPORT Caffe2Targets DESTINATION lib)
+ install(TARGETS c10_hip EXPORT Caffe2Targets)
set(C10_HIP_LIB c10_hip)
endif()

diff --git a/c10/xpu/CMakeLists.txt b/c10/xpu/CMakeLists.txt
index 95b9f031c3e..f1ce6d1ad14 100644
--- a/c10/xpu/CMakeLists.txt
+++ b/c10/xpu/CMakeLists.txt
@@ -46,7 +46,7 @@ if(NOT BUILD_LIBTORCHLESS)
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
$<INSTALL_INTERFACE:include>
)
- install(TARGETS c10_xpu EXPORT Caffe2Targets DESTINATION lib)
+ install(TARGETS c10_xpu EXPORT Caffe2Targets)
set(C10_XPU_LIB c10_xpu)
add_subdirectory(test)
endif()
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
index d1ce24e37fe..8116b5fb5ec 100644
--- a/caffe2/CMakeLists.txt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e1f2c1eb5490a024f214668d2a6882808759f091 Mon Sep 17 00:00:00 2001
From e0e5a5bf75e7033268ece4627d2f30556c31bc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]>
Date: Thu, 6 Mar 2025 13:57:25 +0100
Subject: [PATCH 13/16] Fix CUPTI lookup to include target directory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 38099ab31b62a7f38732968f5735394ec980104d Mon Sep 17 00:00:00 2001
From 3f81c54f3a2cf04043ef58be18937b386ee5813c Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Sat, 14 Jun 2025 07:34:48 +1100
Subject: [PATCH 14/16] skip test_norm_matrix_degenerate_shapes on numpy >=2.3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ab12a47eebf5619da216df6017b0c5c8ba9723dd Mon Sep 17 00:00:00 2001
From 9e76c28a86de96ff9b01195a12c3c0511a57809e Mon Sep 17 00:00:00 2001
From: LWisteria <[email protected]>
Date: Sun, 2 Jun 2024 19:13:23 +0900
Subject: [PATCH 15/16] Define PY_SSIZE_T_CLEAN before #include <Python.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1746e268155425a00e28caa398c0badb883c8906 Mon Sep 17 00:00:00 2001
From e8097cac6ac090e85864fbef466b93aa4db9428a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Mon, 22 Sep 2025 09:50:38 -0500
Subject: [PATCH 16/16] Save PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE if
Expand All @@ -18,9 +18,9 @@ index 577505fd5a4..2c4a665921d 100644
#ifdef PYBIND11_COMPILER_TYPE
- SET_STR_DEFINE(PYBIND11_COMPILER_TYPE);
+ #ifdef PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE
+ ASSERT_TRUE(set_module_attr("_PYBIND11_COMPILER_TYPE", THPUtils_packString(PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE PYBIND11_COMPILER_TYPE)));
+ ASSERT_TRUE(set_module_attr("_PYBIND11_COMPILER_TYPE", THPUtils_packString(PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE PYBIND11_COMPILER_TYPE)))
+ #else
+ ASSERT_TRUE(set_module_attr("_PYBIND11_COMPILER_TYPE", THPUtils_packString(PYBIND11_COMPILER_TYPE)));
+ ASSERT_TRUE(set_module_attr("_PYBIND11_COMPILER_TYPE", THPUtils_packString(PYBIND11_COMPILER_TYPE)))
+ #endif
#else
ASSERT_TRUE(
Expand Down
Loading