Merge pull request #332 from murste01/murste01/bump-23.05-patches

Bump commits and update patches for 25.06

Author: nSircombe

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

@@ -20,25 +20,18 @@
 source ../utils/git-utils.sh
 
 set -eux -o pipefail
-PYTORCH_HASH=e872bf8f888bdbb27a03e03935db61babf7180b8  # 2.8.0.dev20250430 from viable/strict
-IDEEP_HASH=2ef932a861439e4cc9bb8baee8424b57573de023    # From ideep_pytorch
-ONEDNN_HASH=69150ce5fe1f453af9125ca42a921e017092ccf7   # From main
-ACL_HASH=334108c0efc512efdc9576ba957dbcf5b7ee168a      # rc_25_04_29_0
+PYTORCH_HASH=3040ca6d0f8558e39919b14eebeacc34ddf980f5   # main June 10th
+IDEEP_HASH=2ef932a861439e4cc9bb8baee8424b57573de023     # main June 10th
+ONEDNN_HASH=106a7b41bc4156297b8a88cd1951304b739cc427    # main June 10th
+ACL_HASH=6bc1c7b8d0756272e2a97a7489e13de90f864326       # main June 9th
 TORCH_AO_HASH=e1cb44ab84eee0a3573bb161d65c18661dc4a307 # From main
 
 git-shallow-clone https://github.com/pytorch/pytorch.git $PYTORCH_HASH
 (
     cd pytorch
 
-    # https://github.com/pytorch/pytorch/pull/143190 - Enable AArch64 CI scripts to be used for local dev
-    apply-github-patch pytorch/pytorch 6e5628b1f648d862e8fdd150ad277120b236ed15
-    # https://github.com/pytorch/pytorch/pull/140159 - cpu: enable gemm-bf16f32 for SDPA BF16
-    apply-github-patch pytorch/pytorch ca4a718be80eb88ca6804b91201e4f98a3e236c8
-    apply-github-patch pytorch/pytorch 406fe1fbd066401774c104d125a7ac0b3d6eb52b
     # https://github.com/pytorch/pytorch/pull/152361 - Build libgomp (gcc-11) from source
     apply-github-patch pytorch/pytorch 7c54b6b07558c330ee2f95b4793edb3bfbb814c9
-    # https://github.com/pytorch/pytorch/pull/150833 - Pin all root requirements to major versions
-    apply-github-patch pytorch/pytorch 02987a7c2e9b249a669723224c8d3cd80c6cb64e
 
     git submodule sync
     git submodule update --init --checkout --force --recursive --jobs=$(nproc)

ML-Frameworks/pytorch-aarch64/utils/build_openblas.sh

@@ -25,7 +25,7 @@
 source /common_utils/git-utils.sh
 
 set -ex
-OPENBLAS_HASH="9aa7a0b2a7b2770adec6ff26b34660d3bcd8c49c"
+OPENBLAS_HASH="fe220a0d7d7c5188e698643428708063c8c1a9f6"
 OPENBLAS_CHECKOUT_DIR="OpenBLAS"
 
 cd /

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

@@ -21,12 +21,12 @@ source ../utils/git-utils.sh
 
 set -eux -o pipefail
 
-TENSORFLOW_HASH=8ed060f0c234f4c069cde7fc7080f166c34c410a   # master Apr 03, 2025
+TENSORFLOW_HASH=65781570c55d2338106767de200323f123c3f91f
 
 # The next oneDNN commits relocate xbyak_aarch64 as a third_party module,
 # but this is not picked up by TF Bazel build.
 ONEDNN_HASH=ad06da68524b2b5e63fc1d7a7a749d555394a0a7       # main Jan 03, 2025
-
+ 
 # The next ACL commit introduces KleidiAI as a third-party module,
 # but this is not picked up by TF Bazel build.
 ACL_HASH=0038c52d6c79b76755c087cda1be4bbf752e272c          # main Jan 6, 2025
@@ -37,48 +37,7 @@ git-shallow-clone https://github.com/tensorflow/tensorflow.git $TENSORFLOW_HASH
     cd tensorflow
 
     # Apply TensorFlow WIP patches here
-    # https://github.com/tensorflow/tensorflow/pull/84975 - build(aarch64): Update to oneDNN-3.7 + ACL-24.12
-    apply-github-patch tensorflow/tensorflow 1ca7978322313cd62733075ea354f2af5d1e54a0
-
-    cd tensorflow
-
-    # Set up workspace to point to local versions of Compute Library and oneDNN
-    # Rename existing tf_http_archives
-    sed -i -e 's/\"mkl_dnn_acl_compatible\"/\"mkl_dnn_acl_compatible_backup\"/g' workspace2.bzl
-    sed -i -e 's/\"compute_library\"/\"compute_library_backup\"/g' workspace2.bzl
-    # Insert a new_local_repository for oneDNN and ACL in place of the http_archives
-    csplit -f workspace2.bzl. -n 1 workspace2.bzl /'def _tf_repositories():'/+2 '{0}'
-    onednn_acl_local_repositories=$'
-    native.new_local_repository(
-        name = "mkl_dnn_acl_compatible",
-        build_file = "//third_party/mkl_dnn:mkldnn_acl.BUILD",
-        path = \'./third_party/mkl_dnn/oneDNN\'
-    )
-    native.local_repository(
-        name = "compute_library",
-        path = \'./third_party/compute_library/ComputeLibrary\'
-    )'
-    echo "$onednn_acl_local_repositories" > tensorflow_local-repositories.txt
-    cat workspace2.bzl.0 tensorflow_local-repositories.txt workspace2.bzl.1 > workspace2.bzl
-    cd ..
-
-    # oneDNN patches
-    (
-        cd third_party/mkl_dnn
-        git-shallow-clone https://github.com/oneapi-src/oneDNN.git $ONEDNN_HASH
-
-        # Apply WIP patches here
-        cd oneDNN
-        # https://github.com/uxlfoundation/oneDNN/pull/2958 - set default num_threads to max for acl_threadpool
-        apply-github-patch uxlfoundation/oneDNN ce72a428594c58e925de38c5eb6fea725fe9d0ff
-    )
-
-    # ACL patches
-    (
-        cd third_party/compute_library
-        git-shallow-clone https://review.mlplatform.org/ml/ComputeLibrary $ACL_HASH
 
-        # Apply WIP patches here
-    )
+    apply-github-patch tensorflow/tensorflow 6eb08485a6312a02636f79d8eddf00a549e32aca # build(aarch64): Update to oneDNN-3.7 + ACL-24.12 (fix)
 
 )