Skip to content

Commit 3d74218

Browse files
authored
Merge pull request #2784 from ROCm/develop_IFU_20251104
[AUTOGENERATED] develop_IFU_20251104
2 parents 56002f4 + b4c1e1e commit 3d74218

File tree

994 files changed

+24885
-8968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

994 files changed

+24885
-8968
lines changed

.bc-linter.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ exclude:
1313
- "**/benchmarks/**"
1414
- "**/test_*.py"
1515
- "**/*_test.py"
16+
- "tools/**"

.ci/docker/build.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,16 @@ case "$tag" in
195195
NINJA_VERSION=1.9.0
196196
TRITON=yes
197197
;;
198-
pytorch-linux-jammy-xpu-n-py3)
198+
pytorch-linux-jammy-xpu-n-py3 | pytorch-linux-jammy-xpu-n-py3-inductor-benchmarks)
199199
ANACONDA_PYTHON_VERSION=3.10
200200
GCC_VERSION=11
201201
VISION=yes
202202
XPU_VERSION=2025.2
203203
NINJA_VERSION=1.9.0
204204
TRITON=yes
205+
if [[ $tag =~ "benchmarks" ]]; then
206+
INDUCTOR_BENCHMARKS=yes
207+
fi
205208
;;
206209
pytorch-linux-jammy-py3-gcc11-inductor-benchmarks)
207210
ANACONDA_PYTHON_VERSION=3.10

.ci/docker/common/install_acl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
set -eux
55

6-
ACL_VERSION=${ACL_VERSION:-"v25.02"}
6+
ACL_VERSION=${ACL_VERSION:-"v52.6.0"}
77
ACL_INSTALL_DIR="/acl"
88

99
# Clone ACL

.ci/docker/common/install_conda.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,20 @@ if [ -n "$ANACONDA_PYTHON_VERSION" ]; then
4949
export SYSROOT_DEP="sysroot_linux-64=2.17"
5050
fi
5151

52+
# Install correct Python version
53+
# Also ensure sysroot is using a modern GLIBC to match system compilers
54+
if [ "$ANACONDA_PYTHON_VERSION" = "3.14" ]; then
55+
as_jenkins conda create -n py_$ANACONDA_PYTHON_VERSION -y\
56+
python="3.14.0" \
57+
${SYSROOT_DEP} \
58+
-c conda-forge
59+
else
5260
# Install correct Python version
5361
# Also ensure sysroot is using a modern GLIBC to match system compilers
5462
as_jenkins conda create -n py_$ANACONDA_PYTHON_VERSION -y\
5563
python="$ANACONDA_PYTHON_VERSION" \
5664
${SYSROOT_DEP}
57-
65+
fi
5866
# libstdcxx from conda default channels are too old, we need GLIBCXX_3.4.30
5967
# which is provided in libstdcxx 12 and up.
6068
conda_install libstdcxx-ng=12.3.0 --update-deps -c conda-forge

.ci/docker/common/install_rocm.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ EOF
4040

4141
# Default url values
4242
rocm_baseurl="http://repo.radeon.com/rocm/apt/${ROCM_VERSION}"
43-
amdgpu_baseurl="https://repo.radeon.com/amdgpu/${ROCM_VERSION}/ubuntu"
44-
45-
# Add amdgpu repository
4643
UBUNTU_VERSION_NAME=`cat /etc/os-release | grep UBUNTU_CODENAME | awk -F= '{print $2}'`
47-
echo "deb [arch=amd64] ${amdgpu_baseurl} ${UBUNTU_VERSION_NAME} main" > /etc/apt/sources.list.d/amdgpu.list
4844

4945
# Add rocm repository
5046
wget -qO - http://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -

.ci/docker/common/install_rocm_magma.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ function do_install() {
1212

1313
rocm_version_nodot=${rocm_version//./}
1414

15-
# https://github.com/icl-utk-edu/magma/pull/65
16-
MAGMA_VERSION=d6e4117bc88e73f06d26c6c2e14f064e8fc3d1ec
15+
# post merge of https://github.com/icl-utk-edu/magma/pull/65
16+
MAGMA_VERSION=c0792ae825fb36872784892ea643dd6f3456bc5f
1717
magma_archive="magma-rocm${rocm_version_nodot}-${MAGMA_VERSION}-1.tar.bz2"
1818

1919
rocm_dir="/opt/rocm"

.ci/docker/manywheel/Dockerfile_2_28

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ FROM cpu_final as rocm_final
149149
ARG ROCM_VERSION=6.0
150150
ARG PYTORCH_ROCM_ARCH
151151
ENV PYTORCH_ROCM_ARCH ${PYTORCH_ROCM_ARCH}
152-
ARG DEVTOOLSET_VERSION=11
152+
ARG DEVTOOLSET_VERSION=13
153153
ENV LDFLAGS="-Wl,-rpath=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib64 -Wl,-rpath=/opt/rh/gcc-toolset-${DEVTOOLSET_VERSION}/root/usr/lib"
154154
# Somewhere in ROCm stack, we still use non-existing /opt/rocm/hip path,
155155
# below workaround helps avoid error

.ci/docker/manywheel/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ case ${image} in
9797
manylinux2_28-builder:xpu)
9898
TARGET=xpu_final
9999
GPU_IMAGE=amd64/almalinux:8
100-
DOCKER_GPU_BUILD_ARG=" --build-arg DEVTOOLSET_VERSION=11"
100+
DOCKER_GPU_BUILD_ARG=" --build-arg DEVTOOLSET_VERSION=13"
101101
MANY_LINUX_VERSION="2_28"
102102
;;
103103
*)

.ci/docker/requirements-ci.txt

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,11 @@ numba==0.61.2 ; python_version > "3.9"
136136
#test_nn.py, test_namedtensor.py, test_linalg.py, test_jit_cuda_fuser.py,
137137
#test_jit.py, test_indexing.py, test_datapipe.py, test_dataloader.py,
138138
#test_binary_ufuncs.py
139-
numpy==2.0.2 ; python_version == "3.9"
140-
numpy==2.1.2 ; python_version > "3.9"
139+
numpy==2.1.2; python_version > "3.9" and python_version < "3.14"
140+
numpy==2.3.4; python_version >= "3.14"
141141

142-
pandas==2.2.3
142+
pandas==2.2.3; python_version >= "3.9" and python_version < "3.14"
143+
pandas==2.3.3; python_version >= "3.14"
143144

144145
#onnxruntime
145146
#Description: scoring engine for Open Neural Network Exchange (ONNX) models
@@ -151,7 +152,8 @@ opt-einsum==3.3
151152
#Pinned versions: 3.3
152153
#test that import: test_linalg.py
153154

154-
optree==0.13.0
155+
optree==0.13.0 ; python_version < "3.14"
156+
optree==0.17.0 ; python_version >= "3.14"
155157
#Description: A library for tree manipulation
156158
#Pinned versions: 0.13.0
157159
#test that import: test_vmap.py, test_aotdispatch.py, test_dynamic_shapes.py,
@@ -249,8 +251,8 @@ scikit-image==0.22.0
249251
#Pinned versions: 0.20.3
250252
#test that import:
251253

252-
scipy==1.13.1 ; python_version == "3.9"
253-
scipy==1.14.1 ; python_version > "3.9"
254+
scipy==1.14.1 ; python_version > "3.9" and python_version < "3.14"
255+
scipy==1.16.2 ; python_version >= "3.14"
254256
# Pin SciPy because of failing distribution tests (see #60347)
255257
#Description: scientific python
256258
#Pinned versions: 1.10.1
@@ -321,7 +323,8 @@ pywavelets==1.7.0 ; python_version >= "3.12"
321323
#Pinned versions: 1.4.1
322324
#test that import:
323325

324-
lxml==5.3.0
326+
lxml==5.3.0 ; python_version < "3.14"
327+
lxml==6.0.2 ; python_version >= "3.14"
325328
#Description: This is a requirement of unittest-xml-reporting
326329

327330
PyGithub==2.3.0
@@ -331,7 +334,9 @@ sympy==1.13.3
331334
#Pinned versions:
332335
#test that import:
333336

334-
onnx==1.19.1
337+
onnx==1.19.1 ; python_version < "3.14"
338+
# Unpin once Python 3.14 is supported. See onnxruntime issue 26309.
339+
onnx==1.18.0 ; python_version == "3.14"
335340
#Description: Required by onnx tests, and mypy and test_public_bindings.py when checking torch.onnx._internal
336341
#Pinned versions:
337342
#test that import:
@@ -356,7 +361,7 @@ pwlf==2.2.1
356361
#test that import: test_sac_estimator.py
357362

358363
# To build PyTorch itself
359-
pyyaml==6.0.2
364+
pyyaml==6.0.3
360365
pyzstd
361366
setuptools==78.1.1
362367
packaging==23.1

.ci/docker/ubuntu-xpu/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,15 @@ ENV OPENSSL_DIR /opt/openssl
5454
RUN rm install_openssl.sh
5555

5656
ARG INDUCTOR_BENCHMARKS
57+
ARG ANACONDA_PYTHON_VERSION
58+
ENV ANACONDA_PYTHON_VERSION=$ANACONDA_PYTHON_VERSION
5759
COPY ./common/install_inductor_benchmark_deps.sh install_inductor_benchmark_deps.sh
5860
COPY ./common/common_utils.sh common_utils.sh
5961
COPY ci_commit_pins/huggingface-requirements.txt huggingface-requirements.txt
6062
COPY ci_commit_pins/timm.txt timm.txt
63+
COPY ci_commit_pins/torchbench.txt torchbench.txt
6164
RUN if [ -n "${INDUCTOR_BENCHMARKS}" ]; then bash ./install_inductor_benchmark_deps.sh; fi
62-
RUN rm install_inductor_benchmark_deps.sh common_utils.sh timm.txt huggingface-requirements.txt
65+
RUN rm install_inductor_benchmark_deps.sh common_utils.sh timm.txt huggingface-requirements.txt torchbench.txt
6366

6467
# Install XPU Dependencies
6568
ARG XPU_VERSION

0 commit comments

Comments
 (0)