Skip to content

Commit 01bf1d3

Browse files
Merge pull request #439 from puneetmatharu/refactor-dep-versions-into-versions-sh
Refactor dep versions into `versions.sh` and patch `torch` wheel naming
2 parents 3e30f33 + 9ffea41 commit 01bf1d3

File tree

7 files changed

+34
-14
lines changed

7 files changed

+34
-14
lines changed

ML-Frameworks/pytorch-aarch64/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ where `YY` is the year, and `MM` the month of the increment.
2121

2222
### Fixed
2323

24-
## [r26.02] 2026-02-09
24+
## [r26.02] 2026-02-11
2525
https://github.com/ARM-software/Tool-Solutions/tree/r26.02
2626

2727
### Added
@@ -30,7 +30,7 @@ https://github.com/ARM-software/Tool-Solutions/tree/r26.02
3030

3131
### Changed
3232
- Updates hashes for:
33-
- `PYTORCH_HASH` to `77da53a7356e033e3fc1e03fdd960fc4ad117882`, 2.11.0.dev20260130 from viable/strict, Jan 30th.
33+
- `PYTORCH_HASH` to `77da53a7356e033e3fc1e03fdd960fc4ad117882`, 2.11.0.dev20260129 from viable/strict, Jan 29th.
3434
- `IDEEP_HASH` to `bbb9ffb9e0c401ca058b7f35a6ebe7d0e08ffd34`, from ideep_pytorch, Jan 30th.
3535
- `ONEDNN_HASH` to `804f364c04ad8a763d534abaabc99bf99c2754e0`, from main, Jan 30th.
3636
- `TORCH_AO_HASH` to `30fcb156945ecacd515775414d37c09bfe60727e`, from main, Jan 30th.

ML-Frameworks/pytorch-aarch64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ FROM ${DOCKER_IMAGE_MIRROR}${BASE_IMAGE} AS workshop
1414

1515
ARG TORCH_WHEEL
1616
ARG TORCH_AO_WHEEL
17+
ARG TORCHVISION_NIGHTLY
1718

1819
ENV DEBIAN_FRONTEND=noninteractive
1920
ENV DOCKER_USER=debian
@@ -59,7 +60,7 @@ COPY --chown=$DOCKER_USER:$DOCKER_USER ${TORCH_AO_WHEEL} /home/$DOCKER_USER/
5960
# Install wheels
6061
RUN set -eux && uv pip install --no-deps "$(basename "$TORCH_WHEEL")" && rm "$(basename "$TORCH_WHEEL")"
6162
RUN set -eux && uv pip install --no-deps "$(basename "$TORCH_AO_WHEEL")" && rm "$(basename "$TORCH_AO_WHEEL")"
62-
RUN uv pip install --pre torchvision==0.25.0.dev20260130 --index-url https://download.pytorch.org/whl/nightly/cpu --no-deps
63+
RUN uv pip install --pre torchvision==${TORCHVISION_NIGHTLY} --index-url https://download.pytorch.org/whl/nightly/cpu --no-deps
6364

6465
# Copy examples/tests into image
6566
COPY --chown=$DOCKER_USER:$DOCKER_USER examples/ /home/$DOCKER_USER/

ML-Frameworks/pytorch-aarch64/build-wheel.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
# and
1616
# pytorch/.github/workflows/generated-linux-aarch64-binary-manywheel-nightly.yml
1717

18+
source ./versions.sh
19+
1820
set -eux -o pipefail
1921

2022
docker_exec() {
2123
docker exec "$TORCH_BUILD_CONTAINER" "$@"
2224
}
2325

2426
PYTHON_VERSION="3.12"
25-
OPENBLAS_VERSION="v0.3.30"
26-
ACL_VERSION="v52.8.0"
2727

2828
# Specify DOCKER_IMAGE_MIRROR if you want to use a mirror of hub.docker.com
2929
IMAGE_NAME="${DOCKER_IMAGE_MIRROR:-}pytorch/manylinux2_28_aarch64-builder:cpu-aarch64-69d4c1f80b5e7da224d4f9c2170ef100e75dfe03"
@@ -155,7 +155,7 @@ docker_exec rm -rf "${PYTORCH_CONTAINER_DIR}/dist"
155155
# commit, this allows us to also install the matching torch* packages, set in
156156
# the Dockerfile. This is what PyTorch does in its nightly pipeline, see
157157
# pytorch/.ci/aarch64_linux/aarch64_wheel_ci_build.py for this logic.
158-
build_date=$(cd "$PYTORCH_LOCAL_DIR" && git log --pretty=format:%cs -1 | tr -d '-')
158+
build_date=$(cd "$PYTORCH_LOCAL_DIR" && git show -s --format=%cs "${PYTORCH_HASH}" | tr -d '-')
159159
version=$(cat "$PYTORCH_LOCAL_DIR/version.txt" | tr -d "[:space:]")
160160
OVERRIDE_PACKAGE_VERSION="${version%??}.dev${build_date}${TORCH_RELEASE_ID:+"+$TORCH_RELEASE_ID"}"
161161

ML-Frameworks/pytorch-aarch64/dockerize.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7+
source ./versions.sh
8+
79
set -eux -o pipefail
810

911
help_str="dockerize.sh takes a PyTorch wheel as the first argument and an ao wheel
@@ -29,6 +31,7 @@ docker buildx \
2931
--build-arg DOCKER_IMAGE_MIRROR \
3032
--build-arg TORCH_WHEEL=$1 \
3133
--build-arg TORCH_AO_WHEEL=$2 \
34+
--build-arg TORCHVISION_NIGHTLY="${TORCHVISION_NIGHTLY}" \
3235
.
3336

3437
[[ $* == *--build-only* ]] && exit 0

ML-Frameworks/pytorch-aarch64/get-source.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55
# SPDX-License-Identifier: Apache-2.0
66

77
source ../utils/git-utils.sh
8+
source ./versions.sh
89

910
set -eux -o pipefail
1011

11-
PYTORCH_HASH=77da53a7356e033e3fc1e03fdd960fc4ad117882 # 2.11.0.dev20260130 from viable/strict, Jan 30th
12-
IDEEP_HASH=bbb9ffb9e0c401ca058b7f35a6ebe7d0e08ffd34 # From ideep_pytorch, Jan 30th
13-
ONEDNN_HASH=804f364c04ad8a763d534abaabc99bf99c2754e0 # From main, Jan 30th
14-
TORCH_AO_HASH=30fcb156945ecacd515775414d37c09bfe60727e # From main, Jan 30th
15-
KLEIDIAI_HASH=5addaad73ebbb02e7dde6c50fff3bdb2ae8c407f # v1.20.0 from main, Jan 30th
16-
1712
git-shallow-clone https://github.com/pytorch/pytorch.git $PYTORCH_HASH
1813
(
1914
# Apply patches to PyTorch build
@@ -102,4 +97,4 @@ git-shallow-clone https://github.com/pytorch/ao.git $TORCH_AO_HASH
10297
# Remove cutlass directory
10398
cd ao
10499
git rm third_party/cutlass
105-
)
100+
)
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
# SPDX-FileCopyrightText: Copyright 2026 Arm Limited and affiliates.
4+
#
5+
# SPDX-License-Identifier: Apache-2.0
6+
7+
# Source-of-truth versions and hashes for this repo
8+
9+
# get-source.sh deps
10+
PYTORCH_HASH=77da53a7356e033e3fc1e03fdd960fc4ad117882 # 2.11.0.dev20260129 from viable/strict, Jan 29th
11+
IDEEP_HASH=bbb9ffb9e0c401ca058b7f35a6ebe7d0e08ffd34 # From ideep_pytorch, Jan 30th
12+
ONEDNN_HASH=804f364c04ad8a763d534abaabc99bf99c2754e0 # From main, Jan 30th
13+
TORCH_AO_HASH=30fcb156945ecacd515775414d37c09bfe60727e # From main, Jan 30th
14+
KLEIDIAI_HASH=5addaad73ebbb02e7dde6c50fff3bdb2ae8c407f # v1.20.0 from main, Jan 30th
15+
16+
# build-wheel.sh deps
17+
ACL_VERSION="v52.8.0"
18+
OPENBLAS_VERSION="v0.3.30"
19+
20+
# Dockerfile deps
21+
TORCHVISION_NIGHTLY="0.25.0.dev20260130"

ML-Frameworks/tensorflow-aarch64/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ where `YY` is the year, and `MM` the month of the increment.
2121

2222
### Fixed
2323

24-
## [r26.02] 2026-02-09
24+
## [r26.02] 2026-02-11
2525
https://github.com/ARM-software/Tool-Solutions/tree/r26.02
2626

2727
### Added

0 commit comments

Comments
 (0)