From 9920cc84a700b1825c8897b16e08804934dea896 Mon Sep 17 00:00:00 2001 From: yunyaoXYY Date: Thu, 5 Jan 2023 07:27:24 +0000 Subject: [PATCH] Improve ascend --- cmake/ascend.cmake | 1 - scripts/patch_paddle_lite.py | 28 +++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/cmake/ascend.cmake b/cmake/ascend.cmake index 9c3a9656a..d7dc2ad38 100644 --- a/cmake/ascend.cmake +++ b/cmake/ascend.cmake @@ -17,7 +17,6 @@ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") endif() - if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") if (NOT BUILD_FASTDEPLOY_PYTHON) message(STATUS "Build FastDeploy Ascend C++ library on aarch64 platform.") diff --git a/scripts/patch_paddle_lite.py b/scripts/patch_paddle_lite.py index 035cfc59e..2939615c0 100644 --- a/scripts/patch_paddle_lite.py +++ b/scripts/patch_paddle_lite.py @@ -26,7 +26,6 @@ def process_paddle_lite(paddle_lite_so_path): rpaths = ["$ORIGIN", "$ORIGIN/mklml/lib/"] patchelf_exe = os.getenv("PATCHELF_EXE", "patchelf") - for paddle_lite_so_file in os.listdir(paddle_lite_so_path): paddle_lite_so_file = os.path.join(paddle_lite_so_path, paddle_lite_so_file) @@ -40,25 +39,28 @@ def process_paddle_lite(paddle_lite_so_path): assert os.system( command) == 0, "patchelf {} failed, the command: {}".format( paddle_lite_so_file, command) - - # Patch /paddlelite/lib/mklml/lib/*.so + + # Patch /paddlelite/lib/mklml/lib/*.so if 'mklml' in paddle_lite_so_file: - paddle_lite_mklml_lib_path = os.path.join(paddle_lite_so_path, - paddle_lite_so_file,'lib') - - for paddle_lite_mklml_so_file in os.listdir(paddle_lite_mklml_lib_path): - paddle_lite_mklml_so_file = os.path.join(paddle_lite_mklml_lib_path, - paddle_lite_mklml_so_file) + paddle_lite_mklml_lib_path = os.path.join( + paddle_lite_so_path, paddle_lite_so_file, 'lib') + + for paddle_lite_mklml_so_file in os.listdir( + paddle_lite_mklml_lib_path): + paddle_lite_mklml_so_file = os.path.join( + paddle_lite_mklml_lib_path, paddle_lite_mklml_so_file) if '.so' in paddle_lite_mklml_so_file: command = "{} --set-rpath '{}' {}".format( - patchelf_exe, ":".join(rpaths), paddle_lite_mklml_so_file) + patchelf_exe, ":".join(rpaths), + paddle_lite_mklml_so_file) if platform.machine() != 'sw_64' and platform.machine( ) != 'mips64': assert os.system( - command) == 0, "patchelf {} failed, the command: {}".format( - paddle_lite_mklml_so_file, command) - + command + ) == 0, "patchelf {} failed, the command: {}".format( + paddle_lite_mklml_so_file, command) + if __name__ == "__main__": process_paddle_lite(sys.argv[1])