From cff93b52a72f98a19588a729f6395cf085d51535 Mon Sep 17 00:00:00 2001 From: Wilber Date: Sat, 5 Dec 2020 09:57:12 +0800 Subject: [PATCH] update cmake for FT openbals version. (#29382) --- cmake/external/openblas.cmake | 6 +----- cmake/inference_lib.cmake | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmake/external/openblas.cmake b/cmake/external/openblas.cmake index 5e67a91c3d8..afe498cb5c9 100644 --- a/cmake/external/openblas.cmake +++ b/cmake/external/openblas.cmake @@ -19,11 +19,7 @@ SET(CBLAS_SOURCE_DIR ${THIRD_PARTY_PATH}/openblas/src/extern_openblas) SET(CBLAS_INSTALL_DIR ${THIRD_PARTY_PATH}/install/openblas) SET(CBLAS_REPOSITORY ${GIT_URL}/xianyi/OpenBLAS.git) SET(CBLAS_TAG v0.3.7) -IF(WITH_ARM) - # Under the FT2000 architecture, the calculation result of blas.sgemm in openblas 0.3+ is wrong, - # so version 0.2 is used by default. - SET(CBLAS_TAG v0.2.18) -ENDIF() + cache_third_party(extern_openblas REPOSITORY ${CBLAS_REPOSITORY} TAG ${CBLAS_TAG} diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index d5ef6d85b57..bc1eff9ef58 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -321,6 +321,9 @@ function(version version_file) file(APPEND ${version_file} "WITH_TENSORRT: ${TENSORRT_FOUND}\n" "TensorRT version: v${TENSORRT_MAJOR_VERSION}\n") endif() + if(WITH_LITE) + file(APPEND ${version_file} "WITH_LITE: ${WITH_LITE}\n" "LITE_GIT_TAG: ${LITE_GIT_TAG}\n"}) + endif() endfunction() version(${PADDLE_INSTALL_DIR}/version.txt) -- GitLab