From b9d33ecc8ffab0ede6cac8c753f9f7b24527783a Mon Sep 17 00:00:00 2001 From: Sunita Nadampalli Date: Tue, 28 Nov 2023 09:25:16 -0600 Subject: [PATCH] remove the mkldnn build flag patching the changes are upstreamed, so no need for patching the wheel builder. --- aarch64_linux/aarch64_wheel_ci_build.py | 2 -- aarch64_linux/build_aarch64_wheel.py | 1 - ...4-fix-default-build-flags-to-armv8-a.patch | 29 ------------------- 3 files changed, 32 deletions(-) delete mode 100644 mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch diff --git a/aarch64_linux/aarch64_wheel_ci_build.py b/aarch64_linux/aarch64_wheel_ci_build.py index a8ab7e78c..3b772847c 100755 --- a/aarch64_linux/aarch64_wheel_ci_build.py +++ b/aarch64_linux/aarch64_wheel_ci_build.py @@ -106,8 +106,6 @@ def parse_arguments(): print("build pytorch without mkldnn backend") # work around to fix Raspberry pie crash - print("Applying mkl-dnn patch to fix Raspberry pie crash") - os.system("cd /pytorch/third_party/ideep/mkl-dnn && patch -p1 < /builder/mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch") print("Applying mkl-dnn patch to fix readdir crash") os.system("cd /pytorch/third_party/ideep/mkl-dnn && patch -p1 < /builder/mkldnn_fix/aarch64-fix-readdir-crash.patch") os.system(f"cd /pytorch; {build_vars} python3 setup.py bdist_wheel") diff --git a/aarch64_linux/build_aarch64_wheel.py b/aarch64_linux/build_aarch64_wheel.py index 4a0f183cc..9efd2e6ae 100755 --- a/aarch64_linux/build_aarch64_wheel.py +++ b/aarch64_linux/build_aarch64_wheel.py @@ -555,7 +555,6 @@ def start_build(host: RemoteHost, *, print("build pytorch with mkldnn+acl backend") build_vars += " USE_MKLDNN=ON USE_MKLDNN_ACL=ON" host.run_cmd(f"cd $HOME && git clone https://github.com/pytorch/builder.git") - host.run_cmd(f"cd $HOME/pytorch/third_party/ideep/mkl-dnn && patch -p1 < $HOME/builder/mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch") host.run_cmd(f"cd $HOME/pytorch && export ACL_ROOT_DIR=$HOME/ComputeLibrary && {build_vars} python3 setup.py bdist_wheel{build_opts}") print('Repair the wheel') pytorch_wheel_name = host.list_dir("pytorch/dist")[0] diff --git a/mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch b/mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch deleted file mode 100644 index f6e91010a..000000000 --- a/mkldnn_fix/aarch64-fix-default-build-flags-to-armv8-a.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - cmake/platform.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/platform.cmake b/cmake/platform.cmake -index 8630460ce..602eafe8e 100644 ---- a/cmake/platform.cmake -+++ b/cmake/platform.cmake -@@ -198,7 +198,7 @@ elseif(UNIX OR MINGW) - endif() - # For native compilation tune for the host processor - if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) -- append(DEF_ARCH_OPT_FLAGS "-mcpu=native") -+ append(DEF_ARCH_OPT_FLAGS "-march=armv8-a") - endif() - elseif(DNNL_TARGET_ARCH STREQUAL "PPC64") - if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") -@@ -295,7 +295,7 @@ elseif(UNIX OR MINGW) - endif() - # For native compilation tune for the host processor - if (CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) -- append(DEF_ARCH_OPT_FLAGS "-mcpu=native") -+ append(DEF_ARCH_OPT_FLAGS "-march=armv8-a") - endif() - elseif(DNNL_TARGET_ARCH STREQUAL "PPC64") - if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") --- -2.34.1 -