Skip to content

Commit 7bb12fd

Browse files
reyoungreyoung
committed
Refactor API follow comments.
1 parent 5a9987a commit 7bb12fd

File tree

10 files changed

+314
-159
lines changed

10 files changed

+314
-159
lines changed

‎paddle/capi/Arguments.cpp‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,27 @@ using paddle::capi::cast;
2121
#define castIVec(v) cast<paddle::capi::CIVector>(v)
2222

2323
extern "C" {
24-
int PDArgsCreateNone(PD_Arguments* args) {
25-
auto ptr = new paddle::capi::CArguments();
26-
*args = ptr;
27-
return kPD_NO_ERROR;
28-
}
24+
PD_Arguments PDArgsCreateNone() { return new paddle::capi::CArguments(); }
2925

30-
int PDArgsDestroy(PD_Arguments args) {
26+
PD_Error PDArgsDestroy(PD_Arguments args) {
3127
if (args == nullptr) return kPD_NULLPTR;
3228
delete castArg(args);
3329
return kPD_NO_ERROR;
3430
}
3531

36-
int PDArgsGetSize(PD_Arguments args, uint64_t* size) {
32+
PD_Error PDArgsGetSize(PD_Arguments args, uint64_t* size) {
3733
if (args == nullptr || size == nullptr) return kPD_NULLPTR;
3834
*size = castArg(args)->args.size();
3935
return kPD_NO_ERROR;
4036
}
4137

42-
int PDArgsResize(PD_Arguments args, uint64_t size) {
38+
PD_Error PDArgsResize(PD_Arguments args, uint64_t size) {
4339
if (args == nullptr) return kPD_NULLPTR;
4440
castArg(args)->args.resize(size);
4541
return kPD_NO_ERROR;
4642
}
4743

48-
int PDArgsSetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
44+
PD_Error PDArgsSetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
4945
if (args == nullptr || mat == nullptr) return kPD_NULLPTR;
5046
auto m = paddle::capi::cast<paddle::capi::CMatrix>(mat);
5147
if (m->mat == nullptr) return kPD_NULLPTR;
@@ -55,7 +51,7 @@ int PDArgsSetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
5551
return kPD_NO_ERROR;
5652
}
5753

58-
int PDArgsGetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
54+
PD_Error PDArgsGetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
5955
if (args == nullptr || mat == nullptr) return kPD_NULLPTR;
6056
auto m = paddle::capi::cast<paddle::capi::CMatrix>(mat);
6157
auto a = castArg(args);
@@ -64,7 +60,7 @@ int PDArgsGetValue(PD_Arguments args, uint64_t ID, PD_Matrix mat) {
6460
return kPD_NO_ERROR;
6561
}
6662

67-
int PDArgsGetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
63+
PD_Error PDArgsGetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
6864
if (args == nullptr || ids == nullptr) return kPD_NULLPTR;
6965
auto iv = castIVec(ids);
7066
auto a = castArg(args);
@@ -73,7 +69,7 @@ int PDArgsGetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
7369
return kPD_NO_ERROR;
7470
}
7571

76-
int PDArgsSetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
72+
PD_Error PDArgsSetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
7773
//! TODO(lizhao): Complete this method.
7874
if (args == nullptr || ids == nullptr) return kPD_NULLPTR;
7975
auto iv = paddle::capi::cast<paddle::capi::CIVector>(ids);
@@ -84,9 +80,9 @@ int PDArgsSetIds(PD_Arguments args, uint64_t ID, PD_IVector ids) {
8480
return kPD_NO_ERROR;
8581
}
8682

87-
int PDArgsSetSequenceStartPos(PD_Arguments args,
88-
uint64_t ID,
89-
PD_IVector seqPos) {
83+
PD_Error PDArgsSetSequenceStartPos(PD_Arguments args,
84+
uint64_t ID,
85+
PD_IVector seqPos) {
9086
if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR;
9187
auto iv = paddle::capi::cast<paddle::capi::CIVector>(seqPos);
9288
if (iv->vec == nullptr) return kPD_NULLPTR;
@@ -97,9 +93,9 @@ int PDArgsSetSequenceStartPos(PD_Arguments args,
9793
return kPD_NO_ERROR;
9894
}
9995

100-
int PDArgsSetSubSequenceStartPos(PD_Arguments args,
101-
uint64_t ID,
102-
PD_IVector subSeqPos) {
96+
PD_Error PDArgsSetSubSequenceStartPos(PD_Arguments args,
97+
uint64_t ID,
98+
PD_IVector subSeqPos) {
10399
if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR;
104100
auto iv = paddle::capi::cast<paddle::capi::CIVector>(subSeqPos);
105101
if (iv->vec == nullptr) return kPD_NULLPTR;
@@ -110,9 +106,9 @@ int PDArgsSetSubSequenceStartPos(PD_Arguments args,
110106
return kPD_NO_ERROR;
111107
}
112108

113-
int PDArgsGetSequenceStartPos(PD_Arguments args,
114-
uint64_t ID,
115-
PD_IVector seqPos) {
109+
PD_Error PDArgsGetSequenceStartPos(PD_Arguments args,
110+
uint64_t ID,
111+
PD_IVector seqPos) {
116112
if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR;
117113
auto iv = castIVec(seqPos);
118114
auto a = castArg(args);
@@ -122,9 +118,9 @@ int PDArgsGetSequenceStartPos(PD_Arguments args,
122118
return kPD_NO_ERROR;
123119
}
124120

125-
int PDArgsGetSubSequenceStartPos(PD_Arguments args,
126-
uint64_t ID,
127-
PD_IVector subSeqPos) {
121+
PD_Error PDArgsGetSubSequenceStartPos(PD_Arguments args,
122+
uint64_t ID,
123+
PD_IVector subSeqPos) {
128124
if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR;
129125
auto iv = castIVec(subSeqPos);
130126
auto a = castArg(args);

‎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-
int PDGradientMachineCreateForPredict(PD_GradientMachine* machine,
42-
void* modelConfigProtobuf,
43-
int size) {
41+
PD_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 @@ int PDGradientMachineCreateForPredict(PD_GradientMachine* machine,
5555
return kPD_NO_ERROR;
5656
}
5757

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

63-
int PDGradientMachineLoadParameterFromDisk(PD_GradientMachine machine,
64-
const char* path) {
63+
PD_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-
int PDGradientMachineForward(PD_GradientMachine machine,
73-
PD_Arguments inArgs,
74-
PD_Arguments outArgs,
75-
bool isTrain) {
72+
PD_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 @@ int PDGradientMachineForward(PD_GradientMachine machine,
8383
return kPD_NO_ERROR;
8484
}
8585

86-
int PDGradientMachineCreateSharedParam(PD_GradientMachine origin,
87-
void* modelConfigProtobuf,
88-
int size,
89-
PD_GradientMachine* slave) {
86+
PD_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-
int PDInit(int argc, char** argv) {
32+
PD_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: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,22 @@ limitations under the License. */
1818

1919
#define cast(v) paddle::capi::cast<paddle::capi::CMatrix>(v)
2020
extern "C" {
21-
int PDMatCreate(PD_Matrix* mat, uint64_t height, uint64_t width, bool useGpu) {
21+
PD_Matrix PDMatCreate(uint64_t height, uint64_t width, bool useGpu) {
2222
auto ptr = new paddle::capi::CMatrix();
2323
ptr->mat = paddle::Matrix::create(height, width, false, useGpu);
24-
*mat = ptr;
25-
return kPD_NO_ERROR;
24+
return ptr;
2625
}
2726

28-
int PDMatCreateNone(PD_Matrix* mat) {
29-
auto ptr = new paddle::capi::CMatrix();
30-
*mat = ptr;
31-
return kPD_NO_ERROR;
32-
}
27+
PD_Matrix PDMatCreateNone() { return new paddle::capi::CMatrix(); }
3328

34-
int PDMatDestroy(PD_Matrix mat) {
29+
PD_Error PDMatDestroy(PD_Matrix mat) {
3530
if (mat == nullptr) return kPD_NULLPTR;
3631
auto ptr = cast(mat);
3732
delete ptr;
3833
return kPD_NO_ERROR;
3934
}
4035

41-
int PDMatCopyToRow(PD_Matrix mat, uint64_t rowID, pd_real* rowArray) {
36+
PD_Error PDMatCopyToRow(PD_Matrix mat, uint64_t rowID, pd_real* rowArray) {
4237
if (mat == nullptr) return kPD_NULLPTR;
4338
auto ptr = cast(mat);
4439
if (ptr->mat == nullptr) return kPD_NULLPTR;
@@ -53,7 +48,7 @@ int PDMatCopyToRow(PD_Matrix mat, uint64_t rowID, pd_real* rowArray) {
5348
return kPD_NO_ERROR;
5449
}
5550

56-
int PDMatGetRow(PD_Matrix mat, uint64_t rowID, pd_real** rawRowBuffer) {
51+
PD_Error PDMatGetRow(PD_Matrix mat, uint64_t rowID, pd_real** rawRowBuffer) {
5752
if (mat == nullptr) return kPD_NULLPTR;
5853
auto ptr = cast(mat);
5954
if (ptr->mat == nullptr) return kPD_NULLPTR;
@@ -62,7 +57,7 @@ int PDMatGetRow(PD_Matrix mat, uint64_t rowID, pd_real** rawRowBuffer) {
6257
return kPD_NO_ERROR;
6358
}
6459

65-
int PDMatGetShape(PD_Matrix mat, uint64_t* height, uint64_t* width) {
60+
PD_Error PDMatGetShape(PD_Matrix mat, uint64_t* height, uint64_t* width) {
6661
if (mat == nullptr) return kPD_NULLPTR;
6762
if (height != nullptr) {
6863
*height = cast(mat)->mat->getHeight();

0 commit comments

Comments
 (0)