From efdf75e3a1ab17df3fa57bffb15ce59f97d91db9 Mon Sep 17 00:00:00 2001 From: houj04 <35131887+houj04@users.noreply.github.com> Date: Thu, 17 Nov 2022 10:32:54 +0800 Subject: [PATCH] xpu.cmake: use baidu-kunlun-product. update to 1116. (#48031) --- cmake/external/xpu.cmake | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake index 5e560a2701..a616387c09 100644 --- a/cmake/external/xpu.cmake +++ b/cmake/external/xpu.cmake @@ -10,20 +10,11 @@ set(XPU_RT_LIB_NAME "libxpurt.so") if(NOT DEFINED XPU_BASE_URL) set(XPU_BASE_URL_WITHOUT_DATE "https://baidu-kunlun-product.su.bcebos.com/KL-SDK/klsdk-dev") - set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20221110") + set(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20221116") else() set(XPU_BASE_URL "${XPU_BASE_URL}") endif() -# ubuntu and centos: use output by XDNN API team -if(NOT DEFINED XPU_XDNN_BASE_URL) - set(XPU_XDNN_BASE_URL_WITHOUT_DATE - "https://klx-sdk-release-public.su.bcebos.com/xdnn/dev") - set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL_WITHOUT_DATE}/20221109") -else() - set(XPU_XDNN_BASE_URL "${XPU_XDNN_BASE_URL}") -endif() - set(XPU_XCCL_BASE_URL "https://klx-sdk-release-public.su.bcebos.com/xccl/release/1.0.0") @@ -31,53 +22,34 @@ if(WITH_AARCH64) set(XPU_XRE_DIR_NAME "xre-kylin_aarch64") set(XPU_XDNN_DIR_NAME "xdnn-kylin_aarch64") set(XPU_XCCL_DIR_NAME "xccl-kylin_aarch64") - set(XPU_XDNN_URL - "${XPU_XDNN_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" - CACHE STRING "" FORCE) elseif(WITH_SUNWAY) set(XPU_XRE_DIR_NAME "xre-deepin_sw6_64") set(XPU_XDNN_DIR_NAME "xdnn-deepin_sw6_64") set(XPU_XCCL_DIR_NAME "xccl-deepin_sw6_64") - set(XPU_XDNN_URL - "${XPU_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" - CACHE STRING "" FORCE) elseif(WITH_BDCENTOS) set(XPU_XRE_DIR_NAME "xre-bdcentos_x86_64") set(XPU_XDNN_DIR_NAME "xdnn-bdcentos_x86_64") set(XPU_XCCL_DIR_NAME "xccl-bdcentos_x86_64") - # ubuntu and centos: use output by XDNN API team - set(XPU_XDNN_URL - "${XPU_XDNN_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" - CACHE STRING "" FORCE) elseif(WITH_UBUNTU) set(XPU_XRE_DIR_NAME "xre-ubuntu_x86_64") set(XPU_XDNN_DIR_NAME "xdnn-ubuntu_x86_64") set(XPU_XCCL_DIR_NAME "xccl-ubuntu_x86_64") - # ubuntu and centos: use output by XDNN API team - set(XPU_XDNN_URL - "${XPU_XDNN_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" - CACHE STRING "" FORCE) elseif(WITH_CENTOS) set(XPU_XRE_DIR_NAME "xre-centos7_x86_64") - set(XPU_XDNN_DIR_NAME "xdnn-bdcentos_x86_64") + set(XPU_XDNN_DIR_NAME "xdnn-centos7_x86_64") set(XPU_XCCL_DIR_NAME "xccl-bdcentos_x86_64") - # ubuntu and centos: use output by XDNN API team - set(XPU_XDNN_URL - "${XPU_XDNN_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" - CACHE STRING "" FORCE) else() set(XPU_XRE_DIR_NAME "xre-ubuntu_x86_64") set(XPU_XDNN_DIR_NAME "xdnn-ubuntu_x86_64") set(XPU_XCCL_DIR_NAME "xccl-ubuntu_x86_64") - # default: use output by XDNN API team - set(XPU_XDNN_URL - "${XPU_XDNN_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" - CACHE STRING "" FORCE) endif() set(XPU_XRE_URL "${XPU_BASE_URL}/${XPU_XRE_DIR_NAME}.tar.gz" CACHE STRING "" FORCE) +set(XPU_XDNN_URL + "${XPU_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" + CACHE STRING "" FORCE) set(XPU_XCCL_URL "${XPU_XCCL_BASE_URL}/${XPU_XCCL_DIR_NAME}.tar.gz" CACHE STRING "" FORCE) -- GitLab