[mobile] fix part package , opt log ,test=mobile (#2643)

* [mobile] fix part package , opt log ,test=mobile

* fix code style ,test=mobile

* [mobile]code style ,test=mobile

* fix code style ,test=mobile

mobile/src/common/log.h

@@ -33,28 +33,49 @@ namespace paddle_mobile {
 
 static const char *ANDROID_LOG_TAG =
     "paddle_mobile LOG built on " __DATE__ " " __TIME__;
-
+#ifdef PADDLE_ENABLE_COLORABLE_LOG
+#define PADDLE_RED "\033[1;31;40m"
+#define PADDLE_GREEN "\033[1;32;40m"
+#define PADDLE_YELLOW "\033[1;33;40m"
+#define PADDLE_LIGHT_RED "\033[1;35;40m"
+#define PADDLE_BLUE "\033[1;34;40m"
+#define PADDLE_WHITE "\033[1;37;40m"
+#define PADDLE_CONON "\033[0m"
+#else
+#define PADDLE_RED ""
+#define PADDLE_GREEN ""
+#define PADDLE_YELLOW ""
+#define PADDLE_LIGHT_RED ""
+#define PADDLE_BLUE ""
+#define PADDLE_WHITE ""
+#define PADDLE_CONON ""
+#endif
 #define ANDROIDLOGI(...)                                               \
   __android_log_print(ANDROID_LOG_INFO, ANDROID_LOG_TAG, __VA_ARGS__); \
-  fprintf(stderr, "%s\n", __VA_ARGS__);                                \
+  fprintf(stderr, PADDLE_YELLOW "%s\n" PADDLE_CONON, __VA_ARGS__);     \
   fflush(stderr)
 #define ANDROIDLOGW(...)                                               \
-  __android_log_print(ANDROID_LOG_WARNING, ANDROID_LOG_TAG, __VA_ARGS__); \
-  fprintf(stderr, "%s\n", __VA_ARGS__);                                   \
+  __android_log_print(ANDROID_LOG_WARN, ANDROID_LOG_TAG, __VA_ARGS__); \
+  fprintf(stderr, PADDLE_LIGHT_RED "%s\n" PADDLE_CONON, __VA_ARGS__);  \
   fflush(stderr)
 #define ANDROIDLOGD(...)                                                \
   __android_log_print(ANDROID_LOG_DEBUG, ANDROID_LOG_TAG, __VA_ARGS__); \
-  fprintf(stderr, "%s\n", __VA_ARGS__);                                 \
+  fprintf(stderr, PADDLE_WHITE "%s\n" PADDLE_CONON, __VA_ARGS__);       \
   fflush(stderr)
 #define ANDROIDLOGE(...)                                                \
   __android_log_print(ANDROID_LOG_ERROR, ANDROID_LOG_TAG, __VA_ARGS__); \
-  fprintf(stderr, "%s\n", __VA_ARGS__);                                 \
+  fprintf(stderr, PADDLE_RED "%s\n" PADDLE_CONON, __VA_ARGS__);         \
+  fflush(stderr)
+#define ANDROIDLOGV(...)                                                  \
+  __android_log_print(ANDROID_LOG_VERBOSE, ANDROID_LOG_TAG, __VA_ARGS__); \
+  fprintf(stderr, PADDLE_GREEN "%s\n" PADDLE_CONON, __VA_ARGS__);         \
   fflush(stderr)
 #else
 #define ANDROIDLOGI(...)
 #define ANDROIDLOGW(...)
 #define ANDROIDLOGD(...)
 #define ANDROIDLOGE(...)
+#define ANDROIDLOGV(...)
 
 #endif
 
@@ -63,6 +84,7 @@ enum LogLevel {
   kLOG_ERROR,
   kLOG_WARNING,
   kLOG_INFO,
+  kLOG_VERBOSE,
   kLOG_DEBUG,
   kLOG_DEBUG1,
   kLOG_DEBUG2,
@@ -73,9 +95,9 @@ enum LogLevel {
 // log level
 static LogLevel log_level = kLOG_DEBUG4;
 
-static std::vector<std::string> logs{"NO",      "ERROR ",  "WARNING",
-                                     "INFO   ", "DEBUG  ", "DEBUG1 ",
-                                     "DEBUG2 ", "DEBUG3 ", "DEBUG4 "};
+static std::vector<std::string> logs{"NO     ", "ERROR  ", "WARNING", "INFO   ",
+                                     "VERBOSE", "DEBUG  ", "DEBUG1 ", "DEBUG2 ",
+                                     "DEBUG3 ", "DEBUG4 "};
 struct ToLog;
 struct Print;
 
@@ -97,9 +119,27 @@ struct Print {
 #else
       std::cerr << buffer_.str() << std::endl;
 #endif
-    } else {
+    } else if (level == kLOG_INFO) {
 #ifdef ANDROID
       ANDROIDLOGI(buffer_.str().c_str());
+#else
+      std::cerr << buffer_.str() << std::endl;
+#endif
+    } else if (level == kLOG_VERBOSE) {
+#ifdef ANDROID
+      ANDROIDLOGV(buffer_.str().c_str());
+#else
+      std::cerr << buffer_.str() << std::endl;
+#endif
+    } else if (level == kLOG_WARNING) {
+#ifdef ANDROID
+      ANDROIDLOGW(buffer_.str().c_str());
+#else
+      std::cerr << buffer_.str() << std::endl;
+#endif
+    } else {
+#ifdef ANDROID
+      ANDROIDLOGD(buffer_.str().c_str());
 #else
       std::cout << buffer_.str() << std::endl;
 #endif
@@ -131,6 +171,7 @@ struct ToLog {
 
 #define LOG(level)                                                           \
   if (level > paddle_mobile::log_level) {                                    \
+    /* NOLINTNEXTLINE */                                                     \
   } else                                                                     \
     paddle_mobile::ToLog(                                                    \
         level, static_cast<const std::stringstream &>(                       \
@@ -143,6 +184,7 @@ struct ToLog {
 
 #define DLOG                                                          \
   if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) {         \
+    /* NOLINTNEXTLINE */                                              \
   } else                                                              \
     paddle_mobile::ToLog(                                             \
         paddle_mobile::kLOG_DEBUG,                                    \
@@ -156,11 +198,13 @@ struct ToLog {
 
 #define LOGF(level, format, ...)          \
   if (level > paddle_mobile::log_level) { \
+    /* NOLINTNEXTLINE */                  \
   } else                                  \
     printf(format, ##__VA_ARGS__)
 
 #define DLOGF(format, ...)                                    \
   if (paddle_mobile::kLOG_DEBUG > paddle_mobile::log_level) { \
+    /* NOLINTNEXTLINE */                                      \
   } else                                                      \
     printf(format, ##__VA_ARGS__)
 
@@ -170,12 +214,14 @@ struct ToLog {
 #define ANDROIDLOGW(...)
 #define ANDROIDLOGD(...)
 #define ANDROIDLOGE(...)
+#define ANDROIDLOGV(...)
 
 enum LogLevel {
   kNO_LOG,
   kLOG_ERROR,
   kLOG_WARNING,
   kLOG_INFO,
+  kLOG_VERBOSE,
   kLOG_DEBUG,
   kLOG_DEBUG1,
   kLOG_DEBUG2,
@@ -193,7 +239,7 @@ struct Print {
 };
 
 struct ToLog {
-  ToLog(LogLevel level) {}
+  explicit ToLog(LogLevel level) {}
 
   template <typename T>
   ToLog &operator<<(T const &value) {
@@ -203,11 +249,13 @@ struct ToLog {
 
 #define LOG(level)       \
   if (true) {            \
+    /* NOLINTNEXTLINE */ \
   } else                 \
     paddle_mobile::ToLog(level)
 
 #define DLOG             \
   if (true) {            \
+    /* NOLINTNEXTLINE */ \
   } else                 \
     paddle_mobile::ToLog(paddle_mobile::kLOG_DEBUG)
 

mobile/src/framework/executor.cpp

@@ -554,7 +554,7 @@ PMStatus Executor<Device, T>::Predict() {
       clock_gettime(CLOCK_MONOTONIC, &ts);
       profile[op_index].runBegin = (uint64_t)ts.tv_sec * 1e9 + ts.tv_nsec;
 #endif
-      DLOG << i << "th, "
+      LOG(paddle_mobile::kLOG_INFO) << i << "th, "
                                     << "run op: " << op_handler->Type();
       if (lod_mode_ && input_dim_has_changed_) {
         op_handler->InferShape();

mobile/src/operators/kernel/arm/convolution/conv_common.cpp

@@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#ifdef CONV_OP
+
 #include "operators/kernel/arm/convolution/conv_common.h"
 #include "framework/context.h"
 #include "operators/math/gemm/gemm1x1s1.h"
@@ -111,3 +113,4 @@ void InitBaseConvKernel(ConvParam<CPU> *param) {
 
 }  // namespace operators
 }  // namespace paddle_mobile
+#endif

mobile/src/operators/kernel/central-arm-func/conv_arm_func.cpp

@@ -11,6 +11,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
+#ifdef CONV_OP
 
 #include "operators/kernel/central-arm-func/conv_arm_func.h"
 #include <vector>
@@ -375,3 +376,4 @@ template void DepthwiseConv5x5<int8_t, int32_t>(const ConvParam<CPU> &param);
 
 }  // namespace operators
 }  // namespace paddle_mobile
+#endif

mobile/src/operators/kernel/cl/cl-kernel-func/conv_func.cpp

@@ -11,6 +11,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
+#ifdef CONV_OP
 
 #include "operators/kernel/cl/cl-kernel-func/conv_func.h"
 #include <vector>
@@ -1123,3 +1124,4 @@ void ConvTranspose3x3s2AddBnRelu(framework::CLHelper *cl_helper,
 }
 }  // namespace operators
 }  // namespace paddle_mobile
+#endif

mobile/src/operators/kernel/cl/cl-kernel-func/instancenorm_func.cpp

@@ -11,7 +11,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
-
+#ifdef INSTANCENORM_OP
 #include "operators/kernel/cl/cl-kernel-func/instancenorm_func.h"
 #include <algorithm>
 namespace paddle_mobile {
@@ -75,3 +75,4 @@ void InstanceNorm(framework::CLHelper *cl_helper,
 }
 }  // namespace operators
 }  // namespace paddle_mobile
+#endif

mobile/test/CMakeLists.txt

@@ -193,13 +193,16 @@ endif ()
 
 list(FIND NET "op" CON)
 if (CON GREATER -1)
-    # gen test
-    ADD_EXECUTABLE(test-sigmoid operators/test_sigmoid_op.cpp test_include.h)
-    target_link_libraries(test-sigmoid paddle-mobile)
-
+    #    # gen test
+    #    ADD_EXECUTABLE(test-sigmoid operators/test_sigmoid_op.cpp test_include.h)
+    #    target_link_libraries(test-sigmoid paddle-mobile)
+    #
+    #    # gen test log
+    #    ADD_EXECUTABLE(test-leakyrelu operators/test_leaky_relu_op.cpp)
+    #    target_link_libraries(test-leakyrelu paddle-mobile)
     # gen test log
-    ADD_EXECUTABLE(test-leakyrelu operators/test_leaky_relu_op.cpp)
-    target_link_libraries(test-leakyrelu paddle-mobile)
+    ADD_EXECUTABLE(test-log common/test_log.cpp)
+    target_link_libraries(test-log paddle-mobile)
     set(FOUND_MATCH ON)
 endif ()
 
@@ -238,7 +241,7 @@ if (ENABLE_ALL_TEST)
         target_link_libraries(test-conv-op paddle-mobile)
 
         # gen test
-        ADD_EXECUTABLE(test-expend-op operators/test_expend_op.cpp test_helper.h test_include.h executor_for_test_opencl.h )
+        ADD_EXECUTABLE(test-expend-op operators/test_expend_op.cpp test_helper.h test_include.h executor_for_test_opencl.h)
         target_link_libraries(test-expend-op paddle-mobile)
 
         # gen test
@@ -485,7 +488,6 @@ if (ENABLE_ALL_TEST)
         ADD_EXECUTABLE(test-gesture net/test_gesture.cpp test_helper.h test_include.h)
         target_link_libraries(test-gesture paddle-mobile)
 
-    
         ADD_EXECUTABLE(test-sequence-expand-op operators/test_sequence_expand_op.cpp test_helper.h test_include.h)
         target_link_libraries(test-sequence-expand-op paddle-mobile)
 
@@ -550,7 +552,7 @@ if (ENABLE_ALL_TEST)
         ADD_EXECUTABLE(test-inference-api-v2 net/test_inference_api_v2.cpp test_helper.h test_include.h executor_for_test.h)
         target_link_libraries(test-inference-api-v2 paddle-mobile)
     endif ()
-else()
+else ()
     # gen test
     ADD_EXECUTABLE(test-net net/test_net.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-net paddle-mobile)
@@ -560,4 +562,4 @@ else()
 
     ADD_EXECUTABLE(test-inference-api-v2 net/test_inference_api_v2.cpp test_helper.h test_include.h executor_for_test.h)
     target_link_libraries(test-inference-api-v2 paddle-mobile)
-endif()
+endif ()

mobile/test/common/test_log.cpp

@@ -15,10 +15,8 @@ limitations under the License. */
 #include "common/log.h"
 
 int main() {
-  DLOGF("DASJFDAFJ%d -- %f", 12345, 344.234);
-
-  LOGF(paddle_mobile::kLOG_DEBUG, "DASJFDAFJ%d -- %f", 12345, 344.234);
-
+  LOG(paddle_mobile::kLOG_DEBUG3) << "test debug"
+                                  << " next log";
   LOG(paddle_mobile::kLOG_DEBUG) << "test debug"
                                  << " next log";
 
@@ -26,9 +24,12 @@ int main() {
                                   << " next log";
   LOG(paddle_mobile::kLOG_DEBUG2) << "test debug2"
                                   << " next log";
+  LOG(paddle_mobile::kLOG_INFO) << "INFO!!!";
+  LOG(paddle_mobile::kLOG_WARNING) << "WARNING!!!";
+  LOG(paddle_mobile::kLOG_VERBOSE) << "VERBOSE!!!";
   DLOG << "test DLOG";
 
-  LOG(paddle_mobile::kLOG_ERROR) << " error occur !";
+  LOG(paddle_mobile::kLOG_ERROR) << "ERROR !";
 
   return 0;
 }

mobile/tools/op.cmake

@@ -273,8 +273,9 @@ endif()
 list(FIND NET "op" CON)
 if (CON GREATER -1)
   message("op enabled")
-  set(SIGMOID_OP ON)
-  set(LEAKY_RELU_OP ON)
+#  set(SIGMOID_OP ON)
+#  set(LEAKY_RELU_OP ON)
+  set(BLOG ON)
   set(FOUND_MATCH ON)
 endif()
 
@@ -763,4 +764,7 @@ endif()
 if (GRID_SAMPLER_OP)
   add_definitions(-DGRID_SAMPLER_OP)
 endif()
+if (BLOG)
+  add_definitions(-DBLOG)
+endif()