Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/pybind11_abi11.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for pybind11 3 and pybind11_abi 11
kind: version
migration_number: 1
migrator_ts: 1752454025.946169
pybind11_abi:
- '11'
46 changes: 0 additions & 46 deletions .ci_support/migrations/python313.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.11.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.12.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.13.* *_cp313
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.11.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.12.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.13.* *_cp313
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.11.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.12.* *_cpython
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.13.* *_cp313
pytorch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
pybind11_abi:
- '4'
- '11'
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
Expand Down
10 changes: 6 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# if you wish to build release candidate number X, append the version string with ".rcX"
{% set version = "2.8.0" %}
{% set build = 0 %}
{% set build = 1 %}

# Use a higher build number for the CUDA variant, to ensure that it's
# preferred by conda's solver, and it's preferentially
Expand Down Expand Up @@ -57,14 +57,16 @@ source:
- patches/0008-point-include-paths-to-PREFIX-include.patch
- patches/0009-Add-conda-prefix-to-inductor-include-paths.patch
- patches/0010-make-ATEN_INCLUDE_DIR-relative-to-TORCH_INSTALL_PREF.patch
- patches/0011-remove-DESTINATION-lib-from-CMake-install-TARGETS-di.patch # [win]
- patches/0011-remove-DESTINATION-lib-from-CMake-install-TARGETS.patch # [win]
- patches/0012-avoid-deprecated-find_package-CUDA-in-caffe2-CMake-m.patch
# backport https://github.com/pytorch/pytorch/pull/148668
- patches/0013-Fix-CUPTI-lookup-to-include-target-directory.patch
# skip a test that fails with numpy 2.3; can be dropped for pytorch>2.7
- patches/0016-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch
- patches/0014-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch
# backport https://github.com/pytorch/pytorch/pull/127702
- patches/0017-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch
- patches/0015-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch
# Remove once v2.19 is in
- patches/0016-Save-PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE-if-pr.patch
- patches_submodules/fbgemm/0001-remove-DESTINATION-lib-from-CMake-install-directives.patch # [win]
- patches_submodules/tensorpipe/0001-switch-away-from-find_package-CUDA.patch

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From c7b809486c9401ea5a9abaaf598803c88a9d7da5 Mon Sep 17 00:00:00 2001
From 06cded81b27b8cb69397406335076e26dd6484b6 Mon Sep 17 00:00:00 2001
From: Mark Harfouche <[email protected]>
Date: Sun, 1 Sep 2024 17:35:40 -0400
Subject: [PATCH 01/17] Force usage of python 3 and error without numpy
Subject: [PATCH 01/16] Force usage of python 3 and error without numpy

---
cmake/Dependencies.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 5227204b041..47917899943 100644
index a93386c27f8..96988e89d09 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -871,9 +871,9 @@ if(BUILD_PYTHON)
@@ -819,9 +819,9 @@ if(BUILD_PYTHON)
if(USE_NUMPY)
list(APPEND PYTHON_COMPONENTS NumPy)
endif()
Expand All @@ -23,7 +23,7 @@ index 5227204b041..47917899943 100644
endif()

if(NOT Python_Interpreter_FOUND)
@@ -890,7 +890,7 @@ if(BUILD_PYTHON)
@@ -838,7 +838,7 @@ if(BUILD_PYTHON)
if(Python_Development.Module_FOUND)
if(USE_NUMPY)
if(NOT Python_NumPy_FOUND)
Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0002-Help-find-numpy.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From dbafa6c2e900de35d5d4b2633bf80669dde3c9d6 Mon Sep 17 00:00:00 2001
From 58feee2ca68a7192008ed732064ba89a02190db7 Mon Sep 17 00:00:00 2001
From: Mark Harfouche <[email protected]>
Date: Tue, 1 Oct 2024 00:28:40 -0400
Subject: [PATCH 02/17] Help find numpy
Subject: [PATCH 02/16] Help find numpy

---
tools/setup_helpers/cmake.py | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
index ad0d0fb014b..73495989fa0 100644
index 678ba7ab207..92052f9bc5c 100644
--- a/tools/setup_helpers/cmake.py
+++ b/tools/setup_helpers/cmake.py
@@ -305,9 +305,15 @@ class CMake:
@@ -313,9 +313,15 @@ class CMake:
sys.exit(1)
build_options.update(cmake__options)

Expand Down
8 changes: 4 additions & 4 deletions recipe/patches/0003-Fix-duplicate-linker-script.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From c244e05d6bbef0b34777ec15ff98ae69bcc5db86 Mon Sep 17 00:00:00 2001
From ef2ba4a066dd68555ac787887270b2d2522ff44e Mon Sep 17 00:00:00 2001
From: Jeongseok Lee <[email protected]>
Date: Sun, 3 Nov 2024 01:12:36 -0700
Subject: [PATCH 03/17] Fix duplicate linker script
Subject: [PATCH 03/16] Fix duplicate linker script

---
setup.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 61ee9363fc2..4fa1c3ed5c5 100644
index b4ebc92f592..7f88ade34bf 100644
--- a/setup.py
+++ b/setup.py
@@ -1146,7 +1146,9 @@ def main():
@@ -1198,7 +1198,9 @@ def main():
filein="cmake/prioritized_text.txt", fout="cmake/linker_script.ld"
)
linker_script_path = os.path.abspath("cmake/linker_script.ld")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 45c8ecafa220144796b462cab59e9457e893bf05 Mon Sep 17 00:00:00 2001
From bf1ae2655e65ea27d7c6bcd2265f63da51515634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]>
Date: Wed, 27 Nov 2024 13:47:23 +0100
Subject: [PATCH 04/17] Allow overriding CUDA-related paths
Subject: [PATCH 04/16] Allow overriding CUDA-related paths

---
cmake/Modules/FindCUDAToolkit.cmake | 2 +-
Expand All @@ -22,10 +22,10 @@ index ec9ae530aa6..b7c0bd9fc51 100644
set(CUDAToolkit_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_LIBRARY_ROOT}")
set(CUDAToolkit_VERSION "${CMAKE_CUDA_COMPILER_TOOLKIT_VERSION}")
diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
index 73495989fa0..e9cb1f9ae35 100644
index 92052f9bc5c..bd2a8db5b3b 100644
--- a/tools/setup_helpers/cmake.py
+++ b/tools/setup_helpers/cmake.py
@@ -252,7 +252,7 @@ class CMake:
@@ -254,7 +254,7 @@ class CMake:
true_var = additional_options.get(var)
if true_var is not None:
build_options[true_var] = val
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9e6e570d3cd3b068ce06885b78ce54e26bd6928f Mon Sep 17 00:00:00 2001
From 0396e1e3efac3e1fa55f5f1e250e5c8399251e4a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Wed, 18 Dec 2024 03:59:00 +0000
Subject: [PATCH 05/17] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds
Subject: [PATCH 05/16] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds

There are two calling conventions for *dotu functions

Expand Down Expand Up @@ -31,7 +31,7 @@ functional calls.
1 file changed, 2 insertions(+)

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 47917899943..9886a284d4e 100644
index 96988e89d09..1dee5889d34 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -182,6 +182,7 @@ elseif(BLAS STREQUAL "OpenBLAS")
Expand Down
6 changes: 3 additions & 3 deletions recipe/patches/0006-fix-issue-142484.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 93fb01e3ef83d8deefc717c771aa9d3fd905da3e Mon Sep 17 00:00:00 2001
From 1c69a5b1e23a0c48a4b75171a9539af7e8318961 Mon Sep 17 00:00:00 2001
From: "Zheng, Zhaoqiong" <[email protected]>
Date: Fri, 27 Dec 2024 13:49:36 +0800
Subject: [PATCH 06/17] fix issue 142484
Subject: [PATCH 06/16] fix issue 142484

From https://github.com/pytorch/pytorch/pull/143894
---
aten/src/ATen/native/mkl/SpectralOps.cpp | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/aten/src/ATen/native/mkl/SpectralOps.cpp b/aten/src/ATen/native/mkl/SpectralOps.cpp
index 8deefaade89..7304044b3eb 100644
index 636e94e20f6..6e52871e8e0 100644
--- a/aten/src/ATen/native/mkl/SpectralOps.cpp
+++ b/aten/src/ATen/native/mkl/SpectralOps.cpp
@@ -478,7 +478,17 @@ static Tensor& _exec_fft(Tensor& out, const Tensor& self, IntArrayRef out_sizes,
Expand Down
Loading
Loading