diff --git a/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv7 b/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv7 index dd6d4b0960160e140e2f051b78814d2fee08d5e0..486ebf3bc34fa6fa0fd7bc5b4805c1fc757adf2b 100644 --- a/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv7 +++ b/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv7 @@ -43,7 +43,7 @@ CXX_LIBS = ${OPENCV_LIBS} -L$(LITE_ROOT)/cxx/lib/ -lpaddle_light_api_shared $(SY mask_detection: fetch_opencv mask_detection.o $(CC) $(SYSROOT_LINK) $(CXXFLAGS_LINK) mask_detection.o -o mask_detection $(CXX_LIBS) $(LDFLAGS) -mask_detection.o: mask_detection.cc +mask_detection.o: fetch_opencv mask_detection.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o mask_detection.o -c mask_detection.cc fetch_opencv: diff --git a/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv8 b/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv8 index c2f601ed2f68c342b47c5add451f84c537f978de..5bc714eb8831fd53ca0093fce6f70f9bec28815b 100644 --- a/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv8 +++ b/lite/demo/cxx/makefiles/mask_detection/Makefile.android.armv8 @@ -43,7 +43,7 @@ CXX_LIBS = ${OPENCV_LIBS} -L$(LITE_ROOT)/cxx/lib/ -lpaddle_light_api_shared $(SY mask_detection: fetch_opencv mask_detection.o $(CC) $(SYSROOT_LINK) $(CXXFLAGS_LINK) mask_detection.o -o mask_detection $(CXX_LIBS) $(LDFLAGS) -mask_detection.o: mask_detection.cc +mask_detection.o: fetch_opencv mask_detection.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o mask_detection.o -c mask_detection.cc fetch_opencv: diff --git a/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv7 b/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv7 index fe808ef7ec571bb73b2aa7c4888ba447a35ad8bd..39c2caa20bd566a2bb4480d302447187bc7a5e7a 100644 --- a/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv7 +++ b/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv7 @@ -42,13 +42,13 @@ fetch_opencv: @ test -d ${THIRD_PARTY_DIR}/${OPENCV_VERSION} || \ tar -zxvf ${THIRD_PARTY_DIR}/${OPENCV_VERSION}.tar.gz -C ${THIRD_PARTY_DIR} -test_helper.o: test_helper.cc +test_helper.o: fetch_opencv test_helper.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o test_helper.o -c test_helper.cc -classification_full.o: classification_full.cc +classification_full.o: fetch_opencv classification_full.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o classification_full.o -c classification_full.cc -classification_light.o: classification_light.cc +classification_light.o: fetch_opencv classification_light.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o classification_light.o -c classification_light.cc classification_full_shared: fetch_opencv classification_full.o test_helper.o @@ -64,10 +64,10 @@ classification_light_static: fetch_opencv classification_light.o test_helper.o $(CC) $(SYSROOT_LINK) $(CXXFLAGS_LINK) classification_light.o test_helper.o -o classification_light_static ${LITE_LIGHT_STATIC_LIBS} $(CXX_LIBS) $(LDFLAGS) ###### -yolov3_full.o: yolov3_full.cc +yolov3_full.o: fetch_opencv yolov3_full.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o yolov3_full.o -c yolov3_full.cc -yolov3_light.o: yolov3_light.cc +yolov3_light.o: fetch_opencv yolov3_light.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o yolov3_light.o -c yolov3_light.cc yolov3_full_shared: fetch_opencv yolov3_full.o test_helper.o @@ -88,8 +88,8 @@ all: classification_full_shared classification_full_static classification_light_ clean: rm -f *.o rm -f classification_full_shared - rm -r classification_full_static - rm -r classification_light_shared + rm -f classification_full_static + rm -f classification_light_shared rm -f classification_light_static rm -f yolov3_full_shared rm -f yolov3_full_static diff --git a/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv8 b/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv8 index f87143a92043e2c011c572bac78a9eb420bacaf1..556fe9c772fc4a39d13ba9649c854c32b3370d8f 100644 --- a/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv8 +++ b/lite/demo/cxx/makefiles/test_libs/Makefile.android.armv8 @@ -42,13 +42,13 @@ fetch_opencv: @ test -d ${THIRD_PARTY_DIR}/${OPENCV_VERSION} || \ tar -zxvf ${THIRD_PARTY_DIR}/${OPENCV_VERSION}.tar.gz -C ${THIRD_PARTY_DIR} -test_helper.o: test_helper.cc +test_helper.o: fetch_opencv test_helper.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o test_helper.o -c test_helper.cc -classification_full.o: classification_full.cc +classification_full.o: fetch_opencv classification_full.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o classification_full.o -c classification_full.cc -classification_light.o: classification_light.cc +classification_light.o: fetch_opencv classification_light.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o classification_light.o -c classification_light.cc classification_full_shared: fetch_opencv classification_full.o test_helper.o @@ -64,10 +64,10 @@ classification_light_static: fetch_opencv classification_light.o test_helper.o $(CC) $(SYSROOT_LINK) $(CXXFLAGS_LINK) classification_light.o test_helper.o -o classification_light_static ${LITE_LIGHT_STATIC_LIBS} $(CXX_LIBS) $(LDFLAGS) ###### -yolov3_full.o: yolov3_full.cc +yolov3_full.o: fetch_opencv yolov3_full.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o yolov3_full.o -c yolov3_full.cc -yolov3_light.o: yolov3_light.cc +yolov3_light.o: fetch_opencv yolov3_light.cc $(CC) $(SYSROOT_COMPLILE) $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o yolov3_light.o -c yolov3_light.cc yolov3_full_shared: fetch_opencv yolov3_full.o test_helper.o @@ -88,8 +88,8 @@ all: classification_full_shared classification_full_static classification_light_ clean: rm -f *.o rm -f classification_full_shared - rm -r classification_full_static - rm -r classification_light_shared + rm -f classification_full_static + rm -f classification_light_shared rm -f classification_light_static rm -f yolov3_full_shared rm -f yolov3_full_static diff --git a/lite/demo/cxx/mask_detection/prepare.sh b/lite/demo/cxx/mask_detection/prepare.sh index 12aad79fee575f5b09cb01870da55afc8dd11fc3..e736b145590e08160a27931ba6f8198c0aef992a 100644 --- a/lite/demo/cxx/mask_detection/prepare.sh +++ b/lite/demo/cxx/mask_detection/prepare.sh @@ -17,7 +17,7 @@ if [ ! -f "mask_models_img.tar.gz" ]; then wget -c https://paddle-inference-dist.cdn.bcebos.com/PaddleLiteDemo/mask_models_img.tar.gz fi -tar zxvf mask_models_img.tar.gz +tar zxf mask_models_img.tar.gz mv mask_models_img ${gf} # clean diff --git a/lite/demo/cxx/test_libs/prepare.sh b/lite/demo/cxx/test_libs/prepare.sh index 9c8baf3f1afb7c785b0fb1621910739821b370b0..ff1aca7cf3bc68777b7172e4497c40888778a1ae 100644 --- a/lite/demo/cxx/test_libs/prepare.sh +++ b/lite/demo/cxx/test_libs/prepare.sh @@ -25,6 +25,6 @@ mv ${gf}/cxx ${gf}/lite if [ ! -f "test_libs_models_imgs.tgz" ];then wget https://paddle-inference-dist.cdn.bcebos.com/PaddleLite/test_libs_models_imgs.tgz fi -tar zxvf test_libs_models_imgs.tgz +tar zxf test_libs_models_imgs.tgz mv test_libs_models_imgs ${gf} mv ${gf}/test_libs_models_imgs ${gf}/models_imgs