Always link protobuf-lite for mobile inference.

Author: Xreki

CMakeLists.txt

@@ -82,6 +82,8 @@ if(ANDROID OR IOS)
         "Disable AVX when cross-compiling for Android and iOS" FORCE)
     set(WITH_PYTHON OFF CACHE STRING
         "Disable PYTHON when cross-compiling for Android and iOS" FORCE)
+    set(WITH_SWIG_PY OFF CACHE STRING
+        "Disable SWIG_PY when cross-compiling for Android and iOS" FORCE)
     set(WITH_RDMA OFF CACHE STRING
         "Disable RDMA when cross-compiling for Android and iOS" FORCE)
     set(WITH_MKL OFF CACHE STRING
@@ -99,12 +101,12 @@ if(ANDROID OR IOS)
 endif()
 
 set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
-  "A path setting third party libraries download & build directories.")
+    "A path setting third party libraries download & build directories.")
 
 if (WITH_C_API AND WITH_PYTHON)
-  message(WARNING "It is suggest not embedded a python interpreter in Paddle "
-    "when using C-API. It will give an unpredictable behavior when using a "
-    "different Python interpreter from compiling.")
+    message(WARNING "It is suggest not embedded a python interpreter in Paddle "
+            "when using C-API. It will give an unpredictable behavior when using a "
+            "different Python interpreter from compiling.")
 endif()
 
 if(MOBILE_INFERENCE)
@@ -153,6 +155,10 @@ include(flags)              # set paddle compile flags
 include(version)            # set PADDLE_VERSION
 include(coveralls)          # set code coverage
 
+if(WITH_GPU)
+    include(cuda)
+endif(WITH_GPU)
+
 
 include_directories("${PADDLE_SOURCE_DIR}")
 include_directories("${PADDLE_SOURCE_DIR}/paddle/cuda/include")
@@ -164,14 +170,14 @@ set(EXTERNAL_LIBS
     ${GFLAGS_LIBRARIES}
     ${GLOG_LIBRARIES}
     ${CBLAS_LIBRARIES}
-    ${PROTOBUF_LIBRARY}
-    ${ZLIB_LIBRARIES}
     ${PYTHON_LIBRARIES}
 )
 
-if(WITH_GPU)
-  include(cuda)
-endif(WITH_GPU)
+if(MOBILE_INFERENCE)
+    list(APPEND EXTERNAL_LIBS ${PROTOBUF_LITE_LIBRARY})
+else()
+    list(APPEND EXTERNAL_LIBS ${PROTOBUF_LIBRARY} ${ZLIB_LIBRARIES})
+endif()
 
 if(WITH_MKLML)
     list(APPEND EXTERNAL_LIBS ${MKLML_IOMP_LIB})

cmake/external/protobuf.cmake

@@ -94,14 +94,14 @@ macro(PROMPT_PROTOBUF_LIB)
     SET(protobuf_DEPS ${ARGN})
 
     MESSAGE(STATUS "Protobuf protoc executable: ${PROTOBUF_PROTOC_EXECUTABLE}")
-    MESSAGE(STATUS "Protobuf library: ${PROTOBUF_LIBRARY}")
+    MESSAGE(STATUS "Protobuf-lite library: ${PROTOBUF_LITE_LIBRARY}")
     MESSAGE(STATUS "Protobuf version: ${PROTOBUF_VERSION}")
     INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
 
     # Assuming that all the protobuf libraries are of the same type.
-    IF(${PROTOBUF_LIBRARY} MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
+    IF(${PROTOBUF_LITE_LIBRARY} MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
         SET(protobuf_LIBTYPE STATIC)
-    ELSEIF(${PROTOBUF_LIBRARY} MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$")
+    ELSEIF(${PROTOBUF_LITE_LIBRARY} MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}$")
         SET(protobuf_LIBTYPE SHARED)
     ELSE()
         MESSAGE(FATAL_ERROR "Unknown library type: ${PROTOBUF_LIBRARY}")
@@ -128,7 +128,11 @@ macro(PROMPT_PROTOBUF_LIB)
         ADD_DEPENDENCIES(protoc ${dep})
     ENDFOREACH()
 
-    LIST(APPEND external_project_dependencies protobuf)
+    IF(MOBILE_INFERENCE)
+        LIST(APPEND external_project_dependencies protobuf_lite)
+    ELSE()
+        LIST(APPEND external_project_dependencies protobuf)
+    ENDIF()
     RETURN()
 endmacro()
 macro(SET_PROTOBUF_VERSION)
@@ -252,10 +256,14 @@ IF(NOT PROTOBUF_FOUND)
 
     IF(WITH_C_API)
         INSTALL(DIRECTORY ${PROTOBUF_INCLUDE_DIR} DESTINATION third_party/protobuf)
-        IF(ANDROID)
-            INSTALL(FILES ${PROTOBUF_LITE_LIBRARY} DESTINATION third_party/protobuf/lib/${ANDROID_ABI})
+        IF(MOBILE_INFERENCE)
+            IF(ANDROID)
+                INSTALL(FILES ${PROTOBUF_LITE_LIBRARY} DESTINATION third_party/protobuf/lib/${ANDROID_ABI})
+            ELSE()
+                INSTALL(FILES ${PROTOBUF_LITE_LIBRARY} DESTINATION third_party/protobuf/lib)
+            ENDIF()
         ELSE()
-            INSTALL(FILES ${PROTOBUF_LITE_LIBRARY} DESTINATION third_party/protobuf/lib)
+            INSTALL(FILES ${PROTOBUF_LIBRARY} DESTINATION third_party/protobuf/lib)
         ENDIF()
     ENDIF()
 

cmake/generic.cmake

@@ -389,10 +389,10 @@ function(go_test TARGET_NAME)
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endfunction(go_test)
 
+
 # Modification of standard 'protobuf_generate_cpp()' with protobuf-lite support
 # Usage:
 #   paddle_protobuf_generate_cpp(<proto_srcs> <proto_hdrs> <proto_files>)
-
 function(paddle_protobuf_generate_cpp SRCS HDRS)
   if(NOT ARGN)
     message(SEND_ERROR "Error: paddle_protobuf_generate_cpp() called without any proto files")
@@ -402,10 +402,10 @@ function(paddle_protobuf_generate_cpp SRCS HDRS)
   set(${SRCS})
   set(${HDRS})
 
-  if (MOBILE_INFERENCE)
-      set(EXTRA_FLAG "lite:")  
+  if(MOBILE_INFERENCE)
+    set(EXTRA_FLAG "lite:")
   else()
-      set(EXTRA_FLAG "") 
+    set(EXTRA_FLAG "")
   endif()
 
   foreach(FIL ${ARGN})
@@ -423,8 +423,8 @@ function(paddle_protobuf_generate_cpp SRCS HDRS)
 
       COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}"
       COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} 
-      -I${CMAKE_CURRENT_SOURCE_DIR}
-      --cpp_out "${EXTRA_FLAG}${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL}
+              -I${CMAKE_CURRENT_SOURCE_DIR}
+              --cpp_out "${EXTRA_FLAG}${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL}
       DEPENDS ${ABS_FIL} protoc
       COMMENT "Running C++ protocol buffer compiler on ${FIL}"
       VERBATIM )
@@ -435,15 +435,20 @@ function(paddle_protobuf_generate_cpp SRCS HDRS)
   set(${HDRS} ${${HDRS}} PARENT_SCOPE)
 endfunction()
 
-
 function(proto_library TARGET_NAME)
   set(oneValueArgs "")
   set(multiValueArgs SRCS DEPS)
   cmake_parse_arguments(proto_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   set(proto_srcs)
   set(proto_hdrs)
   paddle_protobuf_generate_cpp(proto_srcs proto_hdrs ${proto_library_SRCS})
-  cc_library(${TARGET_NAME} SRCS ${proto_srcs} DEPS ${proto_library_DEPS} protobuf)
+  if(MOBILE_INFERENCE)
+    list(APPEND proto_library_DEPS protobuf_lite)
+  else()
+    list(APPEND proto_library_DEPS protobuf)
+  endif()
+  list(REMOVE_DUPLICATES proto_library_DEPS)
+  cc_library(${TARGET_NAME} SRCS ${proto_srcs} DEPS ${proto_library_DEPS})
 endfunction()
 
 function(py_proto_compile TARGET_NAME)

proto/CMakeLists.txt

@@ -1,4 +1,4 @@
-if (MOBILE_INFERENCE)
+if(MOBILE_INFERENCE)
     file(GLOB proto_filenames . ModelConfig.proto ParameterConfig.proto
          TrainerConfig.proto DataConfig.proto)
 else()