diff --git a/src/common/types.h b/src/common/types.h index 272db3ef70f5bf923487fd29b2666f94707040bf..092c251552ef8007a4000f6b84dce1bbc4059b91 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -115,6 +115,7 @@ static std::unordered_map< {{"PriorBox", "PriorBoxVar", "TargetBox"}, {"OutputBox"}}}, {G_OP_TYPE_PRIOR_BOX, {{"Image", "Input"}, {"Boxes", "Variances"}}}, {G_OP_TYPE_MULTICLASS_NMS, {{"BBoxes", "Scores"}, {"Out"}}}, + {G_OP_TYPE_FC, {{"X", "Y", "Z"}, {"Out"}}}, {G_OP_TYPE_RESHAPE, {{"X"}, {"Out"}}}, {G_OP_TYPE_DEPTHWISE_CONV, {{"Input"}, {"Output"}}}}; } // namespace paddle_mobile diff --git a/tools/scripts/push2android.sh b/tools/scripts/push2android.sh index 33737f2ed37a233dc17892591f429a24c1832a4b..52ca8b2748603fb4d8168136993b5732bf4547c3 100644 --- a/tools/scripts/push2android.sh +++ b/tools/scripts/push2android.sh @@ -2,16 +2,29 @@ push_fn () { 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 + 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} adb push ${IMAGE_PATH} ${IMAGES_DIR} adb push ${MODELS_PATH} ${MODELS_DIR} -echo "test files sync completed" +echo "test-op or test-net below : " +adb shell ls /data/local/tmp/bin +echo "**** choose OP or NET to test ****" +read -p "which to test : " test_name +adb shell "cd /data/local/tmp/bin; LD_LIBRARY_PATH=. ./${test_name}" } push_fn