From c9049e8b46a002a490eecdaf238b7026d1eb99b0 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Sun, 21 Jun 2026 06:29:00 -0700 Subject: [PATCH] Update to v2.12 Signed-off-by: Tom Rix --- .gitignore | 3 +++ python-torch.spec | 25 +++++++++++++------------ sources | 3 +++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 1fdd1be..f21a902 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ /MSLK-3d332d1.tar.gz /cpp-httplib-bd95e67.tar.gz /kineto-7a731b6.tar.gz +/kineto-b2103f7.tar.gz +/pytorch-v2.12.0.tar.gz +/v3.0.1.tar.gz diff --git a/python-torch.spec b/python-torch.spec index 879d843..195044e 100644 --- a/python-torch.spec +++ b/python-torch.spec @@ -15,10 +15,10 @@ %global miniz_version 3.0.2 %global pybind11_version 3.0.1 %else -%global pypi_version 2.11.0 +%global pypi_version 2.12.0 %global flatbuffers_version 24.12.23 %global miniz_version 3.0.2 -%global pybind11_version 2.13.6 +%global pybind11_version 3.0.1 %endif # For -test subpackage @@ -52,11 +52,7 @@ %if 0%{?fedora} %bcond_without eigen3 %bcond_without onnx -%if %{with gitcommit} %bcond_with protobuf -%else -%bcond_without protobuf -%endif %bcond_with setuptools %bcond_without sympy %else @@ -90,6 +86,13 @@ Patch2: 0001-Fix-struct.pack-polyfill-signature-mismatch-on-Pytho.patch %else Source0: %{forgeurl}/releases/download/v%{version}/pytorch-v%{version}.tar.gz + +Source1001: inject.py + +# Problems with python 3.15 +Patch1: 0001-Fix-functools.reduce-polyfill-signature-mismatch-on-.patch +Patch2: 0001-Fix-struct.pack-polyfill-signature-mismatch-on-Pytho.patch + %endif Source1: https://github.com/google/flatbuffers/archive/refs/tags/v%{flatbuffers_version}.tar.gz Source2: https://github.com/pybind/pybind11/archive/refs/tags/v%{pybind11_version}.tar.gz @@ -120,7 +123,7 @@ Source70: https://github.com/yhirose/cpp-httplib/archive/%{hl_commit}/cpp- %if %{with gitcommit} %global ki_commit b2103f78d13fde4937af010c0ef8e24313568bc5 %else -%global ki_commit 7a731b6ae01cfc2b1fc75d83a91f84e682e43fd7 +%global ki_commit b2103f78d13fde4937af010c0ef8e24313568bc5 %endif %global ki_scommit %(c=%{ki_commit}; echo ${c:0:7}) Source80: https://github.com/pytorch/kineto/archive/%{ki_commit}/kineto-%{ki_scommit}.tar.gz @@ -230,9 +233,7 @@ BuildRequires: ninja-build %endif %if %{with rocm} -%if %{with gitcommit} BuildRequires: amdsmi-devel -%endif BuildRequires: hipblas-devel BuildRequires: hipblaslt-devel BuildRequires: hipcub-devel @@ -329,6 +330,9 @@ Requires: python3-%{pypi_name}%{?_isa} = %{version}-%{release} # Overwrite with a git checkout of the pyproject.toml cp %{SOURCE1000} . +%else +%autosetup -p1 -n pytorch-v%{version} + # to fix handling of environment variable # comment out broken sed -i -e 's@include(cmake/EnvVarForwarding.cmake)@#include(cmake/EnvVarForwarding.cmake)@' CMakeLists.txt @@ -344,9 +348,6 @@ sed -i -e 's@setuptools>=70.1.0,<82@setuptools@' pyproject.toml sed -i -e 's@setuptools>=70.1.0,<82@setuptools@' requirements-build.txt sed -i -e 's@setuptools<82@setuptools@' setup.py -%else -%autosetup -p1 -n pytorch-v%{version} - # GitHub release tarballs identify the version as an alpha, so replace that echo "%{pypi_version}" > version.txt diff --git a/sources b/sources index bff0700..29a2107 100644 --- a/sources +++ b/sources @@ -24,3 +24,6 @@ SHA512 (pytorch-v2.11.0.tar.gz) = e67d68245a19e65737c19f97b6d4ddd72051303abb17a7 SHA512 (MSLK-3d332d1.tar.gz) = f6bd99ec7a79321692c088e622dd2ea8f1355b137014b33e75cb7ff83922fdd07ebacf5920e2e343a48fccd74315c11861ac5c2fff29e2f2481875ecb1ae57cf SHA512 (cpp-httplib-bd95e67.tar.gz) = 17c7b1d1a3750b85ebfefcc31a2fe2cb538373b140a31058d5003a018601bbde96e82bd73b99708856c0ebecd910ac4aee5420b829cb444e3aac3ee5764dcff7 SHA512 (kineto-7a731b6.tar.gz) = f15347cdb210b887c1c9c9e9d91556f48b5b3fc662dce0bfa6086bce38673c568f0fc385cdd1b16a742cc709d4db5798a18c6400f24bd57f6a1b4a2eaf303d47 +SHA512 (kineto-b2103f7.tar.gz) = 27d9f6a8b27434e83d26ed182df1fecec1d02fc26906995e44155562a730f998f527aad3d6c8a37212255c5e2f86a607a9648edf62861f56eb2ea512c4452908 +SHA512 (pytorch-v2.12.0.tar.gz) = 00f900945c3a7dc33fe61ece65341d7995c13f6134b714bc246f43b06f7d091b5952e8cb3febda6931cb769c96189e6b646c179ea59601ead834fb007f0788f2 +SHA512 (v3.0.1.tar.gz) = c17e6d6a78c38e760864b390ac2aa7df6a94ca53acb2e8be71f0d63d611b738fa20a16946c98a93fbfcad56cb0346ebf247bbe41c6f5171c6ce68397b1e5c4db