Skip to content

Commit

Permalink
Revert "aarch64: patch mkl-dnn for xbyak crashes due to /sys not acce…
Browse files Browse the repository at this point in the history
…ssible (pytorch#1648)"

This reverts commit 524a027.
  • Loading branch information
atalman committed Apr 2, 2024
1 parent 2608d66 commit 76278c8
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 107 deletions.
5 changes: 0 additions & 5 deletions aarch64_linux/aarch64_wheel_ci_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ def parse_arguments():
else:
print("build pytorch without mkldnn backend")

# patch mkldnn to fix aarch64 mac and aws lambda crash
print("Applying mkl-dnn patch to fix crash due to /sys not accesible")
with open("/builder/mkldnn_fix/fix-xbyak-failure.patch") as f:
check_call(["patch", "-p1"], stdin=f, cwd="/pytorch/third_party/ideep/mkl-dnn")

os.system(f"cd /pytorch; {build_vars} python3 setup.py bdist_wheel")
pytorch_wheel_name = complete_wheel("pytorch")
print(f"Build Compelete. Created {pytorch_wheel_name}..")
2 changes: 0 additions & 2 deletions aarch64_linux/build_aarch64_wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,6 @@ def start_build(host: RemoteHost, *,
build_ArmComputeLibrary(host, git_clone_flags)
print("build pytorch with mkldnn+acl backend")
build_vars += " USE_MKLDNN=ON USE_MKLDNN_ACL=ON"
host.run_cmd("cd $HOME && git clone https://github.com/pytorch/builder.git")
host.run_cmd("cd $HOME/pytorch/third_party/ideep/mkl-dnn && patch -p1 < $HOME/builder/mkldnn_fix/fix-xbyak-failure.patch") # noqa: E501
host.run_cmd(f"cd $HOME/pytorch && export ACL_ROOT_DIR=$HOME/ComputeLibrary && {build_vars} python3 setup.py bdist_wheel{build_opts}") # noqa: E501
print('Repair the wheel')
pytorch_wheel_name = host.list_dir("pytorch/dist")[0]
Expand Down
6 changes: 2 additions & 4 deletions conda/pytorch-nightly/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ requirements:
- typing_extensions
- ninja
- libuv # [win]
- numpy=1.19 # [py <= 39]
- numpy=1.21.5 # [py == 310]
- numpy=1.23.5 # [py == 311]
- numpy=1.26.0 # [py >= 312]
- numpy=1.19 # [py <= 38]
- numpy=2.0.0b1 # [py >= 39]
- openssl=1.1.1l # [py >= 38 and py <= 310 and linux]
- openssl=1.1.1s # [py == 311 and linux]
- openssl=3.0.12 # [py >= 312 and linux]
Expand Down
96 changes: 0 additions & 96 deletions mkldnn_fix/fix-xbyak-failure.patch

This file was deleted.

0 comments on commit 76278c8

Please sign in to comment.