未验证 提交 468acd8d 编写于 作者: H HappyAngel 提交者: GitHub

[arm]delete lite_with_clang define (#3515)

* remove lite_with_clang, test=develop

* fiix format, test=develop
上级 4e0835ca
...@@ -16,7 +16,6 @@ message(STATUS "LITE_WITH_MLU:\t${LITE_WITH_MLU}") ...@@ -16,7 +16,6 @@ message(STATUS "LITE_WITH_MLU:\t${LITE_WITH_MLU}")
message(STATUS "LITE_WITH_BM:\t${LITE_WITH_BM}") message(STATUS "LITE_WITH_BM:\t${LITE_WITH_BM}")
message(STATUS "LITE_WITH_PROFILE:\t${LITE_WITH_PROFILE}") message(STATUS "LITE_WITH_PROFILE:\t${LITE_WITH_PROFILE}")
message(STATUS "LITE_WITH_CV:\t${LITE_WITH_CV}") message(STATUS "LITE_WITH_CV:\t${LITE_WITH_CV}")
message(STATUS "LITE_WITH_ARM_LANG:\t${LITE_WITH_ARM_LANG}")
set(LITE_MODEL_DIR "${THIRD_PARTY_PATH}/install") set(LITE_MODEL_DIR "${THIRD_PARTY_PATH}/install")
set(LITE_ON_MOBILE ${LITE_WITH_LIGHT_WEIGHT_FRAMEWORK}) set(LITE_ON_MOBILE ${LITE_WITH_LIGHT_WEIGHT_FRAMEWORK})
......
...@@ -31,7 +31,6 @@ BUILD_APU=OFF ...@@ -31,7 +31,6 @@ BUILD_APU=OFF
APU_DDK_ROOT="$(pwd)/apu_sdk_lib/" APU_DDK_ROOT="$(pwd)/apu_sdk_lib/"
BUILD_RKNPU=OFF BUILD_RKNPU=OFF
RKNPU_DDK_ROOT="$(pwd)/rknpu/" RKNPU_DDK_ROOT="$(pwd)/rknpu/"
LITE_WITH_ARM_LANG=OFF
PYTHON_EXECUTABLE_OPTION="" PYTHON_EXECUTABLE_OPTION=""
readonly THIRDPARTY_TAR=https://paddle-inference-dist.bj.bcebos.com/PaddleLite/third-party-05b862.tar.gz readonly THIRDPARTY_TAR=https://paddle-inference-dist.bj.bcebos.com/PaddleLite/third-party-05b862.tar.gz
...@@ -49,14 +48,6 @@ fi ...@@ -49,14 +48,6 @@ fi
function prepare_workspace { function prepare_workspace {
local root_dir=$1 local root_dir=$1
local build_dir=$2 local build_dir=$2
# ARM LANG
if [ ${ARM_LANG} == "clang" ]; then
LITE_WITH_ARM_LANG=ON
else
LITE_WITH_ARM_LANG=OFF
fi
echo "ARM_LANG is ${ARM_LANG}"
echo "LITE_WITH_ARM_LANG is ${LITE_WITH_ARM_LANG}"
# in build directory # in build directory
# 1. Prepare gen_code file # 1. Prepare gen_code file
GEN_CODE_PATH_PREFIX=$build_dir/lite/gen_code GEN_CODE_PATH_PREFIX=$build_dir/lite/gen_code
...@@ -138,7 +129,6 @@ function make_tiny_publish_so { ...@@ -138,7 +129,6 @@ function make_tiny_publish_so {
-DANDROID_STL_TYPE=$android_stl \ -DANDROID_STL_TYPE=$android_stl \
-DLITE_BUILD_EXTRA=$BUILD_EXTRA \ -DLITE_BUILD_EXTRA=$BUILD_EXTRA \
-DLITE_WITH_CV=$BUILD_CV \ -DLITE_WITH_CV=$BUILD_CV \
-DLITE_WITH_ARM_LANG=$LITE_WITH_ARM_LANG \
-DLITE_BUILD_TAILOR=$BUILD_TAILOR \ -DLITE_BUILD_TAILOR=$BUILD_TAILOR \
-DLITE_OPTMODEL_DIR=$OPTMODEL_DIR \ -DLITE_OPTMODEL_DIR=$OPTMODEL_DIR \
-DLITE_WITH_NPU=$BUILD_NPU \ -DLITE_WITH_NPU=$BUILD_NPU \
...@@ -231,7 +221,6 @@ function make_full_publish_so { ...@@ -231,7 +221,6 @@ function make_full_publish_so {
-DANDROID_STL_TYPE=$android_stl \ -DANDROID_STL_TYPE=$android_stl \
-DLITE_BUILD_EXTRA=$BUILD_EXTRA \ -DLITE_BUILD_EXTRA=$BUILD_EXTRA \
-DLITE_WITH_CV=$BUILD_CV \ -DLITE_WITH_CV=$BUILD_CV \
-DLITE_WITH_ARM_LANG=$LITE_WITH_ARM_LANG \
-DLITE_BUILD_TAILOR=$BUILD_TAILOR \ -DLITE_BUILD_TAILOR=$BUILD_TAILOR \
-DLITE_OPTMODEL_DIR=$OPTMODEL_DIR \ -DLITE_OPTMODEL_DIR=$OPTMODEL_DIR \
-DLITE_WITH_NPU=$BUILD_NPU \ -DLITE_WITH_NPU=$BUILD_NPU \
...@@ -272,7 +261,6 @@ function make_all_tests { ...@@ -272,7 +261,6 @@ function make_all_tests {
-DWITH_TESTING=ON \ -DWITH_TESTING=ON \
-DLITE_BUILD_EXTRA=$BUILD_EXTRA \ -DLITE_BUILD_EXTRA=$BUILD_EXTRA \
-DLITE_WITH_CV=$BUILD_CV \ -DLITE_WITH_CV=$BUILD_CV \
-DLITE_WITH_ARM_LANG=$LITE_WITH_ARM_LANG \
-DLITE_WITH_NPU=$BUILD_NPU \ -DLITE_WITH_NPU=$BUILD_NPU \
-DNPU_DDK_ROOT=$NPU_DDK_ROOT \ -DNPU_DDK_ROOT=$NPU_DDK_ROOT \
-DLITE_WITH_XPU=$BUILD_XPU \ -DLITE_WITH_XPU=$BUILD_XPU \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册