PaddlePaddle · wangkuiyi · Jun 22, 2017 · Jun 22, 2017 · Jun 22, 2017 · Jun 22, 2017
@@ -71,7 +71,7 @@ if(ANDROID)
         "Disable RDMA when cross-compiling for Android" FORCE)
 endif(ANDROID)
 
-set(THIRD_PARTY_PATH "${PROJ_ROOT}/third_party" CACHE STRING
+set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING
   "A path setting third party libraries download & build directories.")
 
 if (WITH_C_API AND WITH_PYTHON)

diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake
@@ -14,124 +14,89 @@
 
 INCLUDE(ExternalProject)
 
-macro(PROMPT_PROTOBUF_LIB)
-    MESSAGE(STATUS "Protobuf protoc executable: ${PROTOBUF_PROTOC_EXECUTABLE}")
-    MESSAGE(STATUS "Protobuf library: ${PROTOBUF_LIBRARY}")
-    MESSAGE(STATUS "Protobuf version: ${PROTOBUF_VERSION}")
-    INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
-    RETURN()
-endmacro()
-macro(SET_PROTOBUF_VERSION)
-    EXEC_PROGRAM(${PROTOBUF_PROTOC_EXECUTABLE} ARGS --version OUTPUT_VARIABLE PROTOBUF_VERSION)
-    STRING(REGEX MATCH "[0-9]+.[0-9]+" PROTOBUF_VERSION "${PROTOBUF_VERSION}")
-endmacro()
-
-set(PROTOBUF_ROOT "" CACHE PATH "Folder contains protobuf")
-if (NOT "${PROTOBUF_ROOT}" STREQUAL "")
-    find_path(PROTOBUF_INCLUDE_DIR google/protobuf/message.h PATHS ${PROTOBUF_ROOT}/include)
-    find_library(PROTOBUF_LIBRARY protobuf PATHS ${PROTOBUF_ROOT}/lib)
-    find_library(PROTOBUF_LITE_LIBRARY protobuf-lite PATHS ${PROTOBUF_ROOT}/lib)
-    find_library(PROTOBUF_PROTOC_LIBRARY protoc PATHS ${PROTOBUF_ROOT}/lib)
-    find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS ${PROTOBUF_ROOT}/bin)
-    if (PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY AND PROTOBUF_LITE_LIBRARY AND PROTOBUF_PROTOC_LIBRARY AND PROTOBUF_PROTOC_EXECUTABLE)
-        message(STATUS "Using custom protobuf library in ${PROTOBUF_ROOT}.")
-        SET_PROTOBUF_VERSION()
-        PROMPT_PROTOBUF_LIB()
-    else()
-        message(WARNING "Cannot find protobuf library in ${PROTOBUF_ROOT}.")
-    endif()
-endif()
-
-FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
-    SET(PROTOBUF_SOURCES_DIR ${THIRD_PARTY_PATH}/${TARGET_NAME})
-    SET(PROTOBUF_INSTALL_DIR ${THIRD_PARTY_PATH}/install/${TARGET_NAME})
-
-    SET(${TARGET_NAME}_INCLUDE_DIR "${PROTOBUF_INSTALL_DIR}/include" PARENT_SCOPE)
-    SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_INSTALL_DIR}/include" PARENT_SCOPE)
-    SET(${TARGET_NAME}_LITE_LIBRARY
-        "${PROTOBUF_INSTALL_DIR}/lib/libprotobuf-lite${STATIC_LIBRARY_SUFFIX}"
-         PARENT_SCOPE)
-    SET(${TARGET_NAME}_LIBRARY
-        "${PROTOBUF_INSTALL_DIR}/lib/libprotobuf${STATIC_LIBRARY_SUFFIX}"
-         PARENT_SCOPE)
-    SET(${TARGET_NAME}_PROTOC_LIBRARY
-        "${PROTOBUF_INSTALL_DIR}/lib/libprotoc${STATIC_LIBRARY_SUFFIX}"
-         PARENT_SCOPE)
-    SET(${TARGET_NAME}_PROTOC_EXECUTABLE
-        "${PROTOBUF_INSTALL_DIR}/bin/protoc${EXECUTABLE_SUFFIX}"
-         PARENT_SCOPE)
-
-    SET(OPTIONAL_CACHE_ARGS "")
-    SET(OPTIONAL_ARGS "")
-    IF(BUILD_FOR_HOST)
-        SET(OPTIONAL_ARGS "-Dprotobuf_WITH_ZLIB=OFF")
-    ELSE()
-        SET(OPTIONAL_ARGS
-            "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
-            "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
-            "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
-            "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
-            "-Dprotobuf_WITH_ZLIB=ON"
-            "-DZLIB_ROOT:FILEPATH=${ZLIB_ROOT}")
-        SET(OPTIONAL_CACHE_ARGS "-DZLIB_ROOT:STRING=${ZLIB_ROOT}")
-    ENDIF()
-
-    ExternalProject_Add(
-        ${TARGET_NAME}
-        ${EXTERNAL_PROJECT_LOG_ARGS}
-        PREFIX          ${PROTOBUF_SOURCES_DIR}
-        UPDATE_COMMAND  ""
-        DEPENDS         zlib
-        GIT_REPOSITORY  "https://github.com/google/protobuf.git"
-        GIT_TAG         "9f75c5aa851cd877fb0d93ccc31b8567a6706546"
-        CONFIGURE_COMMAND
-        ${CMAKE_COMMAND} ${PROTOBUF_SOURCES_DIR}/src/${TARGET_NAME}/cmake
-            ${OPTIONAL_ARGS}
-            -Dprotobuf_BUILD_TESTS=OFF
-            -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-            -DCMAKE_BUILD_TYPE=Release
-            -DCMAKE_INSTALL_PREFIX=${PROTOBUF_INSTALL_DIR}
-            -DCMAKE_INSTALL_LIBDIR=lib
-        CMAKE_CACHE_ARGS
-            -DCMAKE_INSTALL_PREFIX:PATH=${PROTOBUF_INSTALL_DIR}
-            -DCMAKE_BUILD_TYPE:STRING=Release
-            -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
-            -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-            ${OPTIONAL_CACHE_ARGS}
-    )
-ENDFUNCTION()
-
-SET(PROTOBUF_VERSION 3.1)
-IF(NOT CMAKE_CROSSCOMPILING)
-    FIND_PACKAGE(Protobuf ${PROTOBUF_VERSION})
-
-    IF(PROTOBUF_FOUND)
-        SET_PROTOBUF_VERSION()
-        IF("${PROTOBUF_VERSION}" VERSION_LESS "3.1.0")
-            SET(PROTOBUF_FOUND OFF)
-        ENDIF()
-    ENDIF(PROTOBUF_FOUND)
-ELSE()
-    build_protobuf(protobuf_host TRUE)
-    LIST(APPEND external_project_dependencies protobuf_host)
-
-    SET(PROTOBUF_PROTOC_EXECUTABLE ${protobuf_host_PROTOC_EXECUTABLE}
-        CACHE FILEPATH "protobuf executable." FORCE)
-ENDIF()
-
-IF(NOT PROTOBUF_FOUND)
-    build_protobuf(protobuf FALSE)
-    LIST(APPEND external_project_dependencies protobuf)
-
-    SET(PROTOBUF_INCLUDE_DIR ${protobuf_INCLUDE_DIR}
-        CACHE PATH "protobuf include directory." FORCE)
-    IF(NOT CMAKE_CROSSCOMPILING)
-        SET(PROTOBUF_PROTOC_EXECUTABLE ${protobuf_PROTOC_EXECUTABLE}
-            CACHE FILEPATH "protobuf executable." FORCE)
-    ENDIF()
-    SET(PROTOBUF_LITE_LIBRARY ${protobuf_LITE_LIBRARY} CACHE FILEPATH "protobuf lite library." FORCE)
-    SET(PROTOBUF_LIBRARY ${protobuf_LIBRARY} CACHE FILEPATH "protobuf library." FORCE)
-    SET(PROTOBUF_PROTOC_LIBRARY ${protobuf_PROTOC_LIBRARY} CACHE FILEPATH "protoc library." FORCE)
-ENDIF(NOT PROTOBUF_FOUND)
-
-PROMPT_PROTOBUF_LIB()
+# By calling find_package, we got CMake function
+# protobuf_generate_cpp.  This find_package invocation might fail if
+# the host doesn't have protobuf install.  In that case, it overwrites
+# some variables like PROTOBUF_LIBRARIES.  Because we don't really use
+# the pre-installed protobuf; intead, we download the source code and
+# build our own, so we need to call find_package before we reset all
+# variables that a successful invocation to find_package are suppoed
+# to return.
+find_package(Protobuf ${PROTOBUF_VERSION})
+
+SET(PROTOBUF_SOURCES_DIR ${THIRD_PARTY_PATH}/protobuf)
+SET(PROTOBUF_INSTALL_DIR ${THIRD_PARTY_PATH}/install/protobuf)
+SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_INSTALL_DIR}/include" CACHE PATH "protobuf include directory." FORCE)
+
+INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+IF(WIN32)
+    SET(PROTOBUF_LIBRARIES "${PROTOBUF_INSTALL_DIR}/lib/libprotobuf.lib" CACHE FILEPATH "protobuf library." FORCE)
+ELSE(WIN32)
+    SET(PROTOBUF_LIBRARIES "${PROTOBUF_INSTALL_DIR}/lib/libprotobuf.a" CACHE FILEPATH "protobuf library." FORCE)
+ENDIF(WIN32)
+
+LIST(APPEND external_project_dependencies protobuf)
+
+# Overwrite varaibles supposed to be defined by find_pacakge(Protobuf):
+set(PROTOBUF_FOUND ON)
+set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR})
+
+IF(WIN32)
+    SET(PROTOBUF_PROTOC_LIBRARIES "${PROTOBUF_INSTALL_DIR}/lib/libprotoc.lib" CACHE FILEPATH "protoc library." FORCE)
+ELSE(WIN32)
+    SET(PROTOBUF_PROTOC_LIBRARIES "${PROTOBUF_INSTALL_DIR}/lib/libprotoc.a" CACHE FILEPATH "protoc library." FORCE)
+ENDIF(WIN32)
+
+IF(WIN32)
+    SET(PROTOBUF_LITE_LIBRARIES "${PROTOBUF_INSTALL_DIR}/lib/libprotobuf-lite.lib" CACHE FILEPATH "protobuf-lite library." FORCE)
+ELSE(WIN32)
+    SET(PROTOBUF_LITE_LIBRARIES "${PROTOBUF_INSTALL_DIR}/lib/libprotobuf_lite.a" CACHE FILEPATH "protobuf-lite library." FORCE)
+ENDIF(WIN32)
+
+set(PROTOBUF_LIBRARY ${PROTOBUF_LIBRARIES})
+set(PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_LITE_LIBRARIES})
+
+set(PROTOBUF_PROTOC_EXECUTABLE "${PROTOBUF_INSTALL_DIR}/bin/protoc")
+
+set(PROTOBUF_LIBRARY_DEBUG ${PROTOBUF_LIBRARY})
+set(PROTOBUF_PROTOC_LIBRARY_DEBUG ${PROTOBUF_PROTOC_LIBRARY})
+set(PROTOBUF_LITE_LIBRARY ${PROTOBUF_LITE_LIBRARIES})
+set(PROTOBUF_LITE_LIBRARY_DEBUG ${PROTOBUF_LITE_LIBRARY})
+
+SET(PROTOBUF_VERSION 3.1) # This variables is required by the generateion of py_paddle.
+
+ExternalProject_Add(
+  extern_protobuf
+  ${EXTERNAL_PROJECT_LOG_ARGS}
+  DEPENDS         zlib
+  GIT_REPOSITORY  "https://github.com/google/protobuf.git"
+  GIT_TAG         "v3.1.0"
+  PREFIX          ${PROTOBUF_SOURCES_DIR}
+  UPDATE_COMMAND  ""
+  CONFIGURE_COMMAND
+  ${CMAKE_COMMAND} ${PROTOBUF_SOURCES_DIR}/src/extern_protobuf/cmake
+  -Dprotobuf_BUILD_TESTS=OFF
+  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=${PROTOBUF_INSTALL_DIR}
+  -DCMAKE_INSTALL_LIBDIR=lib
+  CMAKE_CACHE_ARGS
+  -DCMAKE_INSTALL_PREFIX:PATH=${PROTOBUF_INSTALL_DIR}
+  -DCMAKE_BUILD_TYPE:STRING=Release
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+  -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+  -DZLIB_ROOT:STRING=${ZLIB_ROOT}
+  )
+
+ADD_LIBRARY(protobuf STATIC IMPORTED GLOBAL)
+SET_PROPERTY(TARGET protobuf PROPERTY IMPORTED_LOCATION ${PROTOBUF_LIBRARIES})
+ADD_DEPENDENCIES(protobuf extern_protobuf)
+
+ADD_LIBRARY(protobuf_lite STATIC IMPORTED GLOBAL)
+SET_PROPERTY(TARGET protobuf_lite PROPERTY IMPORTED_LOCATION ${PROTOBUF_LITE_LIBRARIES})
+ADD_DEPENDENCIES(protobuf_lite extern_protobuf)
+
+ADD_LIBRARY(protoc STATIC IMPORTED GLOBAL)
+SET_PROPERTY(TARGET protoc PROPERTY IMPORTED_LOCATION ${PROTOC_LIBRARIES})
+ADD_DEPENDENCIES(protoc extern_protobuf)
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
@@ -18,13 +18,13 @@
 # building rules (https://bazel.build/).
 #
 # 
-# -------------------------------------------
-#     C++        CUDA C++       Go
-# -------------------------------------------
-# cc_library    nv_library   go_library
+# -----------------------------------------------------
+#     C++        CUDA C++       Go          Proto
+# -----------------------------------------------------
+# cc_library    nv_library   go_library   proto_library
 # cc_binary     nv_binary    go_binary
 # cc_test       nv_test      go_test
-# -------------------------------------------
+# -----------------------------------------------------
 # 
 # To build a static library example.a from example.cc using the system
 #  compiler (like GCC):
@@ -83,6 +83,10 @@ if(NOT APPLE)
     link_libraries(${CMAKE_THREAD_LIBS_INIT})
 endif(NOT APPLE)
 
+# Source files generated from .proto files will be in ${CMAKE_BINARY_DIR}.
+include_directories(${CMAKE_BINARY_DIR})
+
+
 function(merge_static_libs TARGET_NAME)
   set(libs ${ARGN})
   list(REMOVE_DUPLICATES libs)
@@ -167,6 +171,22 @@ function(cc_library TARGET_NAME)
   endif(cc_library_SRCS)
 endfunction(cc_library)
 
+
+function(proto_library TARGET_NAME)
+  if (NOT ${PROTOBUF_FOUND})
+    error("Using proto_library but CMake cannot find installed protobuf.")
+  endif()
+
+  set(options STATIC static SHARED shared)
+  set(oneValueArgs "")
+  set(multiValueArgs SRCS DEPS)
+  cmake_parse_arguments(proto_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  protobuf_generate_cpp(${TARGET_NAME}_PROTO_SRCS ${TARGET_NAME}_PROTO_HDRS ${proto_library_SRCS})
+  cc_library(${TARGET_NAME} SRCS ${${TARGET_NAME}_PROTO_SRCS} DEPS ${${proto_library}_DEPS} protobuf)
+endfunction(proto_library)
+
+
 function(cc_binary TARGET_NAME)
   set(options "")
   set(oneValueArgs "")

diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt
@@ -2,3 +2,6 @@ cc_library(ddim SRCS ddim.cc)
 cc_test(ddim_test SRCS ddim_test.cc DEPS ddim)
 
 nv_test(dim_test SRCS dim_test.cu DEPS ddim)
+
+proto_library(example_proto SRCS example.proto)
+cc_binary(example_proto_exe SRCS example.cc DEPS example_proto protobuf)
diff --git a/paddle/framework/example.cc b/paddle/framework/example.cc
@@ -0,0 +1,9 @@
+#include <iostream>
+#include "paddle/framework/example.pb.h"
+
+int main() {
+  paddle::framework::Something s;
+  s.set_something(123.45);
+  std::cout << s.something() << "\n";
+  return 0;
+}
diff --git a/paddle/framework/example.proto b/paddle/framework/example.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+
+option optimize_for = LITE_RUNTIME;
+
+package paddle.framework;
+
+message Something {
+  optional double something = 1 [default = 0.0];
+}
diff --git a/paddle/scripts/travis/build_and_test.sh b/paddle/scripts/travis/build_and_test.sh
@@ -5,7 +5,8 @@ NPROC=1
 export PYTHONPATH=/opt/python/2.7.12/lib/python2.7/site-packages
 export PYTHONHOME=/opt/python/2.7.12
 export PATH=/opt/python/2.7.12/bin:${PATH}
-cmake .. -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DON_TRAVIS=ON -DWITH_COVERAGE=ON -DCOVERALLS_UPLOAD=ON ${EXTRA_CMAKE_OPTS}
+# cmake .. -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DON_TRAVIS=ON -DWITH_COVERAGE=ON -DCOVERALLS_UPLOAD=ON ${EXTRA_CMAKE_OPTS}
+cmake .. -DON_TRAVIS=ON -DWITH_COVERAGE=ON -DCOVERALLS_UPLOAD=ON
 NRPOC=`nproc`
 make -j $NPROC
 make coveralls

diff --git a/paddle/scripts/travis/docs.sh b/paddle/scripts/travis/docs.sh
@@ -3,12 +3,13 @@
 # Add set -e, cd to directory.
 source ./common.sh
 # Compile Documentation only.
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_STYLE_CHECK=OFF ${EXTRA_CMAKE_OPTS}
+# cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_STYLE_CHECK=OFF ${EXTRA_CMAKE_OPTS}
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_STYLE_CHECK=OFF 
 mkdir output
 make -j `nproc`
 find .. -name '*whl' | xargs pip install  # install all wheels.
 rm -rf *
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran-4.8 -DWITH_GPU=OFF -DWITH_DOC=ON ${EXTRA_CMAKE_OPTS}
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=ON
 make paddle_docs paddle_docs_cn
 
 # check websites for broken links