From ab2ba2fe659bc53289daf24ba2cd19629a35b5d1 Mon Sep 17 00:00:00 2001
From: hjchen2 <chenhoujiangcug@gmail.com>
Date: Tue, 22 Jan 2019 11:44:39 +0800
Subject: [PATCH] Fix compile warning, disable openmp for ios ci build

---
 src/common/log.h                                   |  5 +----
 src/io/jni/paddle_mobile_jni.cpp                   | 14 +++++++-------
 src/io/jni/paddle_mobile_jni.h                     |  6 +++++-
 src/operators/kernel/arm/quantize_kernel.cpp       |  2 +-
 .../kernel/central-arm-func/gru_unit_arm_func.h    |  1 +
 src/operators/math/quantize.h                      |  4 ++--
 tools/ci_build.sh                                  |  2 ++
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/common/log.h b/src/common/log.h
index d964d9c1b3..c5146533d1 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -175,11 +175,8 @@ struct Print {
   friend struct ToLog;
   template <typename T>
   Print &operator<<(T const &value) {
-    Print p = Print();
-    return p;
+    return *this;
   }
-
- private:
 };
 
 struct ToLog {
diff --git a/src/io/jni/paddle_mobile_jni.cpp b/src/io/jni/paddle_mobile_jni.cpp
index 7928307003..66c3084d2e 100644
--- a/src/io/jni/paddle_mobile_jni.cpp
+++ b/src/io/jni/paddle_mobile_jni.cpp
@@ -39,7 +39,7 @@ using framework::Tensor;
 using paddle_mobile::CPU;
 using std::string;
 
-extern const char *ANDROID_LOG_TAG =
+const char *ANDROID_LOG_TAG =
     "paddle_mobile LOG built on " __DATE__ " " __TIME__;
 paddle_mobile::PaddleMobile<paddle_mobile::CPU> paddle_mobile;
 static std::mutex shared_mutex;
@@ -53,25 +53,25 @@ string jstring2cppstring(JNIEnv *env, jstring jstr) {
   return cppstr;
 }
 
-JNIEXPORT jboolean JNICALL Java_com_baidu_paddle_PML_load(JNIEnv *env,
-                                                          jclass thiz,
-                                                          jstring modelPath) {
+JNIEXPORT jboolean JNICALL Java_com_baidu_paddle_PML_load(
+    JNIEnv *env, jclass thiz, jstring modelPath, jboolean lod_mode = false) {
   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);
+        jstring2cppstring(env, modelPath), optimize, false, 1,
+        static_cast<bool>(lod_mode));
   } catch (paddle_mobile::PaddleMobileException &e) {
     ANDROIDLOGE("jni got an PaddleMobileException! ", e.what());
     isLoadOk = false;
   }
 #else
   isLoadOk = getPaddleMobileInstance()->Load(jstring2cppstring(env, modelPath),
-                                             optimize);
+                                             optimize, false, 1,
+                                             static_cast<bool>(lod_mode));
 #endif
   return static_cast<jboolean>(isLoadOk);
 }
diff --git a/src/io/jni/paddle_mobile_jni.h b/src/io/jni/paddle_mobile_jni.h
index 158d64d451..313b3e5340 100644
--- a/src/io/jni/paddle_mobile_jni.h
+++ b/src/io/jni/paddle_mobile_jni.h
@@ -26,7 +26,8 @@ namespace jni {
  */
 JNIEXPORT jboolean JNICALL Java_com_baidu_paddle_PML_load(JNIEnv *env,
                                                           jclass thiz,
-                                                          jstring modelPath);
+                                                          jstring modelPath,
+                                                          jboolean lod_mode);
 
 /**
  * load separated qualified model for android
@@ -64,6 +65,9 @@ JNIEXPORT jfloatArray JNICALL Java_com_baidu_paddle_PML_predictYuv(
 JNIEXPORT jfloatArray JNICALL
 Java_com_baidu_paddle_PML_predict(JNIEnv *env, jclass thiz, jfloatArray buf);
 
+JNIEXPORT jlongArray JNICALL
+Java_com_baidu_paddle_PML_predictLod(JNIEnv *env, jclass thiz, jlongArray buf);
+
 /**
  * setThreadCount for multithread
  */
diff --git a/src/operators/kernel/arm/quantize_kernel.cpp b/src/operators/kernel/arm/quantize_kernel.cpp
index 97ffa05c86..c8af30a655 100644
--- a/src/operators/kernel/arm/quantize_kernel.cpp
+++ b/src/operators/kernel/arm/quantize_kernel.cpp
@@ -167,7 +167,7 @@ float find_abs_max(const Tensor *input) {
   max_abs = vmaxvq_f32(__max);
 #endif
   for (size_t i = 0; i < remain; ++i) {
-    max_abs = std::max(max_abs, std::abs(x[i]));
+    max_abs = std::max(max_abs, fabs(x[i]));
   }
   return max_abs;
 }
diff --git a/src/operators/kernel/central-arm-func/gru_unit_arm_func.h b/src/operators/kernel/central-arm-func/gru_unit_arm_func.h
index 3897d6a308..603592505d 100644
--- a/src/operators/kernel/central-arm-func/gru_unit_arm_func.h
+++ b/src/operators/kernel/central-arm-func/gru_unit_arm_func.h
@@ -21,6 +21,7 @@ limitations under the License. */
 #include "operators/math/gemm.h"
 #include "operators/math/math_function.h"
 #include "operators/op_param.h"
+
 namespace paddle_mobile {
 namespace operators {
 
diff --git a/src/operators/math/quantize.h b/src/operators/math/quantize.h
index 9f9e91330c..9f6b2437f5 100644
--- a/src/operators/math/quantize.h
+++ b/src/operators/math/quantize.h
@@ -40,8 +40,8 @@ template <>
 inline int8_t Round<ROUND_NEAREST_TO_EVEN>(const float &x) {
   float v = std::round(x);
   int32_t q = static_cast<int32_t>(v);
-  if (std::abs(std::abs(q - v) - 0.5) <= 0) {
-    if (std::abs(q) % 2 != 0) {
+  if (fabs(fabs(q - v) - 0.5) <= 0) {
+    if (abs(q) % 2 != 0) {
       q = q + ((q > 0) ? -1 : 1);
     }
   }
diff --git a/tools/ci_build.sh b/tools/ci_build.sh
index 3697f01063..73ff293d4f 100755
--- a/tools/ci_build.sh
+++ b/tools/ci_build.sh
@@ -146,6 +146,7 @@ function build_ios_armv8_cpu_only() {
     -DIOS_PLATFORM=OS \
     -DIOS_ARCH="${IOS_ARCH}" \
     -DIS_IOS=true \
+    -DUSE_OPENMP=OFF \
     -DGPU_MALI=OFF \
     -DGPU_CL=OFF \
     -DFPGA=OFF
@@ -163,6 +164,7 @@ function build_ios_armv8_gpu() {
     -DIOS_PLATFORM=OS \
     -DIOS_ARCH="${IOS_ARCH}" \
     -DIS_IOS=true \
+    -DUSE_OPENMP=OFF \
     -DGPU_MALI=OFF \
     -DGPU_CL=ON \
     -DFPGA=OFF
-- 
GitLab