GNU Style API

Author: reyoung

paddle/capi/Arguments.cpp

@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "PaddleCAPIPrivate.h"
 #include "arguments.h"
+#include "capi_private.h"
 
 using paddle::capi::cast;
 

paddle/capi/CMakeLists.txt

@@ -13,7 +13,7 @@ configure_file(config.h.in config.h @ONLY)
 # PaddleCAPI.h is the only header we exposed. It currently only used for model
 # inference.
 file(GLOB CAPI_HEADERS *.h)
-set(CAPI_PRIVATE_HEADER PaddleCAPIPrivate.h)
+set(CAPI_PRIVATE_HEADER capi_private.h)
 list(REMOVE_ITEM CAPI_HEADERS ${CAPI_PRIVATE_HEADER})
 file(GLOB CAPI_SOURCES *.cpp)
 
@@ -59,7 +59,7 @@ link_paddle_exe(paddle_capi_shared)
 
 # install library & headers.
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${capi_whole_library} DESTINATION lib)
-install(FILES ${CAPI_HEADER} DESTINATION include/paddle)
+install(FILES ${CAPI_HEADERS} DESTINATION include/paddle)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/paddle)
 install(TARGETS paddle_capi_shared DESTINATION lib)
 

paddle/capi/Main.cpp

@@ -16,8 +16,8 @@ limitations under the License. */
 #include <stdlib.h>
 #include <string.h>
 #include <vector>
-#include "PaddleCAPI.h"
-#include "PaddleCAPIPrivate.h"
+#include "capi_private.h"
+#include "main.h"
 #include "paddle/trainer/TrainerConfigHelper.h"
 #include "paddle/utils/Excepts.h"
 #include "paddle/utils/PythonUtil.h"

paddle/capi/Matrix.cpp

@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "PaddleCAPI.h"
-#include "PaddleCAPIPrivate.h"
+#include "capi_private.h"
 #include "hl_cuda.h"
+#include "matrix.h"
 
 #define cast(v) paddle::capi::cast<paddle::capi::CMatrix>(v)
 extern "C" {

paddle/capi/Vector.cpp

@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "PaddleCAPI.h"
-#include "PaddleCAPIPrivate.h"
+#include "capi_private.h"
+#include "vector.h"
 
 using paddle::capi::cast;
 

paddle/capi/PaddleCAPI.h renamed to paddle/capi/capi.h

@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifndef PADDLECAPI_H_
-#define PADDLECAPI_H_
+#ifndef __PADDLE_CAPI_H__
+#define __PADDLE_CAPI_H__
 
 /**
  * Paddle C API. It will replace SWIG as Multiple Language API for model

paddle/capi/PaddleCAPIPrivate.h renamed to paddle/capi/capi_private.h

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "PaddleCAPI.h"
+#include "capi.h"
 #include "paddle/gserver/gradientmachines/GradientMachine.h"
 #include "paddle/math/Matrix.h"
 #include "paddle/math/Vector.h"

paddle/capi/gradient_machine.cpp

@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "PaddleCAPI.h"
-#include "PaddleCAPIPrivate.h"
+#include "gradient_machine.h"
+#include "capi_private.h"
 #include "paddle/gserver/gradientmachines/NeuralNetwork.h"
 
 #define cast(v) paddle::capi::cast<paddle::capi::CGradientMachine>(v)

paddle/capi/tests/test_Arguments.cpp

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <functional>
-#include "PaddleCAPI.h"
+#include "capi.h"
 #include "gtest/gtest.h"
 #include "paddle/utils/ThreadLocal.h"
 

paddle/capi/tests/test_GradientMachine.cpp

@@ -18,7 +18,7 @@ limitations under the License. */
 #include <stdlib.h>
 #include <string.h>
 #include <type_traits>
-#include "PaddleCAPI.h"
+#include "capi.h"
 #include "paddle/utils/ThreadLocal.h"
 
 static std::vector<pd_real> randomBuffer(size_t bufSize) {