From 6091c55769bab1b8f4a9fa7b709c7595bca70ed6 Mon Sep 17 00:00:00 2001 From: eclipsess Date: Mon, 2 Jul 2018 19:21:06 +0800 Subject: [PATCH] format --- .../central-arm-func/conv_add_bn_relu_func.h | 1 - tools/run.sh | 40 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 tools/run.sh diff --git a/src/operators/kernel/central-arm-func/conv_add_bn_relu_func.h b/src/operators/kernel/central-arm-func/conv_add_bn_relu_func.h index 3f0b249619..13fe50bf74 100644 --- a/src/operators/kernel/central-arm-func/conv_add_bn_relu_func.h +++ b/src/operators/kernel/central-arm-func/conv_add_bn_relu_func.h @@ -21,7 +21,6 @@ limitations under the License. */ namespace paddle_mobile { namespace operators { void ConvAddBNReluBasic(const FusionConvAddBNReluParam ¶m) { - const Tensor *input = param.Input(); Tensor filter = *param.Filter(); Tensor bias = *param.Bias(); diff --git a/tools/run.sh b/tools/run.sh new file mode 100644 index 0000000000..262f1b6b93 --- /dev/null +++ b/tools/run.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env sh + +push_fn () { +#sh build.sh android +MODELS_PATH="../test/models/*" +MODELS_SRC="../test/models" +IMAGE_PATH="../test/images/*" +EXE_FILE="../test/build/*" +EXE_DIR="data/local/tmp/bin" +adb shell mkdir ${EXE_DIR} +MODELS_DIR="data/local/tmp/models" +adb shell mkdir ${MODELS_DIR} +for file in `ls ${MODELS_SRC}` +do + adb shell mkdir ${MODELS_DIR}"/"${file} +done + +if [[ -d "../src/operators/kernel/mali/ACL_Android/build" ]]; then +ACL_BUILD_PATH="../src/operators/kernel/mali/ACL_Android/build/*" +adb push ${ACL_BUILD_PATH} ${EXE_DIR} +fi + +IMAGES_DIR="data/local/tmp/images" +adb shell mkdir ${IMAGES_DIR} +LIB_PATH="../build/release/arm-v7a/build/*" +adb push ${EXE_FILE} ${EXE_DIR} +adb push ${LIB_PATH} ${EXE_DIR} +if [[ $1 != "npm" ]]; then +adb push ${IMAGE_PATH} ${IMAGES_DIR} +adb push ${MODELS_PATH} ${MODELS_DIR} +fi + +adb shell "cd /data/local/tmp/bin; LD_LIBRARY_PATH=. ./test-mobilenetssd" +} + +if [[ $1 == "npm" ]]; then +push_fn $1 +else +push_fn +fi -- GitLab