Merge pull request #1065 from hjchen2/dev-latest

Dev latest

CMakeLists.txt

@@ -5,6 +5,7 @@ project(paddle-mobile)
 option(CPU "armv7 with neon support" ON)
 option(MALI_GPU "mali gpu support" OFF)
 option(FPGA "fpga support" OFF)
+
 option(USE_OPENMP "openmp support" OFF)
 option(DEBUGING "enable debug mode" ON)
 option(USE_EXCEPTION "use std exception" OFF)
@@ -15,7 +16,7 @@ file(GLOB_RECURSE PADDLE_MOBILE_H src/*.h)
 include_directories(src/)
 
 set(CMAKE_BUILD_TYPE Release)
-add_definitions(-O3 -s -DNDEBUG)
+set(CMAKE_CXX_FLAGS "-O3 -s -DNDEBUG ${CMAKE_CXX_FLAGS}")
 if(IS_IOS)
     set(CMAKE_CXX_FLAGS "-mfpu=neon -marm -fobjc-abi-version=2 -fobjc-arc \
         -std=gnu++11 -stdlib=libc++ -isysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")

src/jni/paddle_mobile_jni.cpp

@@ -84,14 +84,14 @@ Java_com_baidu_paddle_PML_loadnlp(JNIEnv *env, jclass thiz, jstring modelPath) {
 #ifdef ENABLE_EXCEPTION
   try {
     isLoadOk = getPaddleMobileInstance()->Load(
-        jstring2cppstring(env, modelPath), optimize, false, true);
+        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, true);
+                                             optimize, false, 1, true);
 #endif
   return static_cast<jboolean>(isLoadOk);
 }