diff --git a/scripts/push2android.sh b/scripts/push2android.sh index 44b0ee32e99ccddf5cc6060882dc37158c149693..ef00f58a96097f0596f3aab0fc8287541096ee5b 100644 --- a/scripts/push2android.sh +++ b/scripts/push2android.sh @@ -2,12 +2,15 @@ push_fn () { MODELS_PATH="../test/models/*" +IMAGE_PATH="../test/images/*" EXE_FILE="../test/build/*" EXE_DIR="data/local/tmp/bin" MODELS_DIR="data/local/tmp/models" +IMAGES_DIR="data/local/tmp/images" 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" } diff --git a/src/operators/fusion_conv_add_relu_op.h b/src/operators/fusion_conv_add_relu_op.h index e93c910d2b3132fb1894043a7c6aa3c8593dbb20..2b7f0274f665b484c34f8645ece539644764b8e0 100644 --- a/src/operators/fusion_conv_add_relu_op.h +++ b/src/operators/fusion_conv_add_relu_op.h @@ -37,7 +37,7 @@ class FushionConvAddReluOpMatcher : public framework::FusionOpMatcher { std::string Type() { return G_OP_TYPE_FUSION_CONV_ADD_RELU; } }; -class FusionFcOp { +class ConvAddReluOp { public: private: }; diff --git a/test/framework/test_optimize.cpp b/test/framework/test_optimize.cpp index f0392cfec02c8ea764cd3d6dc9f50b2415c39e2c..faa69847c6e17b7f6cccb3602f6b4d81b8ffd002 100644 --- a/test/framework/test_optimize.cpp +++ b/test/framework/test_optimize.cpp @@ -20,7 +20,7 @@ limitations under the License. */ int main() { paddle_mobile::Loader loader; // "../../../test/models/googlenet" - auto program = loader.Load(g_googlenet); + auto program = loader.Load(g_mobilenet_ssd); paddle_mobile::framework::ProgramOptimize optimize; // program.originProgram->Description("origin"); auto optimize_program = optimize.FushionOptimize(program.originProgram); diff --git a/test/test_helper.h b/test/test_helper.h index fc4ed6c91dc9b03c1f4dadfd8a4bc94efe3a724e..14ade768e7360ec494e2bc208bbb9a67a6a74540 100644 --- a/test/test_helper.h +++ b/test/test_helper.h @@ -26,8 +26,7 @@ static const std::string g_googlenet = "../models/googlenet"; static const std::string g_mobilenet = "../models/mobilenet"; static const std::string g_mobilenet_ssd = "../models/mobilenet+ssd"; static const std::string g_squeezenet = "../models/squeezenet"; -static const std::string g_resnet = - "../models/image_classification_resnet.inference.model"; +static const std::string g_resnet = "../models/resnet"; static const std::string g_yolo = "../models/yolo"; static const std::string g_test_image_1x3x224x224 = "../images/test_image_1x3x224x224_float";