delete opencv2

debug mindata

use new download

model_zoo/official/lite/image_classification/.gitignore

@@ -1,6 +1,8 @@
 # MindSpore
 build/
 mindspore/lib
+app/src/main/assets/model/
+app/src/main/cpp/mindspore-lite-0.7.0-minddata-arm64-cpu
 output
 *.ir
 mindspore/ccsrc/schema/inner/*

model_zoo/official/lite/image_classification/README.md

@@ -7,9 +7,9 @@
 
 - Android Studio >= 3.2 (推荐4.0以上版本)
 - NDK 21.3
-- CMake 3.10
+- CMake 3.10.2   [CMake](https://cmake.org/download) 
 - Android SDK >= 26
-- OpenCV >= 4.0.0
+- JDK >= 1.8   [JDK]( https://www.oracle.com/downloads/otn-pub/java/JDK/)   
 
 ### 构建与运行
 
@@ -29,12 +29,14 @@
 
     通过USB连接Android设备调试，点击`Run 'app'`即可在您的设备上运行本示例项目。
 
-    * 注：编译过程中Android Studio会自动下载MindSpore Lite、OpenCV、模型文件等相关依赖项，编译过程需做耐心等待。
+    * 注：编译过程中Android Studio会自动下载MindSpore Lite、模型文件等相关依赖项，编译过程需做耐心等待。
 
     ![run_app](images/run_app.PNG)
 
     Android Studio连接设备调试操作，可参考<https://developer.android.com/studio/run/device?hl=zh-cn>。
 
+    手机需开启“USB调试模式”，Android Studio 才能识别到手机。 华为手机一般在设置->系统和更新->开发人员选项->USB调试中开始“USB调试模型”。
+
 3. 在Android设备上，点击“继续安装”，安装完即可查看到设备摄像头捕获的内容和推理结果。
 
     ![install](images/install.jpg)
@@ -54,29 +56,22 @@
 
 ```
 app
-|
-├── libs # 存放demo jni层依赖的库文件
-│   └── arm64-v8a
-│       ├── libopencv_java4.so  # opencv
-│       ├── libmlkit-label-MS.so  # ndk编译生成的库文件
-│       └── libmindspore-lite.so # mindspore lite
-|
 ├── src/main
 │   ├── assets # 资源文件
 |   |   └── mobilenetv2.ms # 存放模型文件
 │   |
 │   ├── cpp # 模型加载和预测主要逻辑封装类
-|   |   ├── include # 存放MindSpore调用相关的头文件
+|   |   ├── ..
-|   |   |   └── ...
+|   |   ├── mindspore_lite_x.x.x-minddata-arm64-cpu #MindSpore Lite版本
-│   |   |
 |   |   ├── MindSporeNetnative.cpp # MindSpore调用相关的JNI方法
 │   |   └── MindSporeNetnative.h # 头文件
+|   |   └── MsNetWork.cpp # MindSpre接口封装
 │   |
 │   ├── java # java层应用代码
 │   │   └── com.huawei.himindsporedemo 
 │   │       ├── gallery.classify # 图像处理及MindSpore JNI调用相关实现
 │   │       │   └── ...
-│   │       └── obejctdetect # 开启摄像头及绘制相关实现
+│   │       └── widget # 开启摄像头及绘制相关实现
 │   │           └── ...
 │   │   
 │   ├── res # 存放Android相关的资源文件
@@ -85,7 +80,7 @@ app
 ├── CMakeList.txt # cmake编译入口文件
 │
 ├── build.gradle # 其他Android配置文件
-├── download.gradle # APP构建时由gradle自动从HuaWei Server下载依赖的库文件及模型文件
+├── download.gradle # 工程依赖文件下载
 └── ...
 ```
 
@@ -93,20 +88,11 @@ app
 
 Android JNI层调用MindSpore C++ API时，需要相关库文件支持。可通过MindSpore Lite源码编译生成`libmindspore-lite.so`库文件。
 
-在Android Studio中将编译完成的`libmindspore-lite.so`库文件（可包含多个兼容架构），分别放置在APP工程的`app/libs/arm64-v8a`（ARM64）或`app/libs/armeabi-v7a`（ARM32）目录下，并在应用的`build.gradle`文件中配置CMake编译支持，以及`arm64-v8a`和`armeabi-v7a`的编译支持。
+本示例中，build过程由download.gradle文件自动从华为服务器下载MindSpore Lite 版本文件，并放置在`app / src / main/cpp/mindspore_lite_x.x.x-minddata-arm64-cpu`目录下。
-
-本示例中，build过程由download.gradle文件自动从华为服务器下载libmindspore-lite.so以及OpenCV的libopencv_java4.so库文件，并放置在`app/libs/arm64-v8a`目录下。
 
 * 注：若自动下载失败，请手动下载相关库文件并将其放在对应位置：
 
-  libmindspore-lite.so [下载链接](https://download.mindspore.cn/model_zoo/official/lite/lib/mindspore%20version%200.7/libmindspore-lite.so)
+  MindSpore Lite版本 [下载链接](https://download.mindspore.cn/model_zoo/official/lite/lib/mindspore%20version%200.7/libmindspore-lite.so)
-
-  libmindspore-lite include文件  [下载链接](https://download.mindspore.cn/model_zoo/official/lite/lib/mindspore%20version%200.7/include.zip)
-
-  libopencv_java4.so  [下载链接](https://download.mindspore.cn/model_zoo/official/lite/lib/opencv%204.4.0/libopencv_java4.so)
-
-  libopencv include文件  [下载链接](https://download.mindspore.cn/model_zoo/official/lite/lib/opencv%204.4.0/include.zip)
-
 
 
 ```
@@ -128,23 +114,29 @@ android{
 在`app/CMakeLists.txt`文件中建立`.so`库文件链接，如下所示。
 
 ```
-# Set MindSpore Lite Dependencies.
+# ============== Set MindSpore Dependencies. =============
-include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/include/MindSpore)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/third_party/flatbuffers/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION})
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include/ir/dtype)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include/schema)
+
 add_library(mindspore-lite SHARED IMPORTED )
-set_target_properties(mindspore-lite PROPERTIES
+add_library(minddata-lite SHARED IMPORTED )
-    IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/libs/libmindspore-lite.so")
 
-# Set OpenCV Dependecies.
+set_target_properties(mindspore-lite PROPERTIES IMPORTED_LOCATION
-include_directories(${CMAKE_SOURCE_DIR}/opencv/sdk/native/jni/include)
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/lib/libmindspore-lite.so)
-add_library(lib-opencv SHARED IMPORTED )
+set_target_properties(minddata-lite PROPERTIES IMPORTED_LOCATION
-set_target_properties(lib-opencv PROPERTIES
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/lib/libminddata-lite.so)
-    IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/libs/libopencv_java4.so")
+# --------------- MindSpore Lite set End. --------------------
 
 # Link target library.       
 target_link_libraries(
     ...
+     # --- mindspore ---
+        minddata-lite
         mindspore-lite
-    lib-opencv
     ...
 )
 ```
@@ -189,12 +181,12 @@ target_link_libraries(
         
     - 加载模型文件并构建用于推理的计算图
         ```cpp
-        void MSNetWork::CreateSessionMS(char* modelBuffer, size_t bufferLen, mindspore::lite::Context* ctx)
+        void MSNetWork::CreateSessionMS(char* modelBuffer, size_t bufferLen, std::string name, mindspore::lite::Context* ctx)
         {
             CreateSession(modelBuffer, bufferLen, ctx);  
             session = mindspore::session::LiteSession::CreateSession(ctx);
             auto model = mindspore::lite::Model::Import(modelBuffer, bufferLen);
-            int ret = session->CompileGraph(model); // Compile Graph 
+            int ret = session->CompileGraph(model);
         }
         ```
     
@@ -240,26 +232,30 @@ target_link_libraries(
 
    - 获取输出数据。
         ```cpp
-        // Get the mindspore inference results.
+        auto names = mSession->GetOutputTensorNames();
-        auto msOutputs = mSession->GetOutputMapByNode();
+        std::unordered_map<std::string,mindspore::tensor::MSTensor *> msOutputs;
-        std::string retStr = ProcessRunnetResult(msOutputs);
+        for (const auto &name : names) {
+            auto temp_dat =mSession->GetOutputByTensorName(name);
+            msOutputs.insert(std::pair<std::string, mindspore::tensor::MSTensor *> {name, temp_dat});
+          }
+        std::string retStr = ProcessRunnetResult(msOutputs, ret);
         ```
         
    - 输出数据的后续处理。
         ```cpp
-        std::string ProcessRunnetResult(
+        std::string ProcessRunnetResult(std::unordered_map<std::string,
-                std::unordered_map<std::string, std::vector<mindspore::tensor::MSTensor *>> msOutputs){
+                mindspore::tensor::MSTensor *> msOutputs, int runnetRet) {
         
-            // Get the branch of the model output.
+       std::unordered_map<std::string, mindspore::tensor::MSTensor *>::iterator iter;
-            // Use iterators to get map elements.
-            std::unordered_map<std::string, std::vector<mindspore::tensor::MSTensor *>>::iterator iter;
           iter = msOutputs.begin();
         
           // The mobilenetv2.ms model output just one branch.
-            auto outputString = iter->first;
     auto outputTensor = iter->second;
+          int tensorNum = outputTensor->ElementsNum();
+          MS_PRINT("Number of tensor elements:%d", tensorNum);
         
-            float *temp_scores = static_cast<float * >(branch1_tensor[0]->MutableData());
+     // Get a pointer to the first score.
+          float *temp_scores = static_cast<float * >(outputTensor->MutableData());
         
           float scores[RET_CATEGORY_SUM];
           for (int i = 0; i < RET_CATEGORY_SUM; ++i) {
@@ -269,10 +265,11 @@ target_link_libraries(
             scores[i] = temp_scores[i];
           }
    
+          // Score for each category.
           // Converted to text information that needs to be displayed in the APP.
           std::string categoryScore = "";
           for (int i = 0; i < RET_CATEGORY_SUM; ++i) {
-                    categoryScore += g_labels_name_map[i];
+            categoryScore += labels_name_map[i];
             categoryScore += ":";
             std::string score_str = std::to_string(scores[i]);
             categoryScore += score_str;

model_zoo/official/lite/image_classification/app/CMakeLists.txt

@@ -6,39 +6,28 @@
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
-set(libs  ${CMAKE_SOURCE_DIR}/libs)
-
-
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY  ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI})
 
+set(MINDSPORELITE_VERSION  mindspore-lite-0.7.0-minddata-arm64-cpu)
 
 # ============== Set MindSpore Dependencies. =============
-include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/include)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp)
-include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/include/MindSpore)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/third_party/flatbuffers/include)
-include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/include/MindSpore/flatbuffers)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION})
-include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/include/MindSpore/ir/dtype)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include)
-include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/include/MindSpore/schema)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include/ir/dtype)
+include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/include/schema)
 
 add_library(mindspore-lite SHARED IMPORTED )
+add_library(minddata-lite SHARED IMPORTED )
 
 set_target_properties(mindspore-lite PROPERTIES IMPORTED_LOCATION
-        ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libmindspore-lite.so)
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/lib/libmindspore-lite.so)
+set_target_properties(minddata-lite PROPERTIES IMPORTED_LOCATION
+        ${CMAKE_SOURCE_DIR}/src/main/cpp/${MINDSPORELITE_VERSION}/lib/libminddata-lite.so)
 # --------------- MindSpore Lite set End. --------------------
 
 
-
-# =============== Set OpenCV Dependencies ===================
-
-include_directories(${CMAKE_SOURCE_DIR}/opencv/sdk/native/jni/include/)
-
-add_library(lib-opencv SHARED IMPORTED )
-
-set_target_properties(lib-opencv PROPERTIES IMPORTED_LOCATION
-        ${CMAKE_SOURCE_DIR}/libs/${ANDROID_ABI}/libopencv_java4.so)
-
-# --------------- OpenCV set End. ---------------------------
-
-
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
 # You can define multiple libraries, and CMake builds them for you.
@@ -79,10 +68,8 @@ add_definitions(-DMNN_USE_LOGCAT)
 target_link_libraries( # Specifies the target library.
         mlkit-label-MS
 
-        # --- opencv ---
-        lib-opencv
-
         # --- mindspore ---
+        minddata-lite
         mindspore-lite
 
         # --- other dependencies.---

model_zoo/official/lite/image_classification/app/build.gradle

@@ -49,7 +49,7 @@ android {
         }
     }
     packagingOptions{
-        pickFirst 'lib/arm64-v8a/libopencv_java4.so'
+        pickFirst 'lib/arm64-v8a/libminddata-lite.so'
         pickFirst 'lib/arm64-v8a/libmindspore-lite.so'
         pickFirst 'lib/arm64-v8a/libmlkit-label-MS.so'
     }

model_zoo/official/lite/image_classification/app/download.gradle

@@ -1,27 +1,18 @@
 /**
  * To download necessary library from HuaWei server.
- * Including mindspore-lite .so file, opencv .so file and model file.
+ * Including mindspore-lite .so file, minddata-lite .so file and model file.
  * The libraries can be downloaded manually.
  */
-
+def targetMindSporeInclude = "src/main/cpp/"
-def targetopenCVInclude = "src/main/cpp/include"
+def mindsporeLite_Version = "mindspore-lite-0.7.0-minddata-arm64-cpu"
-def targetMindSporeInclude = "src/main/cpp/include"
-
 
 def targetModelFile = "src/main/assets/model/mobilenetv2.ms"
-def openCVLibrary_arm64 = "libs/arm64-v8a/libopencv_java4.so"
+def mindSporeLibrary_arm64 = "src/main/cpp/${mindsporeLite_Version}.tar.gz"
-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 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%201.0/${mindsporeLite_Version}.tar.gz"
-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"
-def mindsporeIncludeDownloadUrl = "https://download.mindspore.cn/model_zoo/official/lite/lib/mindspore%20version%200.7/include.zip"
 
-def cleantargetopenCVInclude = "src/main/cpp/include/opencv2"
+def cleantargetMindSporeInclude = "src/main/cpp"
-def cleantargetMindSporeInclude = "src/main/cpp/include/MindSpore"
 
 
 task downloadModelFile(type: DownloadUrlTask) {
@@ -32,15 +23,6 @@ task downloadModelFile(type: DownloadUrlTask) {
     target = file("${targetModelFile}")
 }
 
-
-task downloadOpenCVLibrary(type: DownloadUrlTask) {
-    doFirst {
-        println "Downloading ${opencvDownloadUrl}"
-    }
-    sourceUrl = "${opencvDownloadUrl}"
-    target = file("${openCVLibrary_arm64}")
-}
-
 task downloadMindSporeLibrary(type: DownloadUrlTask) {
     doFirst {
         println "Downloading ${mindsporeLiteDownloadUrl}"
@@ -49,80 +31,36 @@ task downloadMindSporeLibrary(type: DownloadUrlTask) {
     target = file("${mindSporeLibrary_arm64}")
 }
 
-task downloadopecvIncludeLibrary(type: DownloadUrlTask) {
+task unzipMindSporeInclude(type: Copy, dependsOn: 'downloadMindSporeLibrary') {
-    doFirst {
-        println "Downloading ${opencvincludeDownloadUrl}"
-    }
-    sourceUrl = "${opencvincludeDownloadUrl}"
-    target = file("${openCVlibIncluding_arm64}")
-}
-
-task downloadMindSporeIncludeLibrary(type: DownloadUrlTask) {
-    doFirst {
-        println "Downloading ${mindsporeIncludeDownloadUrl}"
-    }
-    sourceUrl = "${mindsporeIncludeDownloadUrl}"
-    target = file("${mindSporeLibIncluding_arm64}")
-}
-
-task unzipopencvInclude(type: Copy, dependsOn: 'downloadopecvIncludeLibrary') {
     doFirst {
-        println "Unzipping ${openCVlibIncluding_arm64}"
+        println "Unzipping ${mindSporeLibrary_arm64}"
-    }
-    from zipTree("${openCVlibIncluding_arm64}")
-    into "${targetopenCVInclude}"
     }
-
+    from tarTree(resources.gzip("${mindSporeLibrary_arm64}"))
-task unzipMindSporeInclude(type: Copy, dependsOn: 'downloadMindSporeIncludeLibrary') {
-    doFirst {
-        println "Unzipping ${mindSporeLibIncluding_arm64}"
-    }
-    from zipTree("${mindSporeLibIncluding_arm64}")
     into "${targetMindSporeInclude}"
 }
 
-task cleanUnusedopencvFiles(type: Delete, dependsOn: ['unzipopencvInclude']) {
-    delete fileTree("${cleantargetopenCVInclude}").matching {
-        include "*.zip"
-    }
-}
 task cleanUnusedmindsporeFiles(type: Delete, dependsOn: ['unzipMindSporeInclude']) {
     delete fileTree("${cleantargetMindSporeInclude}").matching {
-        include "*.zip"
+        include "*.tar.gz"
     }
 }
 /*
  * Using preBuild to download mindspore library, opencv library and model file.
  * Run before gradle build.
  */
-if (file("libs/arm64-v8a/libmindspore-lite.so").exists()){
+if (file("src/main/cpp/${mindsporeLite_Version}/lib/libmindspore-lite.so").exists()){
     downloadMindSporeLibrary.enabled = false
+    unzipMindSporeInclude.enabled = false
+    cleanUnusedmindsporeFiles.enabled = false
 }
 
-if (file("libs/arm64-v8a/libopencv_java4.so").exists()){
-    downloadOpenCVLibrary.enabled = false
-}
 if (file("src/main/assets/model/mobilenetv2.ms").exists()){
     downloadModelFile.enabled = false
 }
 
-if (file("src/main/cpp/include/MindSpore/lite_session.h").exists()){
-    downloadMindSporeIncludeLibrary.enabled = false
-    unzipopencvInclude.enabled = false
-    cleanUnusedopencvFiles.enabled =false
-}
-if (file("src/main/cpp/include/opencv2/core.hpp").exists()){
-    downloadopecvIncludeLibrary.enabled = false
-    unzipMindSporeInclude.enabled = false
-    cleanUnusedmindsporeFiles.enabled =false
-}
-
-preBuild.dependsOn downloadMindSporeLibrary
-preBuild.dependsOn downloadOpenCVLibrary
 preBuild.dependsOn downloadModelFile
-preBuild.dependsOn unzipopencvInclude
+preBuild.dependsOn downloadMindSporeLibrary
 preBuild.dependsOn unzipMindSporeInclude
-preBuild.dependsOn cleanUnusedopencvFiles
 preBuild.dependsOn cleanUnusedmindsporeFiles
 
 class DownloadUrlTask extends DefaultTask {

model_zoo/official/lite/image_classification/app/src/main/cpp/MSNetWork.cpp

@@ -18,7 +18,7 @@
 #include <android/log.h>
 #include <iostream>
 #include <string>
-#include "include/MindSpore/errorcode.h"
+#include "include/errorcode.h"
 
 #define MS_PRINT(format, ...) __android_log_print(ANDROID_LOG_INFO, "MSJNI", format, ##__VA_ARGS__)
 
@@ -54,8 +54,6 @@ int MSNetWork::ReleaseNets(void) {
   return 0;
 }
 
-const int MSNetWork::RET_CATEGORY_SUM = 601;
-
 const char *MSNetWork::labels_name_map[MSNetWork::RET_CATEGORY_SUM] = {
     {"Tortoise"}, {"Container"}, {"Magpie"}, {"Seaturtle"}, {"Football"}, {"Ambulance"}, {"Ladder"},
     {"Toothbrush"}, {"Syringe"}, {"Sink"}, {"Toy"}, {"Organ(MusicalInstrument) "}, {"Cassettedeck"},

model_zoo/official/lite/image_classification/app/src/main/cpp/MSNetWork.h

@@ -52,10 +52,9 @@ class MSNetWork {
 
   int ReleaseNets(void);
 
- private:
   mindspore::session::LiteSession *session;
   mindspore::lite::Model *model;
-  static const int RET_CATEGORY_SUM;
+  static const int RET_CATEGORY_SUM = 601;
   static const char *labels_name_map[RET_CATEGORY_SUM];
 };
 #endif