mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2025-10-14 20:55:57 +08:00
Improve ascend
This commit is contained in:
@@ -17,7 +17,6 @@ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
|
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
|
||||||
if (NOT BUILD_FASTDEPLOY_PYTHON)
|
if (NOT BUILD_FASTDEPLOY_PYTHON)
|
||||||
message(STATUS "Build FastDeploy Ascend C++ library on aarch64 platform.")
|
message(STATUS "Build FastDeploy Ascend C++ library on aarch64 platform.")
|
||||||
|
@@ -26,7 +26,6 @@ def process_paddle_lite(paddle_lite_so_path):
|
|||||||
rpaths = ["$ORIGIN", "$ORIGIN/mklml/lib/"]
|
rpaths = ["$ORIGIN", "$ORIGIN/mklml/lib/"]
|
||||||
patchelf_exe = os.getenv("PATCHELF_EXE", "patchelf")
|
patchelf_exe = os.getenv("PATCHELF_EXE", "patchelf")
|
||||||
|
|
||||||
|
|
||||||
for paddle_lite_so_file in os.listdir(paddle_lite_so_path):
|
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 = os.path.join(paddle_lite_so_path,
|
||||||
paddle_lite_so_file)
|
paddle_lite_so_file)
|
||||||
@@ -40,25 +39,28 @@ def process_paddle_lite(paddle_lite_so_path):
|
|||||||
assert os.system(
|
assert os.system(
|
||||||
command) == 0, "patchelf {} failed, the command: {}".format(
|
command) == 0, "patchelf {} failed, the command: {}".format(
|
||||||
paddle_lite_so_file, command)
|
paddle_lite_so_file, command)
|
||||||
|
|
||||||
# Patch /paddlelite/lib/mklml/lib/*.so
|
# Patch /paddlelite/lib/mklml/lib/*.so
|
||||||
if 'mklml' in paddle_lite_so_file:
|
if 'mklml' in paddle_lite_so_file:
|
||||||
paddle_lite_mklml_lib_path = os.path.join(paddle_lite_so_path,
|
paddle_lite_mklml_lib_path = os.path.join(
|
||||||
paddle_lite_so_file,'lib')
|
paddle_lite_so_path, paddle_lite_so_file, 'lib')
|
||||||
|
|
||||||
for paddle_lite_mklml_so_file in os.listdir(paddle_lite_mklml_lib_path):
|
for paddle_lite_mklml_so_file in os.listdir(
|
||||||
paddle_lite_mklml_so_file = os.path.join(paddle_lite_mklml_lib_path,
|
paddle_lite_mklml_lib_path):
|
||||||
paddle_lite_mklml_so_file)
|
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:
|
if '.so' in paddle_lite_mklml_so_file:
|
||||||
command = "{} --set-rpath '{}' {}".format(
|
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(
|
if platform.machine() != 'sw_64' and platform.machine(
|
||||||
) != 'mips64':
|
) != 'mips64':
|
||||||
assert os.system(
|
assert os.system(
|
||||||
command) == 0, "patchelf {} failed, the command: {}".format(
|
command
|
||||||
paddle_lite_mklml_so_file, command)
|
) == 0, "patchelf {} failed, the command: {}".format(
|
||||||
|
paddle_lite_mklml_so_file, command)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
process_paddle_lite(sys.argv[1])
|
process_paddle_lite(sys.argv[1])
|
||||||
|
Reference in New Issue
Block a user