Merge branch 'develop' into develop

src/jni/paddle_mobile_jni.cpp

@@ -206,6 +206,13 @@ JNIEXPORT jfloatArray JNICALL Java_com_baidu_paddle_PML_predictYuv(
   return result;
 }
 
+JNIEXPORT void JNICALL Java_com_baidu_paddle_PML_setThread(JNIEnv *env,
+                                                           jclass thiz,
+                                                           jint threadCount) {
+  ANDROIDLOGI("setThreadCount %d", threadCount);
+  getPaddleMobileInstance()->SetThreadNum((int)threadCount);
+}
+
 JNIEXPORT void JNICALL Java_com_baidu_paddle_PML_clear(JNIEnv *env,
                                                        jclass thiz) {
   getPaddleMobileInstance()->Clear();

src/jni/paddle_mobile_jni.h

@@ -64,6 +64,12 @@ JNIEXPORT jfloatArray JNICALL Java_com_baidu_paddle_PML_predictYuv(
 JNIEXPORT jfloatArray JNICALL
 Java_com_baidu_paddle_PML_predict(JNIEnv *env, jclass thiz, jfloatArray buf);
 
+/**
+ * setThreadCount for multithread
+ */
+JNIEXPORT void JNICALL Java_com_baidu_paddle_PML_setThread(JNIEnv *env,
+                                                           jclass thiz,
+                                                           jint threadCount);
 /**
  * clear data of the net when destroy for android
  */