diff --git a/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml index d40b28664..bcd858613 100644 --- a/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml @@ -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 diff --git a/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml index 7b9807d3d..6c4383220 100644 --- a/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implgenericchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml @@ -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 diff --git a/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml index 5a2789cb0..b1b0463b9 100644 --- a/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml @@ -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 diff --git a/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml index bc4b8536e..79d794dee 100644 --- a/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implmklchannel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml @@ -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 diff --git a/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml b/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml index 4ced13c0c..674fc3f96 100644 --- a/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml +++ b/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_version12.9is_rcFalse.yaml @@ -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 diff --git a/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml index ab055fd93..8b50274b2 100644 --- a/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/linux_aarch64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml @@ -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 diff --git a/.ci_support/migrations/pybind11_abi11.yaml b/.ci_support/migrations/pybind11_abi11.yaml new file mode 100644 index 000000000..172a6d909 --- /dev/null +++ b/.ci_support/migrations/pybind11_abi11.yaml @@ -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' diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml deleted file mode 100644 index f9389e3bf..000000000 --- a/.ci_support/migrations/python313.yaml +++ /dev/null @@ -1,46 +0,0 @@ -migrator_ts: 1724712607 -__migrator: - commit_message: Rebuild for python 3.13 - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython - - 3.12.* *_cpython - - 3.13.* *_cp313 # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: true - pr_limit: 20 - max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - # see https://github.com/conda-forge/scipy-feedstock/pull/283 - - scipy - exclude_pinned_pkgs: false - additional_zip_keys: - - channel_sources - -python: -- 3.13.* *_cp313 -channel_sources: -- conda-forge/label/python_rc,conda-forge -# additional entries to add for zip_keys -numpy: -- 2 -python_impl: -- cpython diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml index 857838f84..6a261c60e 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml index de9018054..fd4b836cb 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml index 5bba5f950..ed2eb0411 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml index 859260c71..c2aebcc12 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml index 3e623646c..80e1c74f3 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml index 350780dae..ce5df28b0 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml index 8815158fb..f8042468c 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml index df79ec36e..b4e290a23 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml @@ -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: diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml index 7e73b7e4e..0e3a07740 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.10.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml index 422a958a1..3efccb3f6 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.11.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml index 379f91631..f641fe0a8 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.12.____cpython.yaml @@ -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: diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml index 03d74c791..3f6d92349 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsepython3.13.____cp313.yaml @@ -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: diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_version12.8is_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_version12.8is_rcFalse.yaml index c9eb93c86..e6d243508 100644 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_version12.8is_rcFalse.yaml +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_version12.8is_rcFalse.yaml @@ -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 diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml index c000d0a0d..776c00bc8 100644 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compiler_versionNoneis_rcFalse.yaml @@ -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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b98c86b05..d80a18991 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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 @@ -62,9 +62,11 @@ source: # 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 for v2.9 + - 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 diff --git a/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch b/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch index f3ee248a4..d27a34b5f 100644 --- a/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch +++ b/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch @@ -1,17 +1,17 @@ -From c7b809486c9401ea5a9abaaf598803c88a9d7da5 Mon Sep 17 00:00:00 2001 +From a1a8d7846e5429edbb4a7a401c94b03353f79dd2 Mon Sep 17 00:00:00 2001 From: Mark Harfouche 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() @@ -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) diff --git a/recipe/patches/0002-Help-find-numpy.patch b/recipe/patches/0002-Help-find-numpy.patch index 414301333..4ef888f62 100644 --- a/recipe/patches/0002-Help-find-numpy.patch +++ b/recipe/patches/0002-Help-find-numpy.patch @@ -1,17 +1,17 @@ -From dbafa6c2e900de35d5d4b2633bf80669dde3c9d6 Mon Sep 17 00:00:00 2001 +From 43bfd47a72b43c941ab08cf9918355903667cafd Mon Sep 17 00:00:00 2001 From: Mark Harfouche 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) diff --git a/recipe/patches/0003-Fix-duplicate-linker-script.patch b/recipe/patches/0003-Fix-duplicate-linker-script.patch index 7ab3c08c3..f020dae8f 100644 --- a/recipe/patches/0003-Fix-duplicate-linker-script.patch +++ b/recipe/patches/0003-Fix-duplicate-linker-script.patch @@ -1,17 +1,17 @@ -From c244e05d6bbef0b34777ec15ff98ae69bcc5db86 Mon Sep 17 00:00:00 2001 +From 2235da4dcb8b8eb6c194022acb00fb4e498b5fc4 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee 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") diff --git a/recipe/patches/0004-Allow-overriding-CUDA-related-paths.patch b/recipe/patches/0004-Allow-overriding-CUDA-related-paths.patch index 9f7f6c074..f82de263c 100644 --- a/recipe/patches/0004-Allow-overriding-CUDA-related-paths.patch +++ b/recipe/patches/0004-Allow-overriding-CUDA-related-paths.patch @@ -1,7 +1,7 @@ -From 45c8ecafa220144796b462cab59e9457e893bf05 Mon Sep 17 00:00:00 2001 +From 1f82a3aad28929bc066378bbf9fae047ca56f812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 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 +- @@ -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 diff --git a/recipe/patches/0005-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch b/recipe/patches/0005-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch index 3d4d000e4..2ac7aa8ed 100644 --- a/recipe/patches/0005-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch +++ b/recipe/patches/0005-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch @@ -1,7 +1,7 @@ -From 9e6e570d3cd3b068ce06885b78ce54e26bd6928f Mon Sep 17 00:00:00 2001 +From cef87d60aa35c9a577d5e7568c61167442b51dac Mon Sep 17 00:00:00 2001 From: Isuru Fernando 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 @@ -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") diff --git a/recipe/patches/0006-fix-issue-142484.patch b/recipe/patches/0006-fix-issue-142484.patch index 48b8ba408..ac77f92c2 100644 --- a/recipe/patches/0006-fix-issue-142484.patch +++ b/recipe/patches/0006-fix-issue-142484.patch @@ -1,7 +1,7 @@ -From 93fb01e3ef83d8deefc717c771aa9d3fd905da3e Mon Sep 17 00:00:00 2001 +From 0d0db18630d53cc1b3320731a0b36857c1c3086f Mon Sep 17 00:00:00 2001 From: "Zheng, Zhaoqiong" 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 --- @@ -9,7 +9,7 @@ From https://github.com/pytorch/pytorch/pull/143894 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, diff --git a/recipe/patches/0007-Fix-FindOpenBLAS.patch b/recipe/patches/0007-Fix-FindOpenBLAS.patch index 50f5a4a3d..d33b2020e 100644 --- a/recipe/patches/0007-Fix-FindOpenBLAS.patch +++ b/recipe/patches/0007-Fix-FindOpenBLAS.patch @@ -1,14 +1,14 @@ -From 1a2259bd3d5e0820122721c9b31f04979c87ea3d Mon Sep 17 00:00:00 2001 +From 8e44204dd062a862cc586a0e8ffa8d930a239605 Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Thu, 16 May 2024 10:46:49 +0200 -Subject: [PATCH 07/17] Fix FindOpenBLAS +Subject: [PATCH 07/16] Fix FindOpenBLAS --- cmake/Modules/FindOpenBLAS.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/FindOpenBLAS.cmake b/cmake/Modules/FindOpenBLAS.cmake -index 69d8227aea5..0d12185c799 100644 +index 9ba86ba1ee0..19e1d508aa5 100644 --- a/cmake/Modules/FindOpenBLAS.cmake +++ b/cmake/Modules/FindOpenBLAS.cmake @@ -31,22 +31,25 @@ SET(Open_BLAS_LIB_SEARCH_PATHS diff --git a/recipe/patches/0008-point-include-paths-to-PREFIX-include.patch b/recipe/patches/0008-point-include-paths-to-PREFIX-include.patch index 8e8640638..626695fc8 100644 --- a/recipe/patches/0008-point-include-paths-to-PREFIX-include.patch +++ b/recipe/patches/0008-point-include-paths-to-PREFIX-include.patch @@ -1,17 +1,17 @@ -From c0da591c99f601fc2c5cc2b1c50b6d51052c8e5e Mon Sep 17 00:00:00 2001 +From dc6088e13b52af5f98fd8a039e598ac44c3a79b6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 22:58:14 +1100 -Subject: [PATCH 08/17] point include paths to $PREFIX/include +Subject: [PATCH 08/16] point include paths to $PREFIX/include --- torch/utils/cpp_extension.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py -index 82c23c2c9fe..baec1969ac0 100644 +index 7fa5237994e..8a1bd5da3de 100644 --- a/torch/utils/cpp_extension.py +++ b/torch/utils/cpp_extension.py -@@ -1437,10 +1437,28 @@ def include_paths(device_type: str = "cpu") -> list[str]: +@@ -1495,10 +1495,28 @@ def include_paths(device_type: str = "cpu") -> list[str]: A list of include path strings. """ lib_include = os.path.join(_TORCH_PATH, 'include') diff --git a/recipe/patches/0009-Add-conda-prefix-to-inductor-include-paths.patch b/recipe/patches/0009-Add-conda-prefix-to-inductor-include-paths.patch index 5e14eb3de..040b19a13 100644 --- a/recipe/patches/0009-Add-conda-prefix-to-inductor-include-paths.patch +++ b/recipe/patches/0009-Add-conda-prefix-to-inductor-include-paths.patch @@ -1,7 +1,7 @@ -From 28ae8ad0c497050f6ca371a58eddc2fc1798b9bb Mon Sep 17 00:00:00 2001 +From 25eaafa608bdd76cb77ef75533f151b9c07bec6e Mon Sep 17 00:00:00 2001 From: Daniel Petry Date: Tue, 21 Jan 2025 17:45:23 -0600 -Subject: [PATCH 09/17] Add conda prefix to inductor include paths +Subject: [PATCH 09/16] Add conda prefix to inductor include paths Currently inductor doesn't look in conda's includes and libs. This results in errors when it tries to compile, if system versions are being used of @@ -14,10 +14,10 @@ end user provides a _compile_flags.json file. 1 file changed, 1 insertion(+) diff --git a/torch/_inductor/cpp_builder.py b/torch/_inductor/cpp_builder.py -index 9f5f8072687..564dd860b77 100644 +index d0a646c1de8..7468f2787d9 100644 --- a/torch/_inductor/cpp_builder.py +++ b/torch/_inductor/cpp_builder.py -@@ -1074,6 +1074,7 @@ def get_cpp_torch_options( +@@ -1136,6 +1136,7 @@ def get_cpp_torch_options( + python_include_dirs + torch_include_dirs + omp_include_dir_paths diff --git a/recipe/patches/0010-make-ATEN_INCLUDE_DIR-relative-to-TORCH_INSTALL_PREF.patch b/recipe/patches/0010-make-ATEN_INCLUDE_DIR-relative-to-TORCH_INSTALL_PREF.patch index fc911b371..ced061fb5 100644 --- a/recipe/patches/0010-make-ATEN_INCLUDE_DIR-relative-to-TORCH_INSTALL_PREF.patch +++ b/recipe/patches/0010-make-ATEN_INCLUDE_DIR-relative-to-TORCH_INSTALL_PREF.patch @@ -1,7 +1,7 @@ -From c05d9e91805271410026fff8b9d6969d5d8d86fa Mon Sep 17 00:00:00 2001 +From 3c941c12a413a0e8242645d71afc99a2c2fa4e62 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 28 Jan 2025 14:15:34 +1100 -Subject: [PATCH 10/17] make ATEN_INCLUDE_DIR relative to TORCH_INSTALL_PREFIX +Subject: [PATCH 10/16] make ATEN_INCLUDE_DIR relative to TORCH_INSTALL_PREFIX we cannot set CMAKE_INSTALL_PREFIX without the pytorch build complaining, but we can use TORCH_INSTALL_PREFIX, which is set correctly relative to our CMake files already: @@ -11,10 +11,10 @@ https://github.com/pytorch/pytorch/blob/v2.5.1/cmake/TorchConfig.cmake.in#L47 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt -index 085af373ec2..39a12f83d40 100644 +index c9cfd74b501..0ccb7b1d2e5 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt -@@ -659,7 +659,7 @@ if(USE_ROCM) +@@ -696,7 +696,7 @@ if(USE_ROCM) # list(APPEND ATen_HIP_DEPENDENCY_LIBS ATEN_CUDA_FILES_GEN_LIB) endif() diff --git a/recipe/patches/0011-remove-DESTINATION-lib-from-CMake-install-TARGETS-di.patch b/recipe/patches/0011-remove-DESTINATION-lib-from-CMake-install-TARGETS-di.patch index ffd0aacf7..7317de7b2 100644 --- a/recipe/patches/0011-remove-DESTINATION-lib-from-CMake-install-TARGETS-di.patch +++ b/recipe/patches/0011-remove-DESTINATION-lib-from-CMake-install-TARGETS-di.patch @@ -1,7 +1,7 @@ -From b3cbb135f98bdb7de641bf355486f79fbb3e9b72 Mon Sep 17 00:00:00 2001 +From 7aaaf31b2e336d8328ea4b30180ed95f47c80ea7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 28 Jan 2025 10:58:29 +1100 -Subject: [PATCH 11/17] remove `DESTINATION lib` from CMake `install(TARGETS` +Subject: [PATCH 11/16] remove `DESTINATION lib` from CMake `install(TARGETS` directives Suggested-By: Silvio Traversaro @@ -16,10 +16,10 @@ Suggested-By: Silvio Traversaro 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/c10/CMakeLists.txt b/c10/CMakeLists.txt -index 34577caef2e..8f00b3d8cb1 100644 +index 8e9d267352d..6c4a4472325 100644 --- a/c10/CMakeLists.txt +++ b/c10/CMakeLists.txt -@@ -163,7 +163,7 @@ if(NOT BUILD_LIBTORCHLESS) +@@ -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. @@ -29,10 +29,10 @@ index 34577caef2e..8f00b3d8cb1 100644 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt -index 3327dab4779..9336c9e8f77 100644 +index 2604f677858..dcad42167ea 100644 --- a/c10/cuda/CMakeLists.txt +++ b/c10/cuda/CMakeLists.txt -@@ -82,7 +82,7 @@ if(NOT BUILD_LIBTORCHLESS) +@@ -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. @@ -42,10 +42,10 @@ index 3327dab4779..9336c9e8f77 100644 endif() diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt -index f153030e793..514c6d29266 100644 +index ef24471dba8..a410383de27 100644 --- a/c10/hip/CMakeLists.txt +++ b/c10/hip/CMakeLists.txt -@@ -55,7 +55,7 @@ if(NOT BUILD_LIBTORCHLESS) +@@ -56,7 +56,7 @@ if(NOT BUILD_LIBTORCHLESS) $ $ $) @@ -55,10 +55,10 @@ index f153030e793..514c6d29266 100644 endif() diff --git a/c10/xpu/CMakeLists.txt b/c10/xpu/CMakeLists.txt -index 01f77d61713..437ade657f9 100644 +index 95b9f031c3e..f1ce6d1ad14 100644 --- a/c10/xpu/CMakeLists.txt +++ b/c10/xpu/CMakeLists.txt -@@ -45,7 +45,7 @@ if(NOT BUILD_LIBTORCHLESS) +@@ -46,7 +46,7 @@ if(NOT BUILD_LIBTORCHLESS) $ $ ) @@ -68,10 +68,10 @@ index 01f77d61713..437ade657f9 100644 add_subdirectory(test) endif() diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index d2d23b7ab65..512e4ba3a81 100644 +index d1ce24e37fe..1f929e7b8b3 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt -@@ -557,7 +557,7 @@ if(USE_CUDA) +@@ -562,7 +562,7 @@ if(USE_CUDA) endif() target_link_libraries(caffe2_nvrtc PRIVATE caffe2::nvrtc ${DELAY_LOAD_FLAGS}) @@ -80,7 +80,7 @@ index d2d23b7ab65..512e4ba3a81 100644 if(USE_NCCL) list(APPEND Caffe2_GPU_SRCS ${TORCH_SRC_DIR}/csrc/cuda/nccl.cpp) -@@ -628,7 +628,7 @@ if(USE_ROCM) +@@ -636,7 +636,7 @@ if(USE_ROCM) target_link_libraries(caffe2_nvrtc hip::amdhip64 hiprtc::hiprtc) target_include_directories(caffe2_nvrtc PRIVATE ${CMAKE_BINARY_DIR}) target_compile_definitions(caffe2_nvrtc PRIVATE USE_ROCM __HIP_PLATFORM_AMD__) @@ -89,7 +89,7 @@ index d2d23b7ab65..512e4ba3a81 100644 endif() if(NOT NO_API AND NOT BUILD_LITE_INTERPRETER) -@@ -1035,7 +1035,7 @@ elseif(USE_CUDA) +@@ -1098,7 +1098,7 @@ elseif(USE_CUDA) CUDA::culibos ${CMAKE_DL_LIBS}) endif() set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/../aten/src/ATen/native/cuda/LinearAlgebraStubs.cpp PROPERTIES COMPILE_FLAGS "-DBUILD_LAZY_CUDA_LINALG") @@ -98,7 +98,7 @@ index d2d23b7ab65..512e4ba3a81 100644 endif() if(USE_PRECOMPILED_HEADERS) -@@ -1536,17 +1536,17 @@ endif() +@@ -1584,17 +1584,17 @@ endif() caffe2_interface_library(torch torch_library) @@ -121,9 +121,9 @@ index d2d23b7ab65..512e4ba3a81 100644 target_link_libraries(torch PUBLIC torch_cpu_library) -@@ -1685,7 +1685,7 @@ if(BUILD_SHARED_LIBS) - target_link_libraries(torch_global_deps torch::nvtoolsext) - endif() +@@ -1726,7 +1726,7 @@ if(BUILD_SHARED_LIBS) + target_link_libraries(torch_global_deps ${Caffe2_PUBLIC_CUDA_DEPENDENCY_LIBS}) + target_link_libraries(torch_global_deps torch::cudart) endif() - install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}") + install(TARGETS torch_global_deps) @@ -131,10 +131,10 @@ index d2d23b7ab65..512e4ba3a81 100644 # ---[ Caffe2 HIP sources. diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt -index 8b8ebdc6e97..7e84d4e29af 100644 +index 3985cf50c14..bcb90bfc672 100644 --- a/torch/CMakeLists.txt +++ b/torch/CMakeLists.txt -@@ -464,7 +464,7 @@ if(NOT TORCH_PYTHON_LINK_FLAGS STREQUAL "") +@@ -463,7 +463,7 @@ if(NOT TORCH_PYTHON_LINK_FLAGS STREQUAL "") set_target_properties(torch_python PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) endif() diff --git a/recipe/patches/0012-avoid-deprecated-find_package-CUDA-in-caffe2-CMake-m.patch b/recipe/patches/0012-avoid-deprecated-find_package-CUDA-in-caffe2-CMake-m.patch index 5c08e13e0..da402fe76 100644 --- a/recipe/patches/0012-avoid-deprecated-find_package-CUDA-in-caffe2-CMake-m.patch +++ b/recipe/patches/0012-avoid-deprecated-find_package-CUDA-in-caffe2-CMake-m.patch @@ -1,7 +1,7 @@ -From 4d94092be5f26d1df1257c9629172fe6c62e19fc Mon Sep 17 00:00:00 2001 +From 16dcf6330d44c4127aa6aa2e93a27fb0fbe45187 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 30 Jan 2025 08:33:44 +1100 -Subject: [PATCH 12/17] avoid deprecated `find_package(CUDA)` in caffe2 CMake +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 @@ -15,10 +15,10 @@ vendor the not-available-anymore function torch_cuda_get_nvcc_gencode_flag from 6 files changed, 153 insertions(+), 50 deletions(-) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 512e4ba3a81..7def8ba0311 100644 +index 1f929e7b8b3..8116b5fb5ec 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt -@@ -937,25 +937,25 @@ if(USE_ROCM) +@@ -948,25 +948,25 @@ if(USE_ROCM) "$<$:ATen/core/ATen_pch.h>") endif() elseif(USE_CUDA) @@ -49,7 +49,7 @@ index 512e4ba3a81..7def8ba0311 100644 torch_compile_options(torch_cuda) # see cmake/public/utils.cmake target_compile_definitions(torch_cuda PRIVATE USE_CUDA) -@@ -1013,12 +1013,12 @@ elseif(USE_CUDA) +@@ -1076,12 +1076,12 @@ elseif(USE_CUDA) torch_cuda ) if($ENV{ATEN_STATIC_CUDA}) @@ -65,7 +65,7 @@ index 512e4ba3a81..7def8ba0311 100644 CUDA::cusolver_static ${CUDAToolkit_LIBRARY_DIR}/libcusolver_lapack_static.a # needed for libcusolver_static diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake -index b46560e123b..f815f43237d 100644 +index c33269c0a28..ac200e24ca0 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -76,7 +76,7 @@ function(caffe2_print_configuration_summary) @@ -103,7 +103,7 @@ index b46560e123b..f815f43237d 100644 if(${USE_TENSORRT}) message(STATUS " TensorRT runtime library: ${TENSORRT_LIBRARY}") diff --git a/cmake/TorchConfig.cmake.in b/cmake/TorchConfig.cmake.in -index 855edd35081..83bf98679cd 100644 +index 8a5587cad27..90c03147817 100644 --- a/cmake/TorchConfig.cmake.in +++ b/cmake/TorchConfig.cmake.in @@ -130,7 +130,7 @@ if(@USE_CUDA@) @@ -113,10 +113,10 @@ index 855edd35081..83bf98679cd 100644 - set(TORCH_CUDA_LIBRARIES ${CUDA_NVRTC_LIB}) + set(TORCH_CUDA_LIBRARIES CUDA::nvrtc) endif() - if(TARGET torch::nvtoolsext) - list(APPEND TORCH_CUDA_LIBRARIES torch::nvtoolsext) + + if(@BUILD_SHARED_LIBS@) diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index c66d32b115c..e538fb5662b 100644 +index ca888bb9db2..ef4119d8a00 100644 --- a/cmake/public/cuda.cmake +++ b/cmake/public/cuda.cmake @@ -26,8 +26,8 @@ if(NOT MSVC) @@ -215,7 +215,7 @@ index c66d32b115c..e538fb5662b 100644 execute_process( COMMAND Python::Interpreter -c diff --git a/cmake/public/utils.cmake b/cmake/public/utils.cmake -index 781a4e6819f..0585942fe36 100644 +index d56dd74d6c0..9f59b40d612 100644 --- a/cmake/public/utils.cmake +++ b/cmake/public/utils.cmake @@ -306,6 +306,133 @@ macro(torch_hip_get_arch_list store_var) @@ -353,10 +353,10 @@ index 781a4e6819f..0585942fe36 100644 # Get the XPU arch flags specified by TORCH_XPU_ARCH_LIST. # Usage: diff --git a/setup.py b/setup.py -index 4fa1c3ed5c5..5757c800136 100644 +index 7f88ade34bf..3b3a3ab46fa 100644 --- a/setup.py +++ b/setup.py -@@ -647,7 +647,7 @@ class build_ext(setuptools.command.build_ext.build_ext): +@@ -695,7 +695,7 @@ class build_ext(setuptools.command.build_ext.build_ext): else: report("-- Not using cuDNN") if cmake_cache_vars["USE_CUDA"]: diff --git a/recipe/patches/0013-Fix-CUPTI-lookup-to-include-target-directory.patch b/recipe/patches/0013-Fix-CUPTI-lookup-to-include-target-directory.patch index 9ebaeef5a..2dd68cdf9 100644 --- a/recipe/patches/0013-Fix-CUPTI-lookup-to-include-target-directory.patch +++ b/recipe/patches/0013-Fix-CUPTI-lookup-to-include-target-directory.patch @@ -1,17 +1,17 @@ -From 77d7e436f012413bb61c000c750f461b03f6696b Mon Sep 17 00:00:00 2001 +From 026235cf0b87533ac6611e4fd1c2143586c92b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 6 Mar 2025 13:57:25 +0100 -Subject: [PATCH 13/17] Fix CUPTI lookup to include target directory +Subject: [PATCH 13/16] Fix CUPTI lookup to include target directory --- cmake/Dependencies.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index 9886a284d4e..8c60f9d1204 100644 +index 1dee5889d34..11577a2c0dc 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake -@@ -1666,6 +1666,7 @@ if(USE_KINETO) +@@ -1637,6 +1637,7 @@ if(USE_KINETO) endif() find_library(CUPTI_LIBRARY_PATH ${CUPTI_LIB_NAME} PATHS @@ -19,7 +19,7 @@ index 9886a284d4e..8c60f9d1204 100644 ${CUDA_SOURCE_DIR} ${CUDA_SOURCE_DIR}/extras/CUPTI/lib64 ${CUDA_SOURCE_DIR}/lib -@@ -1673,6 +1674,7 @@ if(USE_KINETO) +@@ -1644,6 +1645,7 @@ if(USE_KINETO) NO_DEFAULT_PATH) find_path(CUPTI_INCLUDE_DIR cupti.h PATHS diff --git a/recipe/patches/0016-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch b/recipe/patches/0014-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch similarity index 76% rename from recipe/patches/0016-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch rename to recipe/patches/0014-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch index 9ef5457b0..0023e8b09 100644 --- a/recipe/patches/0016-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch +++ b/recipe/patches/0014-skip-test_norm_matrix_degenerate_shapes-on-numpy-2.3.patch @@ -1,17 +1,17 @@ -From 2e509a92b1d1a5f40de6d9a7e84f384f82b9bfdb Mon Sep 17 00:00:00 2001 +From 806894ff3fb3dcc60e8115fcd8116f7f42cb5901 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 14 Jun 2025 07:34:48 +1100 -Subject: [PATCH 16/17] skip test_norm_matrix_degenerate_shapes on numpy >=2.3 +Subject: [PATCH 14/16] skip test_norm_matrix_degenerate_shapes on numpy >=2.3 --- test/test_linalg.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_linalg.py b/test/test_linalg.py -index 8ac5a198861..2371ebcbf0a 100644 +index 108a5f59007..5381635b395 100644 --- a/test/test_linalg.py +++ b/test/test_linalg.py -@@ -1866,6 +1866,7 @@ class TestLinalg(TestCase): +@@ -2042,6 +2042,7 @@ class TestLinalg(TestCase): # Test degenerate shape results match numpy for linalg.norm matrix norms @skipCUDAIfNoMagma @skipCPUIfNoLapack diff --git a/recipe/patches/0017-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch b/recipe/patches/0015-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch similarity index 81% rename from recipe/patches/0017-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch rename to recipe/patches/0015-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch index 24450a30d..7300e0539 100644 --- a/recipe/patches/0017-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch +++ b/recipe/patches/0015-Define-PY_SSIZE_T_CLEAN-before-include-Python.h.patch @@ -1,7 +1,7 @@ -From 1cf62e3df7e6a08523935caa0c1a4caf95d6b0c9 Mon Sep 17 00:00:00 2001 +From f83ae6f63a2c3fad1a3cf78d0366f15d00406115 Mon Sep 17 00:00:00 2001 From: LWisteria Date: Sun, 2 Jun 2024 19:13:23 +0900 -Subject: [PATCH 17/17] Define PY_SSIZE_T_CLEAN before #include +Subject: [PATCH 15/16] Define PY_SSIZE_T_CLEAN before #include See https://docs.python.org/3/c-api/intro.html#include-files --- diff --git a/recipe/patches/0016-Save-PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE-if-pr.patch b/recipe/patches/0016-Save-PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE-if-pr.patch new file mode 100644 index 000000000..59a7fb4a9 --- /dev/null +++ b/recipe/patches/0016-Save-PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE-if-pr.patch @@ -0,0 +1,27 @@ +From b9a33b7e6ee869c844408266cfe290fd9a720074 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Mon, 22 Sep 2025 09:50:38 -0500 +Subject: [PATCH 16/16] Save PYBIND11_COMPILER_TYPE_LEADING_UNDERSCORE if + present + +--- + torch/csrc/Module.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/torch/csrc/Module.cpp b/torch/csrc/Module.cpp +index 577505fd5a4..7e645b3975b 100644 +--- a/torch/csrc/Module.cpp ++++ b/torch/csrc/Module.cpp +@@ -2416,7 +2416,11 @@ Call this whenever a new thread is created in order to propagate values from + ASSERT_TRUE(set_module_attr("_" #name, THPUtils_packString(name))) + + #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))); ++ #else ++ ASSERT_TRUE(set_module_attr("_PYBIND11_COMPILER_TYPE", THPUtils_packString(PYBIND11_COMPILER_TYPE))); ++ #endif + #else + ASSERT_TRUE( + set_module_attr("_" C10_STRINGIZE(PYBIND11_COMPILER_TYPE), Py_None));