Draft: Remove ACL from oneDNN/PyTorch build

ML-Frameworks/pytorch-aarch64/CHANGELOG.md

@@ -14,6 +14,8 @@ where `YY` is the year, and `MM` the month of the increment.
 ## [unreleased]
 
 ### Added
+ - Adds PyTorch [PR #184372](https://github.com/pytorch/pytorch/pull/184372), to remove ACL.
+ - Adds oneDNN [PR #5156](https://github.com/uxlfoundation/oneDNN/pull/5156), to replace ACL with KleidiAI.
  - TorchAO installation via nightly AArch64 wheel (0.18.0.dev20260505) in Dockerfile
  - Adds a `--source-variant {upstream,pinned,patched}` option to `build.sh` and
    `get-source.sh` to select PyTorch's upstream submodule hashes, repo-pinned
@@ -36,8 +38,10 @@ where `YY` is the year, and `MM` the month of the increment.
  - Updates `torchvision` from 0.26.0.dev20260329 to 0.27.0.dev20260505.
 
 ### Removed
+ - Disables PyTorch [PR #182655](https://github.com/pytorch/pytorch/pull/182655), to update the ACL/OpenBLAS/manywheel build scripts.
  - Removes TorchAO wheel build from source.
  - Removes PRs that have already been merged.
+ - Removes call to `third_party/build_bundled.py` in PyTorch, which has been removed in PyTorch [PR #180237](https://github.com/pytorch/pytorch/pull/180237).
 
 ### Fixed
  - Constrains `pytest` to the 8.4 series to keep PyTorch's copied unit tests compatible with pytest hook deprecation handling.

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

@@ -49,21 +49,26 @@ git-shallow-clone https://github.com/pytorch/pytorch.git $PYTORCH_HASH
     if [[ "$source_variant" != patched ]]; then
         echo "Not applying extra patches to PyTorch build for source variant '$source_variant'"
     else
-        # https://github.com/pytorch/pytorch/pull/182655 - Update ACL/OpenBLAS/manywheel build scripts and add ccache support
-        apply-github-patch pytorch/pytorch 159406ab7f210bacadb757fabef28ac9ddacb706
-
-        # https://github.com/pytorch/pytorch/pull/170600 - Gate deletion of clean-up steps in build_common.sh
-        apply-github-patch pytorch/pytorch e368ec2693b8b2b8ba35d0913f1d663ba2fdc804
-
-        # https://github.com/pytorch/pytorch/pull/167328 - Build cpuinfo into c10 shared library
-        apply-github-patch pytorch/pytorch 7c053dd1582b778c81101dd452708c4ec6e58233
-        apply-github-patch pytorch/pytorch b1782bbe0eda5957870e2f6e95b8f167e04843cb
-        apply-github-patch pytorch/pytorch 337925aed2babb3ef7808f78536bbbc9df346a4f
-
-        # https://github.com/pytorch/pytorch/pull/177867 - Add ASIMD_BF16 Vectorized class specialisation
-        apply-github-patch pytorch/pytorch 6cbed7b8e0d5985569b4cc36931afc717930fe00
-        apply-github-patch pytorch/pytorch 6e6878ec8869fd8f7d9314571a3e84933f149ef5
-        apply-github-patch pytorch/pytorch e14a2184c44c96e433f468ba12e104dc6be85886
+        # TODO: Re-enable patch when we can handle the clash with the Remove ACL patch
+        # # https://github.com/pytorch/pytorch/pull/182655 - Update ACL/OpenBLAS/manywheel build scripts
+        # apply-github-patch pytorch/pytorch dc5b10cab8fdadc2b64fbb09dbf27dbe1a483d8f
+
+        # # https://github.com/pytorch/pytorch/pull/170600 - Gate deletion of clean-up steps in build_common.sh
+        # apply-github-patch pytorch/pytorch e368ec2693b8b2b8ba35d0913f1d663ba2fdc804
+
+        # # https://github.com/pytorch/pytorch/pull/167328 - Build cpuinfo into c10 shared library
+        # apply-github-patch pytorch/pytorch 7c053dd1582b778c81101dd452708c4ec6e58233
+        # apply-github-patch pytorch/pytorch b1782bbe0eda5957870e2f6e95b8f167e04843cb
+        # apply-github-patch pytorch/pytorch 337925aed2babb3ef7808f78536bbbc9df346a4f
+
+        # # https://github.com/pytorch/pytorch/pull/177867 - Add ASIMD_BF16 Vectorized class specialisation
+        # apply-github-patch pytorch/pytorch 6cbed7b8e0d5985569b4cc36931afc717930fe00
+        # apply-github-patch pytorch/pytorch 6e6878ec8869fd8f7d9314571a3e84933f149ef5
+        # apply-github-patch pytorch/pytorch e14a2184c44c96e433f468ba12e104dc6be85886
+
+        # https://github.com/pytorch/pytorch/pull/184372 - [Draft] Remove ACL
+        apply-github-patch pytorch/pytorch 0b0d4ac70463892391dcacde63d087e8fa1c980d
+        apply-github-patch pytorch/pytorch 30788230c5dcdd2a2a716c7cf4aa7530615ffe89
     fi
 
     # Remove deps that we don't need for manylinux AArch64 CPU builds before fetching.
@@ -114,7 +119,11 @@ git-shallow-clone https://github.com/pytorch/pytorch.git $PYTORCH_HASH
                 if [[ "$source_variant" != patched ]]; then
                     echo "Not applying extra patches to oneDNN build for source variant '$source_variant'"
                 else
-                    echo "No oneDNN patches to apply"
+                    # https://github.com/uxlfoundation/oneDNN/pull/5156 - cpu: aarch64: replace acl with kleidiai
+                    apply-github-patch uxlfoundation/oneDNN 02346e8a3924e7e243b497081109581e95e8e45f
+                    apply-github-patch uxlfoundation/oneDNN 8ae1d16af170cf293ccd4ad870ee15440625e06e
+                    apply-github-patch uxlfoundation/oneDNN 99842443c1631e34076004017dbea360e5c4280a
+                    git submodule update --init third_party/kleidiai
                 fi
             )
         )
@@ -123,10 +132,4 @@ git-shallow-clone https://github.com/pytorch/pytorch.git $PYTORCH_HASH
             git fetch origin $KLEIDIAI_HASH && git clean -f && git checkout -f FETCH_HEAD
         )
     fi
-
-    # rebuild third_party/LICENSES_BUNDLED.txt after modifying PyTorch submodules if we can
-    # this will also get done in PyTorch build too
-    if command -v python3 >/dev/null 2>&1; then
-        python3 third_party/build_bundled.py
-    fi
 )

ML-Frameworks/pytorch-aarch64/versions.sh

@@ -9,9 +9,9 @@
 # For information on how to update the versions below, read the README.md.
 
 # get-source.sh deps
-PYTORCH_HASH=004acb4e35805062a643ee1588cdae584b2b2957   # 2.13.0.dev20260504 from viable/strict, May 4th, 2026
+PYTORCH_HASH=705fb55ebcb2aac113a0c9c8d95558245795a812   # 2.13.0.dev20260519 from viable/strict, May 19th, 2026
 IDEEP_HASH=6469a610baaa94ba15de1902fd1afb25316171d2     # From ideep_pytorch, Apr 23rd, 2026
-ONEDNN_HASH=8fa20dc93a75c094f618f3f8c206775731d63301    # From main, May 5th, 2026
+ONEDNN_HASH=fee0438a965ef0beac4c805d8745c8d87ea11ea5    # From main, May 8th, 2026
 KLEIDIAI_HASH=7a7da265d21f42053d453ef664814c5b5cad8cd3  # v1.24.0 from main, May 4th, 2026
 
 # build-wheel.sh deps