Merge pull request #1026 from xiebaiyuan/develop

add rasberry supported #910

CMakeLists.txt

-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.0)
 option(USE_OPENMP "openmp support" OFF)
 
 project(paddle-mobile)

src/jni/PML.java

@@ -9,6 +9,14 @@ public class PML {
      */
     public static native boolean load(String modelDir);
 
+    /**
+     * load seperated model
+     *
+     * @param modelDir model dir
+     * @return isloadsuccess
+     */
+    public static native boolean loadnlp(String modelDir);
+
     /**
      * load combined model
      *

src/jni/paddle_mobile_jni.cpp

@@ -74,6 +74,28 @@ JNIEXPORT jboolean JNICALL Java_com_baidu_paddle_PML_load(JNIEnv *env,
   return static_cast<jboolean>(isLoadOk);
 }
 
+JNIEXPORT jboolean JNICALL
+Java_com_baidu_paddle_PML_loadnlp(JNIEnv *env, jclass thiz, jstring modelPath) {
+  std::lock_guard<std::mutex> lock(shared_mutex);
+  ANDROIDLOGI("load invoked");
+  bool optimize = true;
+  bool isLoadOk = false;
+
+#ifdef ENABLE_EXCEPTION
+  try {
+    isLoadOk = getPaddleMobileInstance()->Load(
+        jstring2cppstring(env, modelPath), optimize, false, 1, true);
+  } catch (paddle_mobile::PaddleMobileException &e) {
+    ANDROIDLOGE("jni got an PaddleMobileException! ", e.what());
+    isLoadOk = false;
+  }
+#else
+  isLoadOk = getPaddleMobileInstance()->Load(jstring2cppstring(env, modelPath),
+                                             optimize, false, 1, true);
+#endif
+  return static_cast<jboolean>(isLoadOk);
+}
+
 JNIEXPORT jboolean JNICALL Java_com_baidu_paddle_PML_loadQualified(
     JNIEnv *env, jclass thiz, jstring modelPath) {
   std::lock_guard<std::mutex> lock(shared_mutex);

test/CMakeLists.txt

 set(dir ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${dir}/build")
+set(FOUND_MATCH OFF)
 
-if ("googlenet" IN_LIST NET)
+set(CON -1)
+
+message(STATUS "nets :${NET}")
+
+list(FIND NET "googlenet" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-googlenet net/test_googlenet.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-googlenet paddle-mobile)
-elseif ("mobilenet" IN_LIST NET)
+
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "mobilenet" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-mobilenet net/test_mobilenet.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-mobilenet paddle-mobile)
@@ -13,23 +25,42 @@ elseif ("mobilenet" IN_LIST NET)
     # gen test
     ADD_EXECUTABLE(test-mobilenet-combine net/test_mobilenet_combine.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-mobilenet-combine paddle-mobile)
+    set(FOUND_MATCH ON)
+
+endif ()
 
-elseif ("yolo" IN_LIST NET)
+list(FIND NET "yolo" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-yolo net/test_yolo.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-yolo paddle-mobile)
     # gen test
     ADD_EXECUTABLE(test_yolo_combined net/test_yolo_combined.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test_yolo_combined paddle-mobile)
-elseif ("squeezenet" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "squeezenet" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-squeezenet net/test_squeezenet.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-squeezenet paddle-mobile)
-elseif("resnet" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "resnet" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-resnet net/test_resnet.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-resnet paddle-mobile)
-elseif("FPGAnets" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "FPGAnets" CON)
+if (CON GREATER -1)
     ADD_EXECUTABLE(test-resnet net/test_resnet.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-resnet paddle-mobile)
 
@@ -62,12 +93,22 @@ elseif("FPGAnets" IN_LIST NET)
 
     ADD_EXECUTABLE(test-format-data fpga/test_format_data.cpp test_helper.h test_include.h)
     target_link_libraries(test-format-data paddle-mobile)
-elseif("mobilenetssd" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "mobilenetssd" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-mobilenetssd net/test_mobilenet+ssd.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-mobilenetssd paddle-mobile)
 
-elseif("nlp" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "nlp" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-nlp net/test_nlp.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-nlp paddle-mobile)
@@ -75,17 +116,30 @@ elseif("nlp" IN_LIST NET)
     # gen test
     ADD_EXECUTABLE(test-gru-op operators/test_gru_op.cpp test_helper.h test_include.h)
     target_link_libraries(test-gru-op paddle-mobile)
-elseif("mobilenetfssd" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "mobilenetfssd" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-fssd net/test_mobilenet_025_fssd.cpp test_helper.h test_include.h)
     target_link_libraries(test-fssd paddle-mobile)
 
-elseif("genet" IN_LIST NET)
+    set(FOUND_MATCH ON)
+
+endif ()
+
+list(FIND NET "genet" CON)
+if (CON GREATER -1)
     # gen test
     ADD_EXECUTABLE(test-genet net/test_genet_combine.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-genet paddle-mobile)
-else ()
+    set(FOUND_MATCH ON)
 
+endif ()
+
+if (NOT FOUND_MATCH)
     # gen test
     ADD_EXECUTABLE(test-resnet net/test_resnet.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-resnet paddle-mobile)
@@ -263,4 +317,5 @@ else ()
 
     #add_library(test-lib-size SHARED common/test_lib_size.h common/test_lib_size.cpp)
 
-endif()
+
+endif ()

test/net/test_nlp.cpp

@@ -32,8 +32,7 @@ int main() {
     std::cout << "load cost :" << time_diff(time1, time1) << "ms" << std::endl;
     //    1064 1603 644 699 2878 1219 867 1352 8 1 13 312 479
 
-    std::vector<int64_t> ids{1064, 1603, 644, 699, 2878, 1219, 867,
-                             1352, 8,    1,   13,  312,  479};
+    std::vector<int64_t> ids{1918, 117, 55, 97, 1352, 4272, 1656, 903};
 
     paddle_mobile::framework::LoDTensor words;
     auto size = static_cast<int>(ids.size());
@@ -56,5 +55,32 @@ int main() {
     std::cout << "predict cost :" << time_diff(time3, time4) / 1 << "ms"
               << std::endl;
   }
+
+  auto time2 = time();
+  std::cout << "load cost :" << time_diff(time1, time1) << "ms" << std::endl;
+  //    1064 1603 644 699 2878 1219 867 1352 8 1 13 312 479
+
+  std::vector<int64_t> ids{1791, 656, 1549, 281, 96};
+
+  paddle_mobile::framework::LoDTensor words;
+  auto size = static_cast<int>(ids.size());
+  paddle_mobile::framework::LoD lod{{0, ids.size()}};
+  DDim dims{size, 1};
+  words.Resize(dims);
+  words.set_lod(lod);
+  DLOG << "words lod : " << words.lod();
+  auto *pdata = words.mutable_data<int64_t>();
+  size_t n = words.numel() * sizeof(int64_t);
+  DLOG << "n :" << n;
+  memcpy(pdata, ids.data(), n);
+  DLOG << "words lod 22: " << words.lod();
+  auto time3 = time();
+  for (int i = 0; i < 1; ++i) {
+    auto vec_result = paddle_mobile.PredictLod(words);
+    DLOG << *vec_result;
+  }
+  auto time4 = time();
+  std::cout << "predict cost :" << time_diff(time3, time4) / 1 << "ms"
+            << std::endl;
   return 0;
 }

tools/build.sh

@@ -92,6 +92,47 @@ build_for_android() {
     make -j 8
 }
 
+
+build_for_arm_linux() {
+    MODE="Release"
+    ARM_LINUX="arm-linux"
+
+    if [ "${#NETS}" -gt 1 ]; then
+        cmake .. \
+            -B"../build/release/arm-linux" \
+            -DCMAKE_BUILD_TYPE="${MODE}" \
+            -DCMAKE_TOOLCHAIN_FILE="./tools/toolchains/arm-linux-gnueabihf.cmake" \
+            -DCMAKE_CXX_FLAGS="-std=c++14 -mcpu=cortex-a53 -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard -ftree-vectorize -funsafe-math-optimizations  -pipe -mlittle-endian -munaligned-access" \
+            -DNET="${NETS}" \
+            -D"V7"=true
+    else
+        cmake .. \
+            -B"../build/release/arm-linux" \
+            -DCMAKE_BUILD_TYPE="${MODE}" \
+            -DCMAKE_TOOLCHAIN_FILE="./tools/toolchains/arm-linux-gnueabihf.cmake" \
+            -DCMAKE_CXX_FLAGS="-std=c++14 -mcpu=cortex-a53 -mtune=cortex-a53 -mfpu=neon-vfpv4 -mfloat-abi=hard -ftree-vectorize -funsafe-math-optimizations  -pipe -mlittle-endian -munaligned-access" \
+            -DNET="${NETS}" \
+            -D"V7"=true
+    fi
+
+    cd "../build/release/arm-linux"
+    make -j 8
+    cd "../../../test/"
+    DIRECTORY="models"
+    if [ "`ls -A $DIRECTORY`" = "" ]; then
+        echo "$DIRECTORY is indeed empty pull images"
+        wget http://mms-graph.bj.bcebos.com/paddle-mobile%2FmodelsAndImages.zip
+        unzip paddle-mobile%2FmodelsAndImages.zip
+        mv modelsAndImages/images/ images
+        mv modelsAndImages/models/ models
+        rm -rf paddle-mobile%2FmodelsAndImages.zip
+        rm -rf __MACOS
+    else
+        echo "$DIRECTORY is indeed not empty, DONE!"
+    fi
+
+}
+
 build_for_ios() {
 #    rm -rf "../build"
     PLATFORM="ios"
@@ -162,6 +203,8 @@ else
 
     if [ $1 = "android" ]; then
         build_for_android
+    elif [ $1 = "arm_linux" ]; then
+        build_for_arm_linux
     elif [ $1 = "ios" ]; then
         build_for_ios
     else

tools/op.cmake

 set(FOUND_MATCH OFF)
-if ("googlenet" IN_LIST NET)
+set(CON -1)
+
+message(STATUS "nets :${NET}")
+
+list(FIND NET "googlenet" CON)
+if (CON GREATER -1)
   message("googlenet enabled")
   set(CONCAT_OP ON)
   set(CONV_OP ON)
@@ -15,7 +20,8 @@ if ("googlenet" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
-if ("mobilenet" IN_LIST NET)
+list(FIND NET "mobilenet" CON)
+if (CON GREATER -1)
   message("mobilenet enabled")
   set(CONV_OP ON)
   set(ELEMENTWISEADD_OP ON)
@@ -33,7 +39,8 @@ if ("mobilenet" IN_LIST NET)
 endif()
 
 
-if ("mobilenetssd" IN_LIST NET)
+list(FIND NET "mobilenetssd" CON)
+if (CON GREATER -1)
   message("mobilenetssd enabled")
   set(FUSION_CONVBNRELU_OP ON)
   set(FUSION_CONVBNRELU_OP ON)
@@ -55,7 +62,8 @@ if ("mobilenetssd" IN_LIST NET)
 endif()
 
 
-if ("yolo" IN_LIST NET)
+list(FIND NET "yolo" CON)
+if (CON GREATER -1)
   message("yolo enabled")
   set(BATCHNORM_OP ON)
   set(CONV_OP ON)
@@ -65,7 +73,8 @@ if ("yolo" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
-if ("squeezenet" IN_LIST NET)
+list(FIND NET "squeezenet" CON)
+if (CON GREATER -1)
   message("squeezenet enabled")
   set(CONCAT_OP ON)
   set(CONV_OP ON)
@@ -79,7 +88,8 @@ if ("squeezenet" IN_LIST NET)
 endif()
 
 
-if ("resnet" IN_LIST NET)
+list(FIND NET "resnet" CON)
+if (CON GREATER -1)
   message("resnet enabled")
   set(CONCAT_OP ON)
   set(CONV_OP ON)
@@ -95,7 +105,8 @@ if ("resnet" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
-if ("FPGAnets" IN_LIST NET)
+list(FIND NET "FPGAnets" CON)
+if (CON GREATER -1)
   message("FPGAnets enabled")
   set(FUSION_CONVADDRELU_OP ON)
   set(FUSION_CONVADDBNRELU_OP ON)
@@ -114,7 +125,8 @@ if ("FPGAnets" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
-if ("nlp" IN_LIST NET)
+list(FIND NET "nlp" CON)
+if (CON GREATER -1)
   message("nlp enabled")
   set(FUSION_FC_OP ON)
   set(LOOKUP_OP ON)
@@ -127,7 +139,8 @@ if ("nlp" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
-if ("mobilenetfssd" IN_LIST NET)
+list(FIND NET "mobilenetfssd" CON)
+if (CON GREATER -1)
   message("mobilenetfssd enabled")
   set(FUSION_CONVADDRELU_OP ON)
   set(FUSION_CONVADDBNRELU_OP ON)
@@ -148,7 +161,8 @@ if ("mobilenetfssd" IN_LIST NET)
   set(FOUND_MATCH ON)
 endif()
 
-if ("genet" IN_LIST NET)
+list(FIND NET "genet" CON)
+if (CON GREATER -1)
   message("genet enabled")
   set(FUSION_CONVADDPRELU_OP ON)
   set(FUSION_CONVADDADDPRELU_OP ON)

tools/toolchains/arm-linux-gnueabihf.cmake

+# CMake toolchain file for building ARM software on Linux environment
+
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_SYSTEM_VERSION 1)
+
+message("if U build on platform . this is right.")
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
\ No newline at end of file