Merge pull request #334 from codeWorm2015/develop

#333 add push2android images folder

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"
 }

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:
 };

test/framework/test_optimize.cpp

@@ -20,7 +20,7 @@ limitations under the License. */
 int main() {
   paddle_mobile::Loader<paddle_mobile::CPU> 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);

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";