From 26e98fc84949709d719e2707c5d6827974bd9f34 Mon Sep 17 00:00:00 2001 From: yunyaoXYY Date: Thu, 5 Jan 2023 05:47:26 +0000 Subject: [PATCH 1/5] Support Ascend deployment on X86 platform --- cmake/ascend.cmake | 44 ++++++++++++++++++++++++------------ scripts/patch_paddle_lite.py | 23 ++++++++++++++++++- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/cmake/ascend.cmake b/cmake/ascend.cmake index ed5aa5d93..9c3a9656a 100644 --- a/cmake/ascend.cmake +++ b/cmake/ascend.cmake @@ -1,19 +1,33 @@ -if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") - message(FATAL_ERROR "Huawei Ascend NPU is supported on Linux aarch64 platform for now.") -endif() - if(NOT ${ENABLE_LITE_BACKEND}) set(ENABLE_LITE_BACKEND ON) endif() -if (NOT BUILD_FASTDEPLOY_PYTHON) - message(STATUS "Build FastDeploy Ascend C++ library.") - if(NOT PADDLELITE_URL) - set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_arm64_huawei_ascend_npu_1121.tgz") - endif() -else () - message(STATUS "Build FastDeploy Ascend Python library.") - if(NOT PADDLELITE_URL) - set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_arm64_huawei_ascend_npu_python_1207.tgz") - endif() -endif() +if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") + if (NOT BUILD_FASTDEPLOY_PYTHON) + message(STATUS "Build FastDeploy Ascend C++ library on X86 platform.") + if(NOT PADDLELITE_URL) + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_x86_huawei_ascend_npu_0105.tgz") + endif() + else () + message(STATUS "Build FastDeploy Ascend Python library on X86 platform.") + if(NOT PADDLELITE_URL) + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_x86_huawei_ascend_npu_python_0105.tgz") + endif() + endif() +endif() + + + +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") + if (NOT BUILD_FASTDEPLOY_PYTHON) + message(STATUS "Build FastDeploy Ascend C++ library on aarch64 platform.") + if(NOT PADDLELITE_URL) + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_arm64_huawei_ascend_npu_1121.tgz") + endif() + else () + message(STATUS "Build FastDeploy Ascend Python library on aarch64 platform.") + if(NOT PADDLELITE_URL) + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_arm64_huawei_ascend_npu_python_1207.tgz") + endif() + endif() +endif() \ No newline at end of file diff --git a/scripts/patch_paddle_lite.py b/scripts/patch_paddle_lite.py index 96dea4bf1..035cfc59e 100644 --- a/scripts/patch_paddle_lite.py +++ b/scripts/patch_paddle_lite.py @@ -23,12 +23,15 @@ import sys def process_paddle_lite(paddle_lite_so_path): if platform.system().lower() != "linux": return - rpaths = ["$ORIGIN"] + 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) + + # Patch /paddlelite/lib/*.so if '.so' in paddle_lite_so_file: command = "{} --set-rpath '{}' {}".format( patchelf_exe, ":".join(rpaths), paddle_lite_so_file) @@ -37,7 +40,25 @@ 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 + 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) + if '.so' in paddle_lite_mklml_so_file: + command = "{} --set-rpath '{}' {}".format( + 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) + if __name__ == "__main__": process_paddle_lite(sys.argv[1]) From 5cd165a4b892408b3dba4a6df2f6312980ddfb86 Mon Sep 17 00:00:00 2001 From: yunyaoXYY Date: Thu, 5 Jan 2023 07:21:29 +0000 Subject: [PATCH 2/5] Improve Ascend docs --- docs/cn/build_and_install/huawei_ascend.md | 27 ++++++++++++++++++---- docs/en/build_and_install/huawei_ascend.md | 26 +++++++++++++++++---- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/docs/cn/build_and_install/huawei_ascend.md b/docs/cn/build_and_install/huawei_ascend.md index ce0c80211..b16e3219c 100644 --- a/docs/cn/build_and_install/huawei_ascend.md +++ b/docs/cn/build_and_install/huawei_ascend.md @@ -3,7 +3,7 @@ FastDeploy基于 Paddle-Lite 后端, 支持在华为昇腾NPU上进行部署推理。 更多详细的信息请参考：[Paddle Lite部署示例](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/demo_guides/huawei_ascend_npu.md)。 -本文档介绍如何在ARM Linux操作系统环境下, 编译基于 Paddle Lite 的 C++ 与 Python 的FastDeploy源码, 生成目标硬件为华为昇腾NPU的预测库。 +本文档介绍如何在ARM/X86_64的Linux操作系统环境下, 编译基于 Paddle Lite 的 C++ 与 Python 的FastDeploy源码, 生成目标硬件为华为昇腾NPU的预测库。 更多编译选项请参考[FastDeploy编译选项说明](./README.md) @@ -14,7 +14,7 @@ FastDeploy基于 Paddle-Lite 后端, 支持在华为昇腾NPU上进行部署推 - 配套驱动和固件包下载： - https://www.hiascend.com/hardware/firmware-drivers?tag=community（社区版） - https://www.hiascend.com/hardware/firmware-drivers?tag=commercial（商业版） - - 驱动：Atlas-300i-pro-npu-driver_5.1.rc2_linux-aarch64.run + - 驱动：Atlas-300i-pro-npu-driver_5.1.rc2_linux-aarch64.run (这里以aarch64平台为例) - 固件：Atlas-300i-pro-npu-firmware_5.1.rc2.run - 安装驱动和固件包： @@ -35,13 +35,14 @@ $ npu-smi info ## 二.编译环境搭建 ### 宿主机环境需求 -- os：ARM-Linux +- os：ARM-Linux, X86_64-Linux - gcc、g++、git、make、wget、python、pip、python-dev、patchelf - cmake（建议使用 3.10 或以上版本） ### 使用Docker开发环境 为了保证和FastDeploy验证过的编译环境一致，建议使用Docker开发环境进行配置. +aarch64平台示例 ```shell # 下载 Dockerfile $ wget https://bj.bcebos.com/fastdeploy/test/Ascend_ubuntu18.04_aarch64_5.1.rc2.Dockerfile @@ -54,11 +55,27 @@ $ docker exec -it ascend-aarch64 /bin/bash # 确认容器的 Ascend 环境是否创建成功 $ npu-smi info ``` + +x86_64平台示例 +```shell +# 下载 Dockerfile +$ wget https://paddlelite-demo.bj.bcebos.com/devices/huawei/ascend/intel_x86/Ascend_ubuntu18.04_x86_5.1.rc1.alpha001.Dockerfile +# 通过 Dockerfile 生成镜像 +$ docker build --network=host -f Ascend_ubuntu18.04_x86_5.1.rc1.alpha001.Dockerfile -t paddlelite/ascend_x86:cann_5.1.rc1.alpha001 . +# 创建容器 +$ docker run -itd --privileged --name=ascend-x86 --net=host -v $PWD:/Work -w /Work --device=/dev/davinci0 --device=/dev/davinci_manager --device=/dev/hisi_hdc --device /dev/devmm_svm -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi -v /usr/local/Ascend/driver/:/usr/local/Ascend/driver/ paddlelite/ascend_x86:cann_5.1.1.alpha001 /bin/bash +# 进入容器 +$ docker exec -it ascend-x86 /bin/bash +# 确认容器的 Ascend 环境是否创建成功 +$ npu-smi info +``` + 以上步骤成功后，用户可以直接在docker内部开始FastDeploy的编译. 注意: -- 如果用户在Docker内想使用其他的CANN版本,请自行更新 Dockerfile 文件内的 CANN 下载路径, 同时更新相应的驱动和固件. 当前Dockerfile内默认为[CANN 5.1.RC2](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%205.1.RC2/Ascend-cann-toolkit_5.1.RC2_linux-aarch64.run). -- 如果用户不想使用docker，可以参考由Paddle Lite提供的[ARM Linux环境下的编译环境准备](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/arm_linux_compile_arm_linux.rst)自行配置编译环境, 之后再自行下载并安装相应的CANN软件包来完成配置. +- 如果用户在Docker内想使用其他的CANN版本,请自行更新 Dockerfile 文件内的 CANN 下载路径, 同时更新相应的驱动和固件. 当前示例中, aarch64平台的Dockerfile内默认为[CANN 5.1.RC2](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%205.1.RC2/Ascend-cann-toolkit_5.1.RC2_linux-aarch64.run). x86_64平台的Dockerfile内默认为[CANN 5.1.RC1](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/5.1.RC1.alpha001/Ascend-cann-toolkit_5.1.RC1.alpha001_linux-x86_64.run) + +- 如果用户不想使用docker，可以参考由Paddle Lite提供的[ARM Linux环境下的编译环境准备](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/arm_linux_compile_arm_linux.rst)或者[X86 Linux环境下的编译环境准备](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/linux_x86_compile_linux_x86.rst)自行配置编译环境, 之后再自行下载并安装相应的CANN软件包来完成配置. ## 三.基于 Paddle Lite 的 C++ FastDeploy 库编译 搭建好编译环境之后，编译命令如下： diff --git a/docs/en/build_and_install/huawei_ascend.md b/docs/en/build_and_install/huawei_ascend.md index 48653939d..09db2445d 100644 --- a/docs/en/build_and_install/huawei_ascend.md +++ b/docs/en/build_and_install/huawei_ascend.md @@ -3,7 +3,7 @@ Based on the Paddle-Lite backend, FastDeploy supports model inference on Huawei's Ascend NPU. For more detailed information, please refer to: [Paddle Lite Deployment Example](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/demo_guides/huawei_ascend_npu.md). -This document describes how to compile C++ and Python FastDeploy source code under ARM Linux OS environment to generate prediction libraries for Huawei Sunrise NPU as the target hardware. +This document describes how to compile C++ and Python FastDeploy source code under ARM/X86_64 Linux OS environment to generate prediction libraries for Huawei Sunrise NPU as the target hardware. For more compilation options, please refer to the [FastDeploy compilation options description](./README.md) @@ -13,7 +13,7 @@ For more compilation options, please refer to the [FastDeploy compilation option - Download the matching driver and firmware package at: - https://www.hiascend.com/hardware/firmware-drivers?tag=community（Community Edition） - https://www.hiascend.com/hardware/firmware-drivers?tag=commercial（Commercial version） - - driver：Atlas-300i-pro-npu-driver_5.1.rc2_linux-aarch64.run + - driver：Atlas-300i-pro-npu-driver_5.1.rc2_linux-aarch64.run (aarch64 as example) - firmware：Atlas-300i-pro-npu-firmware_5.1.rc2.run - Installing drivers and firmware packages: @@ -32,13 +32,14 @@ $ npu-smi info ## Compilation environment construction ### Host environment requirements -- os: ARM-Linux +- os: ARM-Linux, X86_64-Linux - gcc, g++, git, make, wget, python, pip, python-dev, patchelf - cmake (version 3.10 or above recommended) ### Using Docker development environment In order to ensure consistency with the FastDeploy verified build environment, it is recommended to use the Docker development environment for configuration. +On aarch64 platform, ```shell # Download Dockerfile $ wget https://bj.bcebos.com/fastdeploy/test/Ascend_ubuntu18.04_aarch64_5.1.rc2.Dockerfile @@ -51,11 +52,26 @@ $ docker exec -it ascend-aarch64 /bin/bash # Verify that the Ascend environment for the container is created successfully $ npu-smi info ``` +On X86_64 platform, +```shell +# Download Dockerfile +$ wget https://paddlelite-demo.bj.bcebos.com/devices/huawei/ascend/intel_x86/Ascend_ubuntu18.04_x86_5.1.rc1.alpha001.Dockerfile +# Create docker images +$ docker build --network=host -f Ascend_ubuntu18.04_x86_5.1.rc1.alpha001.Dockerfile -t paddlelite/ascend_x86:cann_5.1.rc1.alpha001 . +# Create container +$ docker run -itd --privileged --name=ascend-x86 --net=host -v $PWD:/Work -w /Work --device=/dev/davinci0 --device=/dev/davinci_manager --device=/dev/hisi_hdc --device /dev/devmm_svm -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi -v /usr/local/Ascend/driver/:/usr/local/Ascend/driver/ paddlelite/ascend_x86:cann_5.1.1.alpha001 /bin/bash +# Enter the container +$ docker exec -it ascend-x86 /bin/bash +# Verify that the Ascend environment for the container is created successfully +$ npu-smi info +``` + Once the above steps are successful, the user can start compiling FastDeploy directly from within docker. Note: -- If you want to use another CANN version in Docker, please update the CANN download path in the Dockerfile file, and update the corresponding driver and firmware. The current default in Dockerfile is [CANN 5.1.RC2](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%205.1.RC2/Ascend-cann-toolkit_5.1.RC2_linux-aarch64.run). -- If users do not want to use docker, you can refer to [Compile Environment Preparation for ARM Linux Environments](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/arm_linux_compile_arm_linux.rst) provided by Paddle Lite and configure your own compilation environment, and then download and install the proper CANN packages to complete the configuration. +- If you want to use another CANN version in Docker, please update the CANN download path in the Dockerfile file, and update the corresponding driver and firmware. The current default in aarch64 Dockerfile is [CANN 5.1.RC2](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%205.1.RC2/Ascend-cann-toolkit_5.1.RC2_linux-aarch64.run), in x86_64 is [CANN 5.1.RC1](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/5.1.RC1.alpha001/Ascend-cann-toolkit_5.1.RC1.alpha001_linux-x86_64.run). + +- If users do not want to use docker, you can refer to [Compile Environment Preparation for ARM Linux Environments](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/arm_linux_compile_arm_linux.rst) or [Compile Environment Preparation for X86 Linux Environments](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/linux_x86_compile_linux_x86.rst) provided by Paddle Lite and configure your own compilation environment, and then download and install the proper CANN packages to complete the configuration. ## C++ FastDeploy library compilation based on Paddle Lite After setting up the compilation environment, the compilation command is as follows. From 9920cc84a700b1825c8897b16e08804934dea896 Mon Sep 17 00:00:00 2001 From: yunyaoXYY Date: Thu, 5 Jan 2023 07:27:24 +0000 Subject: [PATCH 3/5] 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]) From fa5428d899ac27e69a9f7117762b4be12a2ddda1 Mon Sep 17 00:00:00 2001 From: yunyaoXYY Date: Thu, 5 Jan 2023 07:29:47 +0000 Subject: [PATCH 4/5] Improve ascend --- docs/cn/build_and_install/huawei_ascend.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cn/build_and_install/huawei_ascend.md b/docs/cn/build_and_install/huawei_ascend.md index b16e3219c..75b55923e 100644 --- a/docs/cn/build_and_install/huawei_ascend.md +++ b/docs/cn/build_and_install/huawei_ascend.md @@ -73,7 +73,7 @@ $ npu-smi info 以上步骤成功后，用户可以直接在docker内部开始FastDeploy的编译. 注意: -- 如果用户在Docker内想使用其他的CANN版本,请自行更新 Dockerfile 文件内的 CANN 下载路径, 同时更新相应的驱动和固件. 当前示例中, aarch64平台的Dockerfile内默认为[CANN 5.1.RC2](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%205.1.RC2/Ascend-cann-toolkit_5.1.RC2_linux-aarch64.run). x86_64平台的Dockerfile内默认为[CANN 5.1.RC1](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/5.1.RC1.alpha001/Ascend-cann-toolkit_5.1.RC1.alpha001_linux-x86_64.run) +- 如果用户在Docker内想使用其他的CANN版本,请自行更新 Dockerfile 文件内的 CANN 下载路径, 同时更新相应的驱动和固件. 当前示例中, aarch64平台的Dockerfile内默认为[CANN 5.1.RC2](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%205.1.RC2/Ascend-cann-toolkit_5.1.RC2_linux-aarch64.run), x86_64平台的Dockerfile内默认为[CANN 5.1.RC1](https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/5.1.RC1.alpha001/Ascend-cann-toolkit_5.1.RC1.alpha001_linux-x86_64.run). - 如果用户不想使用docker，可以参考由Paddle Lite提供的[ARM Linux环境下的编译环境准备](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/arm_linux_compile_arm_linux.rst)或者[X86 Linux环境下的编译环境准备](https://github.com/PaddlePaddle/Paddle-Lite/blob/develop/docs/source_compile/linux_x86_compile_linux_x86.rst)自行配置编译环境, 之后再自行下载并安装相应的CANN软件包来完成配置. From d9cdea49d8b77bf12cdac31fce3f020f16f0125c Mon Sep 17 00:00:00 2001 From: yunyaoXYY Date: Mon, 9 Jan 2023 02:26:45 +0000 Subject: [PATCH 5/5] Change Paddle Lite Ascend URL --- cmake/ascend.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/ascend.cmake b/cmake/ascend.cmake index d7dc2ad38..1b8d9f42e 100644 --- a/cmake/ascend.cmake +++ b/cmake/ascend.cmake @@ -6,12 +6,12 @@ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") if (NOT BUILD_FASTDEPLOY_PYTHON) message(STATUS "Build FastDeploy Ascend C++ library on X86 platform.") if(NOT PADDLELITE_URL) - set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_x86_huawei_ascend_npu_0105.tgz") + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/third_libs/lite-linux_x86_huawei_ascend_npu_0105.tgz") endif() else () message(STATUS "Build FastDeploy Ascend Python library on X86 platform.") if(NOT PADDLELITE_URL) - set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_x86_huawei_ascend_npu_python_0105.tgz") + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/third_libs/lite-linux_x86_huawei_ascend_npu_python_0105.tgz") endif() endif() endif() @@ -21,12 +21,12 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64") if (NOT BUILD_FASTDEPLOY_PYTHON) message(STATUS "Build FastDeploy Ascend C++ library on aarch64 platform.") if(NOT PADDLELITE_URL) - set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_arm64_huawei_ascend_npu_1121.tgz") + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/third_libs/lite-linux_arm64_huawei_ascend_npu_1121.tgz") endif() else () message(STATUS "Build FastDeploy Ascend Python library on aarch64 platform.") if(NOT PADDLELITE_URL) - set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_arm64_huawei_ascend_npu_python_1207.tgz") + set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/third_libs/lite-linux_arm64_huawei_ascend_npu_python_1207.tgz") endif() endif() endif() \ No newline at end of file