Skip to content

Commit 0afd5c3

Browse files
reyoungreyoung
committed
Stash
1 parent b528828 commit 0afd5c3

File tree

5 files changed

+92
-82
lines changed

5 files changed

+92
-82
lines changed

‎paddle/capi/Arguments.cpp‎

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

2323
extern "C" {
24-
PD_Arguments PDArgsCreateNone() { return new paddle::capi::CArguments(); }
24+
paddle_arguments paddle_arguments_create_none() {
25+
return new paddle::capi::CArguments();
26+
}
2527

26-
paddle_error PDArgsDestroy(PD_Arguments args) {
28+
paddle_error paddle_arguments_destroy(paddle_arguments args) {
2729
if (args == nullptr) return kPD_NULLPTR;
2830
delete castArg(args);
2931
return kPD_NO_ERROR;
3032
}
3133

32-
paddle_error PDArgsGetSize(PD_Arguments args, uint64_t* size) {
34+
paddle_error paddle_arguments_size(paddle_arguments args, uint64_t* size) {
3335
if (args == nullptr || size == nullptr) return kPD_NULLPTR;
3436
*size = castArg(args)->args.size();
3537
return kPD_NO_ERROR;
3638
}
3739

38-
paddle_error PDArgsResize(PD_Arguments args, uint64_t size) {
40+
paddle_error paddle_arguments_resize(paddle_arguments args, uint64_t size) {
3941
if (args == nullptr) return kPD_NULLPTR;
4042
castArg(args)->args.resize(size);
4143
return kPD_NO_ERROR;
4244
}
4345

44-
paddle_error PDArgsSetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) {
46+
paddle_error paddle_arguments_set_value(paddle_arguments args,
47+
uint64_t ID,
48+
paddle_matrix mat) {
4549
if (args == nullptr || mat == nullptr) return kPD_NULLPTR;
4650
auto m = paddle::capi::cast<paddle::capi::CMatrix>(mat);
4751
if (m->mat == nullptr) return kPD_NULLPTR;
@@ -51,7 +55,9 @@ paddle_error PDArgsSetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) {
5155
return kPD_NO_ERROR;
5256
}
5357

54-
paddle_error PDArgsGetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) {
58+
paddle_error paddle_arguments_value(paddle_arguments args,
59+
uint64_t ID,
60+
paddle_matrix mat) {
5561
if (args == nullptr || mat == nullptr) return kPD_NULLPTR;
5662
auto m = paddle::capi::cast<paddle::capi::CMatrix>(mat);
5763
auto a = castArg(args);
@@ -60,7 +66,9 @@ paddle_error PDArgsGetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) {
6066
return kPD_NO_ERROR;
6167
}
6268

63-
paddle_error PDArgsGetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) {
69+
paddle_error paddle_arguments_ids(paddle_arguments args,
70+
uint64_t ID,
71+
paddle_ivector ids) {
6472
if (args == nullptr || ids == nullptr) return kPD_NULLPTR;
6573
auto iv = castIVec(ids);
6674
auto a = castArg(args);
@@ -69,7 +77,9 @@ paddle_error PDArgsGetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) {
6977
return kPD_NO_ERROR;
7078
}
7179

72-
paddle_error PDArgsSetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) {
80+
paddle_error paddle_arguments_set_ids(paddle_arguments args,
81+
uint64_t ID,
82+
paddle_ivector ids) {
7383
//! TODO(lizhao): Complete this method.
7484
if (args == nullptr || ids == nullptr) return kPD_NULLPTR;
7585
auto iv = paddle::capi::cast<paddle::capi::CIVector>(ids);
@@ -80,9 +90,9 @@ paddle_error PDArgsSetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) {
8090
return kPD_NO_ERROR;
8191
}
8292

83-
paddle_error PDArgsSetSequenceStartPos(PD_Arguments args,
84-
uint64_t ID,
85-
paddle_ivector seqPos) {
93+
paddle_error paddle_arguments_set_sequence_start_pos(paddle_arguments args,
94+
uint64_t ID,
95+
paddle_ivector seqPos) {
8696
if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR;
8797
auto iv = paddle::capi::cast<paddle::capi::CIVector>(seqPos);
8898
if (iv->vec == nullptr) return kPD_NULLPTR;
@@ -93,9 +103,8 @@ paddle_error PDArgsSetSequenceStartPos(PD_Arguments args,
93103
return kPD_NO_ERROR;
94104
}
95105

96-
paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args,
97-
uint64_t ID,
98-
paddle_ivector subSeqPos) {
106+
paddle_error paddle_arguments_set_sub_sequence_start_pos(
107+
paddle_arguments args, uint64_t ID, paddle_ivector subSeqPos) {
99108
if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR;
100109
auto iv = paddle::capi::cast<paddle::capi::CIVector>(subSeqPos);
101110
if (iv->vec == nullptr) return kPD_NULLPTR;
@@ -106,9 +115,9 @@ paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args,
106115
return kPD_NO_ERROR;
107116
}
108117

109-
paddle_error PDArgsGetSequenceStartPos(PD_Arguments args,
110-
uint64_t ID,
111-
paddle_ivector seqPos) {
118+
paddle_error paddle_arguments_sequence_start_pos(paddle_arguments args,
119+
uint64_t ID,
120+
paddle_ivector seqPos) {
112121
if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR;
113122
auto iv = castIVec(seqPos);
114123
auto a = castArg(args);
@@ -118,9 +127,9 @@ paddle_error PDArgsGetSequenceStartPos(PD_Arguments args,
118127
return kPD_NO_ERROR;
119128
}
120129

121-
paddle_error PDArgsGetSubSequenceStartPos(PD_Arguments args,
122-
uint64_t ID,
123-
paddle_ivector subSeqPos) {
130+
paddle_error paddle_arguments_sub_sequence_start_pos(paddle_arguments args,
131+
uint64_t ID,
132+
paddle_ivector subSeqPos) {
124133
if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR;
125134
auto iv = castIVec(subSeqPos);
126135
auto a = castArg(args);

‎paddle/capi/GradientMachine.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ paddle_error PDGradientMachineLoadParameterFromDisk(PD_GradientMachine machine,
7070
}
7171

7272
paddle_error PDGradientMachineForward(PD_GradientMachine machine,
73-
PD_Arguments inArgs,
74-
PD_Arguments outArgs,
73+
paddle_arguments inArgs,
74+
paddle_arguments outArgs,
7575
bool isTrain) {
7676
auto m = cast(machine);
7777
auto in = paddle::capi::cast<paddle::capi::CArguments>(inArgs);

‎paddle/capi/PaddleCAPI.h‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,39 @@ extern "C" {
3636
* Arguments functions. Each argument means layer output. Arguments means a
3737
* array of arguemnt.
3838
*/
39-
typedef void* PD_Arguments;
39+
typedef void* paddle_arguments;
4040

4141
/**
42-
* @brief PDArgsCreateNone Create a array of arguments, which size is zero.
42+
* @brief paddle_arguments_create_none Create a array of arguments, which size
43+
* is zero.
4344
* @return Arguemnts
4445
*/
45-
PD_API PD_Arguments PDArgsCreateNone();
46+
PD_API paddle_arguments paddle_arguments_create_none();
4647

4748
/**
48-
* @brief PDArgsDestroy Destroy the arguments
49+
* @brief paddle_arguments_destroy Destroy the arguments
4950
* @param args arguments to destroy
5051
* @return paddle_error
5152
*/
52-
PD_API paddle_error PDArgsDestroy(PD_Arguments args);
53+
PD_API paddle_error paddle_arguments_destroy(paddle_arguments args);
5354

5455
/**
5556
* @brief PDArgsGetSize Get size of arguments array
5657
* @param [in] args arguments array
5758
* @param [out] size array size
5859
* @return paddle_error
5960
*/
60-
PD_API paddle_error PDArgsGetSize(PD_Arguments args, uint64_t* size);
61+
PD_API paddle_error paddle_arguments_size(paddle_arguments args,
62+
uint64_t* size);
6163

6264
/**
6365
* @brief PDArgsResize Resize a arguments array.
6466
* @param args arguments array.
6567
* @param size target size of array
6668
* @return paddle_error
6769
*/
68-
PD_API paddle_error PDArgsResize(PD_Arguments args, uint64_t size);
70+
PD_API paddle_error paddle_arguments_resize(paddle_arguments args,
71+
uint64_t size);
6972

7073
/**
7174
* @brief PDArgsSetValue Set value matrix of one argument in array, which index
@@ -75,9 +78,9 @@ PD_API paddle_error PDArgsResize(PD_Arguments args, uint64_t size);
7578
* @param mat matrix pointer
7679
* @return paddle_error
7780
*/
78-
PD_API paddle_error PDArgsSetValue(PD_Arguments args,
79-
uint64_t ID,
80-
paddle_matrix mat);
81+
PD_API paddle_error paddle_arguments_set_value(paddle_arguments args,
82+
uint64_t ID,
83+
paddle_matrix mat);
8184

8285
/**
8386
* @brief PDArgsGetValue Get value matrix of one argument in array, which index
@@ -87,9 +90,9 @@ PD_API paddle_error PDArgsSetValue(PD_Arguments args,
8790
* @param [out] mat matrix pointer
8891
* @return paddle_error
8992
*/
90-
PD_API paddle_error PDArgsGetValue(PD_Arguments args,
91-
uint64_t ID,
92-
paddle_matrix mat);
93+
PD_API paddle_error paddle_arguments_value(paddle_arguments args,
94+
uint64_t ID,
95+
paddle_matrix mat);
9396

9497
/**
9598
* @brief PDArgsGetIds Get the integer vector of one argument in array, which
@@ -99,9 +102,9 @@ PD_API paddle_error PDArgsGetValue(PD_Arguments args,
99102
* @param ids integer vector pointer
100103
* @return paddle_error
101104
*/
102-
PD_API paddle_error PDArgsGetIds(PD_Arguments args,
103-
uint64_t ID,
104-
paddle_ivector ids);
105+
PD_API paddle_error paddle_arguments_ids(paddle_arguments args,
106+
uint64_t ID,
107+
paddle_ivector ids);
105108

106109
/**
107110
* @brief PDArgsSetIds Set the integer vector of one argument in array, which
@@ -111,9 +114,9 @@ PD_API paddle_error PDArgsGetIds(PD_Arguments args,
111114
* @param [out] ids integer vector pointer
112115
* @return paddle_error
113116
*/
114-
PD_API paddle_error PDArgsSetIds(PD_Arguments args,
115-
uint64_t ID,
116-
paddle_ivector ids);
117+
PD_API paddle_error paddle_arguments_set_ids(paddle_arguments args,
118+
uint64_t ID,
119+
paddle_ivector ids);
117120

118121
/**
119122
* @brief PDArgsSetSequenceStartPos Set sequence start position vector of one
@@ -123,9 +126,8 @@ PD_API paddle_error PDArgsSetIds(PD_Arguments args,
123126
* @param seqPos sequence position array.
124127
* @return paddle_error
125128
*/
126-
PD_API paddle_error PDArgsSetSequenceStartPos(PD_Arguments args,
127-
uint64_t ID,
128-
paddle_ivector seqPos);
129+
PD_API paddle_error paddle_arguments_set_sequence_start_pos(
130+
paddle_arguments args, uint64_t ID, paddle_ivector seqPos);
129131
/**
130132
* @brief PDArgsGetSequenceStartPos Get sequence start position vector of one
131133
* argument in array, which index is `ID`.
@@ -134,9 +136,9 @@ PD_API paddle_error PDArgsSetSequenceStartPos(PD_Arguments args,
134136
* @param [out] seqPos sequence position array
135137
* @return paddle_error
136138
*/
137-
PD_API paddle_error PDArgsGetSequenceStartPos(PD_Arguments args,
138-
uint64_t ID,
139-
paddle_ivector seqPos);
139+
PD_API paddle_error paddle_arguments_sequence_start_pos(paddle_arguments args,
140+
uint64_t ID,
141+
paddle_ivector seqPos);
140142

141143
/**
142144
* @brief PDArgsSetSubSequenceStartPos Set sub-sequence start position vector of
@@ -146,9 +148,8 @@ PD_API paddle_error PDArgsGetSequenceStartPos(PD_Arguments args,
146148
* @param subSeqPos sub-sequence start position array.
147149
* @return paddle_error
148150
*/
149-
PD_API paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args,
150-
uint64_t ID,
151-
paddle_ivector subSeqPos);
151+
PD_API paddle_error paddle_arguments_set_sub_sequence_start_pos(
152+
paddle_arguments args, uint64_t ID, paddle_ivector subSeqPos);
152153

153154
/**
154155
* @brief PDArgsGetSubSequenceStartPos Get sub-sequence start position vector of
@@ -158,9 +159,8 @@ PD_API paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args,
158159
* @param subSeqPos sub-sequence start position array
159160
* @return paddle_error
160161
*/
161-
PD_API paddle_error PDArgsGetSubSequenceStartPos(PD_Arguments args,
162-
uint64_t ID,
163-
paddle_ivector subSeqPos);
162+
PD_API paddle_error paddle_arguments_sub_sequence_start_pos(
163+
paddle_arguments args, uint64_t ID, paddle_ivector subSeqPos);
164164
/**
165165
* @brief GradientMachine means a neural network.
166166
*/
@@ -195,8 +195,8 @@ PD_API paddle_error PDGradientMachineLoadParameterFromDisk(
195195
* @return paddle_error
196196
*/
197197
PD_API paddle_error PDGradientMachineForward(PD_GradientMachine machine,
198-
PD_Arguments inArgs,
199-
PD_Arguments outArgs,
198+
paddle_arguments inArgs,
199+
paddle_arguments outArgs,
200200
bool isTrain);
201201

202202
/**

‎paddle/capi/tests/test_Arguments.cpp‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@ static std::vector<pd_real> randomBuffer(size_t bufSize) {
2828
}
2929

3030
TEST(CAPIArguments, create) {
31-
PD_Arguments args = PDArgsCreateNone();
31+
paddle_arguments args = paddle_arguments_create_none();
3232
uint64_t size;
33-
ASSERT_EQ(kPD_NO_ERROR, PDArgsGetSize(args, &size));
33+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_size(args, &size));
3434
ASSERT_EQ(0UL, size);
35-
ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args));
35+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args));
3636
}
3737

3838
TEST(CAPIArguments, value) {
39-
PD_Arguments args = PDArgsCreateNone();
40-
ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(args, 1));
39+
paddle_arguments args = paddle_arguments_create_none();
40+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(args, 1));
4141

4242
paddle_matrix mat = paddle_matrix_create(128, 64, false);
4343
for (size_t i = 0; i < 128; ++i) {
4444
std::vector<pd_real> sampleBuf = randomBuffer(64);
4545
paddle_matrix_set_row(mat, i, sampleBuf.data());
4646
}
47-
ASSERT_EQ(kPD_NO_ERROR, PDArgsSetValue(args, 0, mat));
47+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_set_value(args, 0, mat));
4848

4949
paddle_matrix val = paddle_matrix_create_none();
5050

51-
ASSERT_EQ(kPD_NO_ERROR, PDArgsGetValue(args, 0, val));
51+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_value(args, 0, val));
5252

5353
for (size_t i = 0; i < 128; ++i) {
5454
pd_real* row1;
@@ -63,29 +63,29 @@ TEST(CAPIArguments, value) {
6363
ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(ivec));
6464
ASSERT_EQ(kPD_NO_ERROR, paddle_matrix_destroy(val));
6565
ASSERT_EQ(kPD_NO_ERROR, paddle_matrix_destroy(mat));
66-
ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args));
66+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args));
6767
}
6868

6969
TEST(CAPIArguments, ids) {
70-
PD_Arguments args = PDArgsCreateNone();
71-
ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(args, 1));
70+
paddle_arguments args = paddle_arguments_create_none();
71+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(args, 1));
7272

7373
paddle_ivector ivec;
7474
int array[3] = {1, 2, 3};
7575
ivec = paddle_ivector_create(array, 3, true, false);
76-
ASSERT_EQ(kPD_NO_ERROR, PDArgsSetIds(args, 0, ivec));
76+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_set_ids(args, 0, ivec));
7777

7878
paddle_ivector val = paddle_ivector_create_none();
79-
ASSERT_EQ(kPD_NO_ERROR, PDArgsGetIds(args, 0, val));
79+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_ids(args, 0, val));
8080
ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(ivec));
8181
ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(val));
82-
ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args));
82+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args));
8383
}
8484

8585
template <typename T1, typename T2>
8686
void testSequenceHelper(T1 setter, T2 getter) {
87-
PD_Arguments args = PDArgsCreateNone();
88-
ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(args, 1));
87+
paddle_arguments args = paddle_arguments_create_none();
88+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(args, 1));
8989

9090
paddle_ivector ivec;
9191
int array[3] = {1, 2, 3};
@@ -105,11 +105,12 @@ void testSequenceHelper(T1 setter, T2 getter) {
105105

106106
ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(ivec));
107107
ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(val));
108-
ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args));
108+
ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args));
109109
}
110110

111111
TEST(CAPIArguments, Sequence) {
112-
testSequenceHelper(PDArgsSetSequenceStartPos, PDArgsGetSequenceStartPos);
113-
testSequenceHelper(PDArgsSetSubSequenceStartPos,
114-
PDArgsGetSubSequenceStartPos);
112+
testSequenceHelper(paddle_arguments_set_sequence_start_pos,
113+
paddle_arguments_sequence_start_pos);
114+
testSequenceHelper(paddle_arguments_set_sub_sequence_start_pos,
115+
paddle_arguments_sub_sequence_start_pos);
115116
}

0 commit comments

Comments
 (0)