refine code

CMakeLists.txt

@@ -47,7 +47,7 @@ option(WITH_COVERAGE    "Compile PaddlePaddle with code coverage"       OFF)
 option(COVERALLS_UPLOAD "Package code coverage data to coveralls"       OFF)
 option(ON_TRAVIS        "Exclude special unit test on Travis CI"        OFF)
 option(WITH_C_API       "Compile PaddlePaddle with C-API(Prediction)"   OFF)
-option(WITH_Go          "Compile PaddlePaddle with Go)"                 OFF)
+option(WITH_GOLANG      "Compile PaddlePaddle with GOLANG"              OFF)
 
 # CMAKE_BUILD_TYPE
 if(NOT CMAKE_BUILD_TYPE)
@@ -108,7 +108,7 @@ include(configure)          # add paddle env configuration
 include_directories("${PROJ_ROOT}")
 include_directories("${PROJ_ROOT}/paddle/cuda/include")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/proto")
-include_directories("${CMAKE_BINARY_DIR}/go/pserver/cclient")
+include_directories("${CMAKE_CURRENT_BINARY_DIR}/go/pserver/cclient")
 
 set(EXTERNAL_LIBS
     ${GFLAGS_LIBRARIES}
@@ -130,10 +130,10 @@ add_subdirectory(proto)
 add_subdirectory(paddle)
 add_subdirectory(python)
 
-if(WITH_Go)
-    #add_subdirectory(go/pserver/cclient)
-    add_subdirectory(go/master/c)
-endif(WITH_Go)
+if(WITH_GOLANG)
+    #TODO (add go/master/c back when fixed)
+    add_subdirectory(go/pserver/cclient)
+endif(WITH_GOLANG)
 
 if(WITH_DOC)
     add_subdirectory(doc)

cmake/configure.cmake

@@ -40,9 +40,9 @@ if(NOT CMAKE_CROSSCOMPILING)
     endif()
 endif()
 
-if(NOT WITH_Go)
-    add_definitions(-DPADDLE_WITHOUT_GO)
-endif()
+if(NOT WITH_GOLANG)
+    add_definitions(-DPADDLE_WITHOUT_GOLANG)
+endif(NOT WITH_GOLANG)
 
 if(NOT WITH_GPU)
     add_definitions(-DPADDLE_ONLY_CPU)

go/cmake/golang.cmake

@@ -10,8 +10,7 @@ function(GO_LIBRARY NAME BUILD_TYPE)
   else()
     set(BUILD_MODE -buildmode=c-shared)
     if(APPLE)
-#      set(LIB_NAME "lib${NAME}.dylib")
-      set(LIB_NAME "lib${NAME}.so")
+      set(LIB_NAME "lib${NAME}.dylib")
     else()
       set(LIB_NAME "lib${NAME}.so")
     endif()

paddle/api/PaddleAPI.h

@@ -842,7 +842,8 @@ public:
                                                int passCount,
                                                bool useSparseUpdater);
   static ParameterUpdater* createNewRemoteUpdater(
-      OptimizationConfig* config, const std::string pserverSpec) throw(UnsupportError);
+      OptimizationConfig* config,
+      const std::string pserverSpec) throw(UnsupportError);
   ~ParameterUpdater();
 
   /**

paddle/api/ParameterUpdater.cpp

@@ -15,7 +15,7 @@ limitations under the License. */
 #include "PaddleAPI.h"
 
 #include "PaddleAPIPrivate.h"
-#ifndef PADDLE_WITHOUT_GO
+#ifndef PADDLE_WITHOUT_GOLANG
 #include "paddle/trainer/NewRemoteParameterUpdater.h"
 #endif
 #include "paddle/trainer/RemoteParameterUpdater.h"
@@ -31,10 +31,10 @@ ParameterUpdater *ParameterUpdater::createLocalUpdater(
   return updater;
 }
 
-ParameterUpdater *ParameterUpdater::createNewRemoteUpdater (
-    OptimizationConfig *config, const std::string pserverSpec)
-throw(UnsupportError) {
-#ifndef PADDLE_WITHOUT_GO
+ParameterUpdater *ParameterUpdater::createNewRemoteUpdater(
+    OptimizationConfig *config,
+    const std::string pserverSpec) throw(UnsupportError) {
+#ifndef PADDLE_WITHOUT_GOLANG
   auto updater = new ParameterUpdater();
   updater->m->updater.reset(new paddle::NewRemoteParameterUpdater(
       config->m->getConfig(), pserverSpec));

paddle/trainer/CMakeLists.txt

@@ -26,7 +26,7 @@ set(TRAINER_HEADERS
         ThreadParameterUpdater.h
         TrainerConfigHelper.h)
 
-if(NOT WITH_Go)
+if(NOT WITH_GOLANG)
   list(REMOVE_ITEM TRAINER_SOURCES
           NewRemoteParameterUpdater.cpp)
   list(REMOVE_ITEM TRAINER_HEADERS
@@ -70,8 +70,8 @@ if(APPLE)
   set(CMAKE_EXE_LINKER_FLAGS "-framework CoreFoundation -framework Security")
 endif()
 
-if(WITH_Go)
+if(WITH_GOLANG)
   add_dependencies(paddle_trainer_lib paddle_pserver_cclient)
   target_link_libraries(paddle_trainer ${CMAKE_BINARY_DIR}/go/pserver/cclient/libpaddle_pserver_cclient.a)
   target_link_libraries(paddle_trainer_lib ${CMAKE_BINARY_DIR}/go/pserver/cclient/libpaddle_pserver_cclient.a)
-endif(WITH_Go)
+endif(WITH_GOLANG)