From 2f3d92b7c5b36d8afb0846f4af6871bcb7a7fc1d Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Fri, 25 Apr 2025 12:39:04 -0700 Subject: [PATCH] Update to 2.7.0 Signed-off-by: Tom Rix --- .gitignore | 2 ++ python-torch.spec | 37 +++++++++++-------------------------- sources | 8 +++----- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index cdf142f..25abff5 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /pytorch-v2.4.1.tar.gz /pytorch-v2.5.0.tar.gz /pytorch-v2.5.1.tar.gz +/pytorch-v2.7.0.tar.gz +/v2.13.6.tar.gz diff --git a/python-torch.spec b/python-torch.spec index 5a9f08f..bc15924 100644 --- a/python-torch.spec +++ b/python-torch.spec @@ -15,10 +15,10 @@ %global miniz_version 3.0.2 %global pybind11_version 2.13.6 %else -%global pypi_version 2.5.1 +%global pypi_version 2.7.0 %global flatbuffers_version 23.3.3 -%global miniz_version 2.1.0 -%global pybind11_version 2.11.1 +%global miniz_version 3.0.2 +%global pybind11_version 2.13.6 %endif # For -test subpackage @@ -98,19 +98,20 @@ Source80: https://github.com/pytorch/kineto/archive/%{ki_commit}/kineto-%{ %endif %if %{without gitcommit} -Patch11: 0001-Improve-finding-and-using-the-rocm_version.h.patch +# Patch11: 0001-Improve-finding-and-using-the-rocm_version.h.patch # ROCm patches # Patches need to be refactored for ToT # These are ROCm packages -Patch101: 0001-cuda-hip-signatures.patch -%else +# Patch101: 0001-cuda-hip-signatures.patch + # https://github.com/pytorch/pytorch/issues/150187 # The hack job # Patch11: 0001-python-torch-disable-ck.patch # Cleaned up hack job Patch11: 0001-Add-cmake-varaible-USE_ROCM_CK.patch +%else %endif ExclusiveArch: x86_64 aarch64 @@ -260,10 +261,6 @@ Requires: python3-%{pypi_name}%{?_isa} = %{version}-%{release} # Overwrite with a git checkout of the pyproject.toml cp %{SOURCE1000} . -# https://github.com/pytorch/pytorch/issues/149803 -# Tries to checkout nccl -sed -i -e 's@ checkout_nccl()@# checkout_nccl()@' tools/build_pytorch_libs.py - %else %autosetup -p1 -n pytorch-v%{version} %endif @@ -342,12 +339,10 @@ sed -i -e 's@HIP_CLANG_FLAGS -fno-gpu-rdc@HIP_CLANG_FLAGS -fno-gpu-rdc -parallel # No third_party fmt, use system sed -i -e 's@fmt::fmt-header-only@fmt@' CMakeLists.txt -%if %{with gitcommit} sed -i -e 's@fmt::fmt-header-only@fmt@' aten/src/ATen/CMakeLists.txt sed -i -e 's@list(APPEND ATen_HIP_INCLUDE $)@@' aten/src/ATen/CMakeLists.txt sed -i -e 's@fmt::fmt-header-only@fmt@' third_party/kineto/libkineto/CMakeLists.txt -%endif sed -i -e 's@fmt::fmt-header-only@fmt@' c10/CMakeLists.txt sed -i -e 's@fmt::fmt-header-only@fmt@' torch/CMakeLists.txt sed -i -e 's@fmt::fmt-header-only@fmt@' cmake/Dependencies.cmake @@ -361,6 +356,10 @@ sed -i -e 's@list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)@#list(APPE sed -i -e 's@if(NOT TARGET fxdiv)@if(MSVC AND USE_XNNPACK)@' caffe2/CMakeLists.txt sed -i -e 's@TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)@#TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv)@' caffe2/CMakeLists.txt +# https://github.com/pytorch/pytorch/issues/149803 +# Tries to checkout nccl +sed -i -e 's@ checkout_nccl()@# checkout_nccl()@' tools/build_pytorch_libs.py + # Disable the use of check_submodule's in the setup.py, we are a tarball, not a git repo sed -i -e 's@check_submodules()$@#check_submodules()@' setup.py @@ -453,13 +452,11 @@ sed -i -e 's@cmake_minimum_required(VERSION 3.4)@cmake_minimum_required(VERSION ./tools/amd_build/build_amd.py # Fedora installs to /usr/include, not /usr/include/rocm-core sed -i -e 's@rocm-core/rocm_version.h@rocm_version.h@' aten/src/ATen/hip/tunable/TunableGemm.h -%if %{with gitcommit} # https://github.com/pytorch/pytorch/issues/149805 sed -i -e 's@rocm-core/rocm_version.h@rocm_version.h@' cmake/public/LoadHIP.cmake # Fedora installs to /usr/include, not /usr/include/rocm-core sed -i -e 's@rocm-core/rocm_version.h@rocm_version.h@' aten/src/ATen/hip/tunable/Tunable.cpp sed -i -e 's@rocm-core/rocm_version.h@rocm_version.h@' aten/src/ATen/cuda/tunable/Tunable.cpp -%endif # use any hip, correct CMAKE_MODULE_PATH sed -i -e 's@lib/cmake/hip@lib64/cmake/hip@' cmake/public/LoadHIP.cmake sed -i -e 's@HIP 1.0@HIP MODULE@' cmake/public/LoadHIP.cmake @@ -538,22 +535,14 @@ export USE_SYSTEM_ONNX=ON export USE_SYSTEM_PYBIND11=OFF export USE_SYSTEM_LIBS=OFF export USE_TENSORPIPE=OFF -%if %{with gitcommit} export USE_XNNPACK=OFF -%else -export USE_XNNPACK=ON -%endif export USE_XPU=OFF export USE_SYSTEM_PTHREADPOOL=ON export USE_SYSTEM_CPUINFO=ON export USE_SYSTEM_FP16=ON export USE_SYSTEM_FXDIV=ON export USE_SYSTEM_PSIMD=ON -%if %{with gitcommit} export USE_SYSTEM_XNNPACK=OFF -%else -export USE_SYSTEM_XNNPACK=ON -%endif export USE_DISTRIBUTED=ON %if %{with tensorpipe} @@ -634,10 +623,6 @@ export PYTORCH_ROCM_ARCH=%{rocm_gpu_list_default} %files -n python3-%{pypi_name} %license LICENSE %doc README.md -%if %{without gitcommit} -%{_bindir}/convert-caffe2-to-onnx -%{_bindir}/convert-onnx-to-caffe2 -%endif %{_bindir}/torchrun %{_bindir}/torchfrtrace %{python3_sitearch}/%{pypi_name} diff --git a/sources b/sources index aa1ed3c..4021d40 100644 --- a/sources +++ b/sources @@ -1,11 +1,9 @@ +SHA512 (pytorch-v2.7.0.tar.gz) = 17e875a66f1669901f5f770c9d829ba5bfa3967296cfb71550e8a92507181db742548eaf7cc9a2c478c4b91e366f27cc480e2e1bbb328db8501d30e1649839e6 SHA512 (v23.3.3.tar.gz) = 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 -SHA512 (v2.11.1.tar.gz) = ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95 +SHA512 (v2.13.6.tar.gz) = 497c25b33b09a9c42f67131ab82e35d689e8ce089dd7639be997305ff9a6d502447b79c824508c455d559e61f0186335b54dd2771d903a7c1621833930622d1a SHA512 (tensorpipe-52791a2.tar.gz) = 1e5faf17a7236c5506c08cb28be16069b11bb929bbca64ed9745ce4277d46739186ab7d6597da7437d90ed2d166d4c37ef2f3bceabe8083ef3adbb0e8e5f227e -SHA512 (libnop-910b558.tar.gz) = 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36 SHA512 (v1.41.0.tar.gz) = bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65 +SHA512 (libnop-910b558.tar.gz) = 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36 SHA512 (v1.14.2.tar.gz) = 97635bbaf6dd567c201451dfaf7815b2052fe50d9bccc97aade86cfa4a92651374d167296a5453031b2681dc302806a289bca011a9e79ddc381a17d6118971d7 SHA512 (cpp-httplib-3b6597b.tar.gz) = 8f1090658c498d04f14fec5c2f301847b1f3360bf92b18d82927643ee04ab61a6b274733a01c7850f9c030205120d674d1d961358d49fdd15636736fb8704f55 SHA512 (kineto-be13176.tar.gz) = 41a08c7da9eea7d12402f80a5550c9d4df79798719cc52b12a507828c8c896ba28a37c35d8adf809ca72589e1d84965d5ef6dd01f3f8dc1c803c5ed67b03a43a -SHA512 (pytorch-v2.4.1.tar.gz) = fc364112a88540035f213274b526b4c8ad9be335ff214161091e8a8d3efa89ebef5a5b4d33b20b5b659896d164dcbe739f0d7d2a293d3afc0efcfaa2bf62fc2c -SHA512 (pytorch-v2.5.0.tar.gz) = 6ccf1ac9f191f5bd757ef7fbfc1dcd81d591577f2d3df7313c6ed32790c592aaffd253e18dc778a2fcc707e4533299817dfdf9fae108636ce5c29c1b8ff8bba6 -SHA512 (pytorch-v2.5.1.tar.gz) = a8882608c2ab6467a58d60c6df84c9f1004b43eafeba57db499dbbfdecc09db2e221b9d4c344c8af7c0bea6252e874c400483502dca24a0b474c376b9fef1dd4