Revise CMake scripts to support ninja on Linux

cmake/external/dgc.cmake

@@ -29,7 +29,7 @@ ExternalProject_Add(
     URL_MD5         "94e6fa1bc97169d0e1aad44570fe3251"
     PREFIX          "${DGC_PREFIX_DIR}"
     CONFIGURE_COMMAND ""
-    BUILD_COMMAND make -j $(nproc)
+    BUILD_COMMAND make -j${NPROC}
     INSTALL_COMMAND mkdir -p ${DGC_INSTALL_DIR}/lib/  ${DGC_INCLUDE_DIR}/dgc
         && cp ${DGC_SOURCES_DIR}/build/lib/libdgc.a ${DGC_LIBRARIES}
         && cp ${DGC_SOURCES_DIR}/build/include/dgc.h ${DGC_INCLUDE_DIR}/dgc/
@@ -40,4 +40,3 @@ ExternalProject_Add(
 ADD_LIBRARY(dgc STATIC IMPORTED GLOBAL)
 SET_PROPERTY(TARGET dgc PROPERTY IMPORTED_LOCATION ${DGC_LIBRARIES})
 ADD_DEPENDENCIES(dgc extern_dgc)
-

cmake/external/gflags.cmake

@@ -23,8 +23,6 @@ IF(WIN32)
   set(GFLAGS_LIBRARIES "${GFLAGS_INSTALL_DIR}/lib/gflags_static.lib" CACHE FILEPATH "GFLAGS_LIBRARIES" FORCE)
 ELSE(WIN32)
   set(GFLAGS_LIBRARIES "${GFLAGS_INSTALL_DIR}/lib/libgflags.a" CACHE FILEPATH "GFLAGS_LIBRARIES" FORCE)
-  set(BUILD_COMMAND $(MAKE) --silent)
-  set(INSTALL_COMMAND $(MAKE) install)
 ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})

cmake/external/openblas.cmake

@@ -51,7 +51,7 @@ IF(NOT WIN32)
         PREFIX              ${CBLAS_PREFIX_DIR}
         INSTALL_DIR         ${CBLAS_INSTALL_DIR}
         BUILD_IN_SOURCE     1
-        BUILD_COMMAND       make -j$(nproc) ${COMMON_ARGS} ${OPTIONAL_ARGS}
+        BUILD_COMMAND       make -j${NPROC} ${COMMON_ARGS} ${OPTIONAL_ARGS}
         INSTALL_COMMAND     make install NO_SHARED=1 NO_LAPACK=1 PREFIX=<INSTALL_DIR> 
         UPDATE_COMMAND      ""
         CONFIGURE_COMMAND   ""

cmake/external/rocksdb.cmake

@@ -38,6 +38,7 @@ ExternalProject_Add(
     INSTALL_COMMAND mkdir -p ${ROCKSDB_INSTALL_DIR}/lib/ 
         && cp ${ROCKSDB_PREFIX_DIR}/src/extern_rocksdb/librocksdb.a ${ROCKSDB_LIBRARIES}
         && cp -r ${ROCKSDB_PREFIX_DIR}/src/extern_rocksdb/include ${ROCKSDB_INSTALL_DIR}/
+    BYPRODUCTS ${ROCKSDB_LIBRARIES}
     BUILD_IN_SOURCE 1
 )
 
@@ -48,4 +49,3 @@ SET_PROPERTY(TARGET rocksdb PROPERTY IMPORTED_LOCATION ${ROCKSDB_LIBRARIES})
 ADD_DEPENDENCIES(rocksdb extern_rocksdb)
 
 LIST(APPEND external_project_dependencies rocksdb)
-

cmake/third_party.cmake

@@ -23,6 +23,9 @@ set(THIRD_PARTY_CACHE_PATH     "${CMAKE_SOURCE_DIR}"    CACHE STRING
 set(THIRD_PARTY_BUILD_TYPE Release)
 set(third_party_deps)
 
+include(ProcessorCount)
+ProcessorCount(NPROC)
+
 # cache funciton to avoid repeat download code of third_party.
 # This function has 4 parameters, URL / REPOSITOR / TAG / DIR:
 # 1. URL:           specify download url of 3rd party

paddle/fluid/distributed/CMakeLists.txt

@@ -22,9 +22,17 @@ if(NOT WITH_PSCORE)
 endif()
 
 proto_library(ps_framework_proto SRCS the_one_ps.proto)
-add_custom_command(TARGET ps_framework_proto POST_BUILD
-    COMMAND mv the_one_ps.pb.h ps.pb.h
-    COMMAND mv the_one_ps.pb.cc ps.pb.cc)
+add_custom_target(
+    ps.pb.h
+    COMMAND cp the_one_ps.pb.h ps.pb.h
+    DEPENDS ps_framework_proto
+)
+
+add_custom_target(
+    ps.pb.cc
+    COMMAND cp the_one_ps.pb.cc ps.pb.cc
+    DEPENDS ps_framework_proto
+)
 
 set(DISTRIBUTE_COMPILE_FLAGS "-Wno-error=unused-value -Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor -Wno-error=sign-compare -Wno-error=unused-variable -Wno-error=return-type -Wno-error=unused-but-set-variable -Wno-error=type-limits -Wno-error=unknown-pragmas -Wno-error=parentheses -Wno-error=unused-result")
 

paddle/fluid/distributed/common/CMakeLists.txt

@@ -1,4 +1,5 @@
 
 cc_library(afs_wrapper SRCS afs_warpper.cc DEPS fs ps_framework_proto)
+add_dependencies(afs_wrapper ps.pb.h ps.pb.cc)
 
 #set_property(GLOBAL PROPERTY COMMON_DEPS afs_warpper)

paddle/fluid/distributed/ps/table/CMakeLists.txt

@@ -40,7 +40,9 @@ set_source_files_properties(ssd_sparse_table.cc PROPERTIES COMPILE_FLAGS ${DISTR
 set_source_files_properties(memory_sparse_geo_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
 
 cc_library(sparse_sgd_rule SRCS sparse_sgd_rule.cc DEPS ${TABLE_DEPS} ps_framework_proto)
+add_dependencies(sparse_sgd_rule ps.pb.h ps.pb.cc)
 cc_library(ctr_accessor SRCS ctr_accessor.cc ctr_double_accessor.cc sparse_accessor.cc DEPS ${TABLE_DEPS} ps_framework_proto sparse_sgd_rule)
+add_dependencies(ctr_accessor ps.pb.h ps.pb.cc)
 cc_library(sparse_table SRCS memory_sparse_table.cc ssd_sparse_table.cc memory_sparse_geo_table.cc DEPS ps_framework_proto ${TABLE_DEPS} fs afs_wrapper ctr_accessor common_table rocksdb)
 
 cc_library(table SRCS table.cc DEPS sparse_table common_table tensor_accessor tensor_table ps_framework_proto string_helper device_context gflags glog boost)