Skip to content

Commit b528828

Browse files
reyoungreyoung
committed
Rename some API to C-Style
1 parent 08113b2 commit b528828

15 files changed

+366
-270
lines changed

‎paddle/capi/Arguments.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ using paddle::capi::cast;
2323
extern "C" {
2424
PD_Arguments PDArgsCreateNone() { return new paddle::capi::CArguments(); }
2525

26-
PD_Error PDArgsDestroy(PD_Arguments args) {
26+
paddle_error PDArgsDestroy(PD_Arguments args) {
2727
if (args == nullptr) return kPD_NULLPTR;
2828
delete castArg(args);
2929
return kPD_NO_ERROR;
3030
}
3131

32-
PD_Error PDArgsGetSize(PD_Arguments args, uint64_t* size) {
32+
paddle_error PDArgsGetSize(PD_Arguments args, uint64_t* size) {
3333
if (args == nullptr || size == nullptr) return kPD_NULLPTR;
3434
*size = castArg(args)->args.size();
3535
return kPD_NO_ERROR;
3636
}
3737

38-
PD_Error PDArgsResize(PD_Arguments args, uint64_t size) {
38+
paddle_error PDArgsResize(PD_Arguments args, uint64_t size) {
3939
if (args == nullptr) return kPD_NULLPTR;
4040
castArg(args)->args.resize(size);
4141
return kPD_NO_ERROR;
4242
}
4343

44-
PD_Error PDArgsSetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
44+
paddle_error PDArgsSetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) {
4545
if (args == nullptr || mat == nullptr) return kPD_NULLPTR;
4646
auto m = paddle::capi::cast<paddle::capi::CMatrix>(mat);
4747
if (m->mat == nullptr) return kPD_NULLPTR;
@@ -51,7 +51,7 @@ PD_Error PDArgsSetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
5151
return kPD_NO_ERROR;
5252
}
5353

54-
PD_Error PDArgsGetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
54+
paddle_error PDArgsGetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) {
5555
if (args == nullptr || mat == nullptr) return kPD_NULLPTR;
5656
auto m = paddle::capi::cast<paddle::capi::CMatrix>(mat);
5757
auto a = castArg(args);
@@ -60,7 +60,7 @@ PD_Error PDArgsGetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
6060
return kPD_NO_ERROR;
6161
}
6262

63-
PD_Error PDArgsGetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
63+
paddle_error PDArgsGetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) {
6464
if (args == nullptr || ids == nullptr) return kPD_NULLPTR;
6565
auto iv = castIVec(ids);
6666
auto a = castArg(args);
@@ -69,7 +69,7 @@ PD_Error PDArgsGetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
6969
return kPD_NO_ERROR;
7070
}
7171

72-
PD_Error PDArgsSetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
72+
paddle_error PDArgsSetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) {
7373
//! TODO(lizhao): Complete this method.
7474
if (args == nullptr || ids == nullptr) return kPD_NULLPTR;
7575
auto iv = paddle::capi::cast<paddle::capi::CIVector>(ids);
@@ -80,9 +80,9 @@ PD_Error PDArgsSetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
8080
return kPD_NO_ERROR;
8181
}
8282

83-
PD_Error PDArgsSetSequenceStartPos(PD_Arguments args,
84-
uint64_t ID,
85-
PD_IVector seqPos) {
83+
paddle_error PDArgsSetSequenceStartPos(PD_Arguments args,
84+
uint64_t ID,
85+
paddle_ivector seqPos) {
8686
if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR;
8787
auto iv = paddle::capi::cast<paddle::capi::CIVector>(seqPos);
8888
if (iv->vec == nullptr) return kPD_NULLPTR;
@@ -93,9 +93,9 @@ PD_Error PDArgsSetSequenceStartPos(PD_Arguments args,
9393
return kPD_NO_ERROR;
9494
}
9595

96-
PD_Error PDArgsSetSubSequenceStartPos(PD_Arguments args,
97-
uint64_t ID,
98-
PD_IVector subSeqPos) {
96+
paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args,
97+
uint64_t ID,
98+
paddle_ivector subSeqPos) {
9999
if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR;
100100
auto iv = paddle::capi::cast<paddle::capi::CIVector>(subSeqPos);
101101
if (iv->vec == nullptr) return kPD_NULLPTR;
@@ -106,9 +106,9 @@ PD_Error PDArgsSetSubSequenceStartPos(PD_Arguments args,
106106
return kPD_NO_ERROR;
107107
}
108108

109-
PD_Error PDArgsGetSequenceStartPos(PD_Arguments args,
110-
uint64_t ID,
111-
PD_IVector seqPos) {
109+
paddle_error PDArgsGetSequenceStartPos(PD_Arguments args,
110+
uint64_t ID,
111+
paddle_ivector seqPos) {
112112
if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR;
113113
auto iv = castIVec(seqPos);
114114
auto a = castArg(args);
@@ -118,9 +118,9 @@ PD_Error PDArgsGetSequenceStartPos(PD_Arguments args,
118118
return kPD_NO_ERROR;
119119
}
120120

121-
PD_Error PDArgsGetSubSequenceStartPos(PD_Arguments args,
122-
uint64_t ID,
123-
PD_IVector subSeqPos) {
121+
paddle_error PDArgsGetSubSequenceStartPos(PD_Arguments args,
122+
uint64_t ID,
123+
paddle_ivector subSeqPos) {
124124
if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR;
125125
auto iv = castIVec(subSeqPos);
126126
auto a = castArg(args);

‎paddle/capi/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ configure_file(config.h.in config.h @ONLY)
1212

1313
# PaddleCAPI.h is the only header we exposed. It currently only used for model
1414
# inference.
15-
set(CAPI_HEADER PaddleCAPI.h)
16-
17-
15+
file(GLOB CAPI_HEADERS *.h)
1816
set(CAPI_PRIVATE_HEADER PaddleCAPIPrivate.h)
17+
list(REMOVE_ITEM CAPI_HEADERS ${CAPI_PRIVATE_HEADER})
1918
file(GLOB CAPI_SOURCES *.cpp)
2019

2120
# building paddle_capi
22-
add_library(paddle_capi STATIC ${CAPI_SOURCES})
21+
add_library(paddle_capi STATIC ${CAPI_HEADERS} ${CAPI_PRIVATE_HEADER}
22+
${CAPI_SOURCES})
2323

2424
target_include_directories(paddle_capi PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
2525

‎paddle/capi/GradientMachine.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ NeuralNetwork* newCustomNerualNetwork(const std::string& name,
3838
} // namespace paddle
3939

4040
extern "C" {
41-
PD_Error PDGradientMachineCreateForPredict(PD_GradientMachine* machine,
42-
void* modelConfigProtobuf,
43-
int size) {
41+
paddle_error PDGradientMachineCreateForPredict(PD_GradientMachine* machine,
42+
void* modelConfigProtobuf,
43+
int size) {
4444
if (modelConfigProtobuf == nullptr) return kPD_NULLPTR;
4545
paddle::ModelConfig config;
4646
if (!config.ParseFromArray(modelConfigProtobuf, size) ||
@@ -55,24 +55,24 @@ PD_Error PDGradientMachineCreateForPredict(PD_GradientMachine* machine,
5555
return kPD_NO_ERROR;
5656
}
5757

58-
PD_Error PDGradientMachineDestroy(PD_GradientMachine machine) {
58+
paddle_error PDGradientMachineDestroy(PD_GradientMachine machine) {
5959
delete cast(machine);
6060
return kPD_NO_ERROR;
6161
}
6262

63-
PD_Error PDGradientMachineLoadParameterFromDisk(PD_GradientMachine machine,
64-
const char* path) {
63+
paddle_error PDGradientMachineLoadParameterFromDisk(PD_GradientMachine machine,
64+
const char* path) {
6565
auto m = cast(machine);
6666
if (m == nullptr || path == nullptr || m->machine == nullptr)
6767
return kPD_NULLPTR;
6868
m->machine->loadParameters(path);
6969
return kPD_NO_ERROR;
7070
}
7171

72-
PD_Error PDGradientMachineForward(PD_GradientMachine machine,
73-
PD_Arguments inArgs,
74-
PD_Arguments outArgs,
75-
bool isTrain) {
72+
paddle_error PDGradientMachineForward(PD_GradientMachine machine,
73+
PD_Arguments inArgs,
74+
PD_Arguments outArgs,
75+
bool isTrain) {
7676
auto m = cast(machine);
7777
auto in = paddle::capi::cast<paddle::capi::CArguments>(inArgs);
7878
auto out = paddle::capi::cast<paddle::capi::CArguments>(outArgs);
@@ -83,10 +83,10 @@ PD_Error PDGradientMachineForward(PD_GradientMachine machine,
8383
return kPD_NO_ERROR;
8484
}
8585

86-
PD_Error PDGradientMachineCreateSharedParam(PD_GradientMachine origin,
87-
void* modelConfigProtobuf,
88-
int size,
89-
PD_GradientMachine* slave) {
86+
paddle_error PDGradientMachineCreateSharedParam(PD_GradientMachine origin,
87+
void* modelConfigProtobuf,
88+
int size,
89+
PD_GradientMachine* slave) {
9090
auto o = cast(origin);
9191
if (origin == nullptr || slave == nullptr || o->machine == nullptr) {
9292
return kPD_NULLPTR;

‎paddle/capi/Main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static void initPaddle(int argc, char** argv) {
2929
}
3030

3131
extern "C" {
32-
PD_Error PDInit(int argc, char** argv) {
32+
paddle_error PDInit(int argc, char** argv) {
3333
std::vector<char*> realArgv;
3434
realArgv.reserve(argc + 1);
3535
realArgv.push_back(strdup(""));

‎paddle/capi/Matrix.cpp‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,28 @@ limitations under the License. */
1818

1919
#define cast(v) paddle::capi::cast<paddle::capi::CMatrix>(v)
2020
extern "C" {
21-
PD_Matrix PDMatCreate(uint64_t height, uint64_t width, bool useGpu) {
21+
paddle_matrix paddle_matrix_create(uint64_t height,
22+
uint64_t width,
23+
bool useGpu) {
2224
auto ptr = new paddle::capi::CMatrix();
2325
ptr->mat = paddle::Matrix::create(height, width, false, useGpu);
2426
return ptr;
2527
}
2628

27-
PD_Matrix PDMatCreateNone() { return new paddle::capi::CMatrix(); }
29+
paddle_matrix paddle_matrix_create_none() {
30+
return new paddle::capi::CMatrix();
31+
}
2832

29-
PD_Error PDMatDestroy(PD_Matrix mat) {
33+
paddle_error paddle_matrix_destroy(paddle_matrix mat) {
3034
if (mat == nullptr) return kPD_NULLPTR;
3135
auto ptr = cast(mat);
3236
delete ptr;
3337
return kPD_NO_ERROR;
3438
}
3539

36-
PD_Error PDMatCopyToRow(PD_Matrix mat, uint64_t rowID, pd_real* rowArray) {
40+
paddle_error paddle_matrix_set_row(paddle_matrix mat,
41+
uint64_t rowID,
42+
pd_real* rowArray) {
3743
if (mat == nullptr) return kPD_NULLPTR;
3844
auto ptr = cast(mat);
3945
if (ptr->mat == nullptr) return kPD_NULLPTR;
@@ -48,7 +54,9 @@ PD_Error PDMatCopyToRow(PD_Matrix mat, uint64_t rowID, pd_real* rowArray) {
4854
return kPD_NO_ERROR;
4955
}
5056

51-
PD_Error PDMatGetRow(PD_Matrix mat, uint64_t rowID, pd_real** rawRowBuffer) {
57+
paddle_error paddle_matrix_get_row(paddle_matrix mat,
58+
uint64_t rowID,
59+
pd_real** rawRowBuffer) {
5260
if (mat == nullptr) return kPD_NULLPTR;
5361
auto ptr = cast(mat);
5462
if (ptr->mat == nullptr) return kPD_NULLPTR;
@@ -57,7 +65,9 @@ PD_Error PDMatGetRow(PD_Matrix mat, uint64_t rowID, pd_real** rawRowBuffer) {
5765
return kPD_NO_ERROR;
5866
}
5967

60-
PD_Error PDMatGetShape(PD_Matrix mat, uint64_t* height, uint64_t* width) {
68+
paddle_error paddle_matrix_get_shape(paddle_matrix mat,
69+
uint64_t* height,
70+
uint64_t* width) {
6171
if (mat == nullptr) return kPD_NULLPTR;
6272
if (height != nullptr) {
6373
*height = cast(mat)->mat->getHeight();

0 commit comments

Comments
 (0)