From 0874a7e866fa15676e60eb13305bffefbbae6fa7 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Thu, 12 Jan 2017 16:48:24 +0800
Subject: [PATCH] Fix typo in API.h

---
 paddle/capi/CMakeLists.txt                 |  9 ++++++---
 paddle/capi/PaddleCAPI.h                   | 14 +++++++-------
 paddle/capi/tests/test_GradientMachine.cpp |  4 ++--
 python/paddle/utils/dump_config.py         |  3 ++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/paddle/capi/CMakeLists.txt b/paddle/capi/CMakeLists.txt
index 172be7b1224..b46fed3a3b4 100644
--- a/paddle/capi/CMakeLists.txt
+++ b/paddle/capi/CMakeLists.txt
@@ -39,15 +39,18 @@ add_custom_target(paddle_capi_whole ALL
         COMMAND mkdir -p o_files/math && cd o_files/math/  && ar -x $<TARGET_FILE:paddle_math>
         COMMAND mkdir -p o_files/cuda && cd o_files/cuda/ && ar -x $<TARGET_FILE:paddle_cuda>
         COMMAND mkdir -p o_files/function && cd o_files/function/ && ar -x $<TARGET_FILE:paddle_function>
-        COMMAND mkdir -p o_files/pserver && cd o_files/pserver/ && ar -x $<TARGET_FILE:paddle_pserver>
         COMMAND mkdir -p o_files/gserver && cd o_files/gserver/ && ar -x $<TARGET_FILE:paddle_gserver>
         COMMAND mkdir -p o_files/proto && cd o_files/proto/ && ar -x $<TARGET_FILE:paddle_proto>
+        COMMAND mkdir -p o_files/network && cd o_files/network/ && ar -x
+        +$<TARGET_FILE:paddle_network>
+        +       COMMAND mkdir -p o_files/pserver && cd o_files/pserver/ && ar -x
+        +$<TARGET_FILE:paddle_pserver
         COMMAND ar crs ${capi_whole_library} `find ./o_files -name '*.o'`
         COMMAND rm -rf o_files
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS paddle_capi paddle_utils paddle_parameter paddle_math
-                paddle_cuda paddle_function paddle_pserver paddle_gserver
-                paddle_proto
+                paddle_cuda paddle_function paddle_gserver
+                paddle_proto paddle_pserver paddle_network
         )
 set_target_properties(paddle_capi_whole
   PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${capi_whole_library})
diff --git a/paddle/capi/PaddleCAPI.h b/paddle/capi/PaddleCAPI.h
index 8cd78429f34..b88254c9303 100644
--- a/paddle/capi/PaddleCAPI.h
+++ b/paddle/capi/PaddleCAPI.h
@@ -67,26 +67,26 @@ int PDArgsGetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat);
 
 int PDArgsGetIds(PD_Arguments args, uint64_t ID, PD_IVector ids);
 
-typedef void* PD_GradiemtMachine;
+typedef void* PD_GradientMachine;
 
-int PDGradientMachineCreateForPredict(PD_GradiemtMachine* machine,
+int PDGradientMachineCreateForPredict(PD_GradientMachine* machine,
                                       void* modelConfigProtobuf,
                                       int size);
 
-int PDGradientMachineLoadParameterFromDisk(PD_GradiemtMachine machine,
+int PDGradientMachineLoadParameterFromDisk(PD_GradientMachine machine,
                                            const char* path);
 
-int PDGradientMachineForward(PD_GradiemtMachine machine,
+int PDGradientMachineForward(PD_GradientMachine machine,
                              PD_Arguments inArgs,
                              PD_Arguments outArgs,
                              bool isTrain);
 
-int PDGradientMachineCreateSharedParam(PD_GradiemtMachine origin,
+int PDGradientMachineCreateSharedParam(PD_GradientMachine origin,
                                        void* modelConfigProtobuf,
                                        int size,
-                                       PD_GradiemtMachine* slave);
+                                       PD_GradientMachine* slave);
 
-int PDGradientMachineDestroy(PD_GradiemtMachine machine);
+int PDGradientMachineDestroy(PD_GradientMachine machine);
 
 int PDInit(int argc, char** argv);
 
diff --git a/paddle/capi/tests/test_GradientMachine.cpp b/paddle/capi/tests/test_GradientMachine.cpp
index fcade7fb5c9..427b37b085a 100644
--- a/paddle/capi/tests/test_GradientMachine.cpp
+++ b/paddle/capi/tests/test_GradientMachine.cpp
@@ -36,7 +36,7 @@ TEST(GradientMachine, testPredict) {
   paddle::TrainerConfigHelper config("./test_predict_network.py");
   std::string buffer;
   ASSERT_TRUE(config.getModelConfig().SerializeToString(&buffer));
-  PD_GradiemtMachine machine;
+  PD_GradientMachine machine;
 
   ASSERT_EQ(kPD_NO_ERROR,
             PDGradientMachineCreateForPredict(
@@ -50,7 +50,7 @@ TEST(GradientMachine, testPredict) {
   ASSERT_EQ(kPD_NO_ERROR,
             PDGradientMachineLoadParameterFromDisk(machine, "./"));
 
-  PD_GradiemtMachine machineSlave;
+  PD_GradientMachine machineSlave;
   ASSERT_EQ(kPD_NO_ERROR,
             PDGradientMachineCreateSharedParam(
                 machine, &buffer[0], (int)buffer.size(), &machineSlave));
diff --git a/python/paddle/utils/dump_config.py b/python/paddle/utils/dump_config.py
index d1d54b6a295..2ce83bc8a80 100644
--- a/python/paddle/utils/dump_config.py
+++ b/python/paddle/utils/dump_config.py
@@ -21,6 +21,7 @@ __all__ = []
 if __name__ == '__main__':
     whole_conf = False
     binary = False
+    print sys.argv
     if len(sys.argv) == 2:
         conf = parse_config(sys.argv[1], '')
     elif len(sys.argv) == 3:
@@ -40,6 +41,6 @@ if __name__ == '__main__':
         print conf
     else:
         if binary:
-            sys.stdout.write(conf.SerializeToString())
+            sys.stdout.write(conf.model_config.SerializeToString())
         else:
             print conf.model_config
-- 
GitLab