diff --git a/mindspore/lite/test/models_mindspore.cfg b/mindspore/lite/test/models_mindspore.cfg index f408c7ef61..e4606e06c1 100644 --- a/mindspore/lite/test/models_mindspore.cfg +++ b/mindspore/lite/test/models_mindspore.cfg @@ -1,2 +1,2 @@ -ssd.pb +#ssd.pb mobilenet_v2.pb diff --git a/mindspore/lite/test/models_tflite_awaretraining.cfg b/mindspore/lite/test/models_tflite_awaretraining.cfg index 66dacbda9a..b92c4ec8d7 100644 --- a/mindspore/lite/test/models_tflite_awaretraining.cfg +++ b/mindspore/lite/test/models_tflite_awaretraining.cfg @@ -1,5 +1,5 @@ video_infer.tflite -mobilenet_v1_1.0_224_quant.tflite +#mobilenet_v1_1.0_224_quant.tflite mobilenet_v2_1.0_224_quant.tflite hiai_graph_8bit_combined.tflite inception_v1_224_quant.tflite diff --git a/model_zoo/official/lite/image_classification/.gitignore b/model_zoo/official/lite/image_classification/.gitignore index 59c69550a3..05c30827fc 100644 --- a/model_zoo/official/lite/image_classification/.gitignore +++ b/model_zoo/official/lite/image_classification/.gitignore @@ -1,6 +1,7 @@ # MindSpore build/ mindspore/lib +app/src/main/assets/model output *.ir mindspore/ccsrc/schema/inner/* diff --git a/model_zoo/official/lite/image_classification/app/download.gradle b/model_zoo/official/lite/image_classification/app/download.gradle index 62601fbbe7..595c5faae0 100644 --- a/model_zoo/official/lite/image_classification/app/download.gradle +++ b/model_zoo/official/lite/image_classification/app/download.gradle @@ -14,7 +14,7 @@ def mindSporeLibrary_arm64 = "libs/arm64-v8a/libmindspore-lite.so" def openCVlibIncluding_arm64 = "src/main/cpp/include/opencv2/include.zip" def mindSporeLibIncluding_arm64 = "src/main/cpp/include/MindSpore/include.zip" -def modelDownloadUrl = "https://download.mindspore.cn/model_zoo/official/lite/mobilenetv2_openimage_lite/mobilenetv2.ms" +def modelDownloadUrl = "https://download.mindspore.cn/model_zoo/official/lite/mobilenetv2_openimage_lite/mobilenetv2_0.7.ms" def opencvDownloadUrl = "https://download.mindspore.cn/model_zoo/official/lite/lib/opencv%204.4.0/libopencv_java4.so" def mindsporeLiteDownloadUrl = "https://download.mindspore.cn/model_zoo/official/lite/lib/mindspore%20version%200.7/libmindspore-lite.so" def opencvincludeDownloadUrl = "https://download.mindspore.cn/model_zoo/official/lite/lib/opencv%204.4.0/include.zip" diff --git a/model_zoo/official/lite/image_classification/app/src/main/assets/model/mobilenetv2.ms b/model_zoo/official/lite/image_classification/app/src/main/assets/model/mobilenetv2.ms deleted file mode 100644 index 5fa58672c6..0000000000 Binary files a/model_zoo/official/lite/image_classification/app/src/main/assets/model/mobilenetv2.ms and /dev/null differ diff --git a/model_zoo/official/lite/image_classification/app/src/main/cpp/MSNetWork.h b/model_zoo/official/lite/image_classification/app/src/main/cpp/MSNetWork.h index 2412019e39..2d93306cff 100644 --- a/model_zoo/official/lite/image_classification/app/src/main/cpp/MSNetWork.h +++ b/model_zoo/official/lite/image_classification/app/src/main/cpp/MSNetWork.h @@ -52,7 +52,6 @@ class MSNetWork { int ReleaseNets(void); - protected: mindspore::session::LiteSession *session; mindspore::lite::Model *model; static const int RET_CATEGORY_SUM = 601;