Update to 2.9.0-rc4

Work around ROCm 7 build issue in 2.8.0

Signed-off-by: Tom Rix <Tom.Rix@amd.com>
This commit is contained in:
Tom Rix 2025-09-30 07:35:43 -07:00
commit f29cac5d83
3 changed files with 30 additions and 6 deletions

1
.gitignore vendored
View file

@ -26,3 +26,4 @@
/kineto-5e75018.tar.gz
/pytorch-v2.8.0.tar.gz
/v1.18.0.tar.gz
/pytorch-715dca6.tar.gz

View file

@ -4,13 +4,13 @@
%global forgeurl https://github.com/pytorch/pytorch
# So pre releases can be tried
%bcond_with gitcommit
%bcond_without gitcommit
%if %{with gitcommit}
# v2.8.0-rc8
%global commit0 a1cb3cc05d46d198467bebbb6e8fba50a325d4e7
# v2.9.0-rc4
%global commit0 715dca672526a20322d07c2e67772cfe4400a20f
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global date0 20250723
%global pypi_version 2.8.0
%global date0 20250923
%global pypi_version 2.9.0
%global flatbuffers_version 24.12.23
%global miniz_version 3.0.2
%global pybind11_version 2.13.6
@ -108,11 +108,13 @@ Source80: https://github.com/pytorch/kineto/archive/%{ki_commit}/kineto-%{
Source90: https://github.com/onnx/onnx/archive/refs/tags/v%{ox_ver}.tar.gz
%endif
%if %{with gitcommit}
%else
# https://github.com/pytorch/pytorch/issues/150187
Patch11: 0001-Add-cmake-variable-USE_ROCM_CK.patch
# https://github.com/pytorch/pytorch/issues/156595
# Patch12: 0001-Use-horrible-dynamo-stub.patch
Patch12: 0001-Fix-compilation-and-import-torch-issues-for-cpython-.patch
%endif
ExclusiveArch: x86_64 aarch64
%global toolchain gcc
@ -200,6 +202,10 @@ BuildRequires: rocm-smi-devel
BuildRequires: rocthrust-devel
BuildRequires: roctracer-devel
%if %{with gitcommit}
BuildRequires: moodycamel-concurrentqueue-devel
%endif
Requires: amdsmi
%endif
@ -492,6 +498,13 @@ sed -i -e 's@HIP 1.0@HIP MODULE@' cmake/public/LoadHIP.cmake
# silence an assert
# sed -i -e '/qvalue = std::clamp(qvalue, qmin, qmax);/d' aten/src/ATen/native/cuda/IndexKernel.cu
%endif
%if %{with gitcommit}
# moodycamel include path needs adjusting to use the system's
sed -i -e 's@${PROJECT_SOURCE_DIR}/third_party/concurrentqueue@/usr/include/concurrentqueue@' cmake/Dependencies.cmake
%endif
%build
@ -607,7 +620,14 @@ export BUILD_TEST=ON
%if %{with rocm}
export USE_ROCM=ON
%if %{with gitcommit}
export USE_ROCM_CK_SDPA=OFF
export USE_ROCM_CK_GEMM=OFF
export USE_FBGEMM_GENAI=OFF
%else
export USE_ROCM_CK=OFF
%endif
# Magma is broken on ROCm 7
# export USE_MAGMA=ON
export HIP_PATH=`hipconfig -p`
@ -662,7 +682,9 @@ export PYTORCH_ROCM_ARCH=%{rocm_gpu_list_default}
%license LICENSE
%doc README.md
%{_bindir}/torchrun
%if %{without gitcommit}
%{_bindir}/torchfrtrace
%endif
%{python3_sitearch}/%{pypi_name}*
%{python3_sitearch}/functorch

View file

@ -12,3 +12,4 @@ SHA512 (v24.12.23.tar.gz) = f97762ba41b9cfef648e93932fd789324c6bb6ebc5b7aeca8185
SHA512 (kineto-5e75018.tar.gz) = 921b96a56e01d69895b79e67582d8977ed6f873573ab41557c5d026ada5d1f6365e4ed0a0c6804057c52e92510749fc58619f554a164c1ba9d8cd13e789bebd0
SHA512 (pytorch-v2.8.0.tar.gz) = 791e658eab87fb957f025558cb9f925078d2426ab7b6f60771d9841dfb691f67d905ba1330a800008efe7c938b6c69bdc52232bccfe8d4860e795a532cd69d28
SHA512 (v1.18.0.tar.gz) = 2f38664947c8d1efc40620a7c1b1953d2aa4b0a37b67c4886b86e77c1d697363c26413413ddda8eabc545892fb1bcb43afc7e93e62f0901527524a2727e1ea8d
SHA512 (pytorch-715dca6.tar.gz) = 09c9aae54fab3eb17901fc3226fece1c13f41cb8e45a2cb066021823abeb8d27c340993088e01d8e55bb37ed5f94334ec31e6c539cddfacbad157abd27c5e907