From 0afd5c30a85340fa639d4f2f4805c2c8548dce58 Mon Sep 17 00:00:00 2001 From: Yu Yang Date: Tue, 21 Mar 2017 13:27:39 +0800 Subject: [PATCH] Stash --- paddle/capi/Arguments.cpp | 49 +++++++++------- paddle/capi/GradientMachine.cpp | 4 +- paddle/capi/PaddleCAPI.h | 66 +++++++++++----------- paddle/capi/tests/test_Arguments.cpp | 39 ++++++------- paddle/capi/tests/test_GradientMachine.cpp | 16 +++--- 5 files changed, 92 insertions(+), 82 deletions(-) diff --git a/paddle/capi/Arguments.cpp b/paddle/capi/Arguments.cpp index 29aa0858dd8..792b8c58a9a 100644 --- a/paddle/capi/Arguments.cpp +++ b/paddle/capi/Arguments.cpp @@ -21,27 +21,31 @@ using paddle::capi::cast; #define castIVec(v) cast(v) extern "C" { -PD_Arguments PDArgsCreateNone() { return new paddle::capi::CArguments(); } +paddle_arguments paddle_arguments_create_none() { + return new paddle::capi::CArguments(); +} -paddle_error PDArgsDestroy(PD_Arguments args) { +paddle_error paddle_arguments_destroy(paddle_arguments args) { if (args == nullptr) return kPD_NULLPTR; delete castArg(args); return kPD_NO_ERROR; } -paddle_error PDArgsGetSize(PD_Arguments args, uint64_t* size) { +paddle_error paddle_arguments_size(paddle_arguments args, uint64_t* size) { if (args == nullptr || size == nullptr) return kPD_NULLPTR; *size = castArg(args)->args.size(); return kPD_NO_ERROR; } -paddle_error PDArgsResize(PD_Arguments args, uint64_t size) { +paddle_error paddle_arguments_resize(paddle_arguments args, uint64_t size) { if (args == nullptr) return kPD_NULLPTR; castArg(args)->args.resize(size); return kPD_NO_ERROR; } -paddle_error PDArgsSetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) { +paddle_error paddle_arguments_set_value(paddle_arguments args, + uint64_t ID, + paddle_matrix mat) { if (args == nullptr || mat == nullptr) return kPD_NULLPTR; auto m = paddle::capi::cast(mat); if (m->mat == nullptr) return kPD_NULLPTR; @@ -51,7 +55,9 @@ paddle_error PDArgsSetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) { return kPD_NO_ERROR; } -paddle_error PDArgsGetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) { +paddle_error paddle_arguments_value(paddle_arguments args, + uint64_t ID, + paddle_matrix mat) { if (args == nullptr || mat == nullptr) return kPD_NULLPTR; auto m = paddle::capi::cast(mat); auto a = castArg(args); @@ -60,7 +66,9 @@ paddle_error PDArgsGetValue(PD_Arguments args, uint64_t ID, paddle_matrix mat) { return kPD_NO_ERROR; } -paddle_error PDArgsGetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) { +paddle_error paddle_arguments_ids(paddle_arguments args, + uint64_t ID, + paddle_ivector ids) { if (args == nullptr || ids == nullptr) return kPD_NULLPTR; auto iv = castIVec(ids); auto a = castArg(args); @@ -69,7 +77,9 @@ paddle_error PDArgsGetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) { return kPD_NO_ERROR; } -paddle_error PDArgsSetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) { +paddle_error paddle_arguments_set_ids(paddle_arguments args, + uint64_t ID, + paddle_ivector ids) { //! TODO(lizhao): Complete this method. if (args == nullptr || ids == nullptr) return kPD_NULLPTR; auto iv = paddle::capi::cast(ids); @@ -80,9 +90,9 @@ paddle_error PDArgsSetIds(PD_Arguments args, uint64_t ID, paddle_ivector ids) { return kPD_NO_ERROR; } -paddle_error PDArgsSetSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector seqPos) { +paddle_error paddle_arguments_set_sequence_start_pos(paddle_arguments args, + uint64_t ID, + paddle_ivector seqPos) { if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR; auto iv = paddle::capi::cast(seqPos); if (iv->vec == nullptr) return kPD_NULLPTR; @@ -93,9 +103,8 @@ paddle_error PDArgsSetSequenceStartPos(PD_Arguments args, return kPD_NO_ERROR; } -paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector subSeqPos) { +paddle_error paddle_arguments_set_sub_sequence_start_pos( + paddle_arguments args, uint64_t ID, paddle_ivector subSeqPos) { if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR; auto iv = paddle::capi::cast(subSeqPos); if (iv->vec == nullptr) return kPD_NULLPTR; @@ -106,9 +115,9 @@ paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args, return kPD_NO_ERROR; } -paddle_error PDArgsGetSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector seqPos) { +paddle_error paddle_arguments_sequence_start_pos(paddle_arguments args, + uint64_t ID, + paddle_ivector seqPos) { if (args == nullptr || seqPos == nullptr) return kPD_NULLPTR; auto iv = castIVec(seqPos); auto a = castArg(args); @@ -118,9 +127,9 @@ paddle_error PDArgsGetSequenceStartPos(PD_Arguments args, return kPD_NO_ERROR; } -paddle_error PDArgsGetSubSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector subSeqPos) { +paddle_error paddle_arguments_sub_sequence_start_pos(paddle_arguments args, + uint64_t ID, + paddle_ivector subSeqPos) { if (args == nullptr || subSeqPos == nullptr) return kPD_NULLPTR; auto iv = castIVec(subSeqPos); auto a = castArg(args); diff --git a/paddle/capi/GradientMachine.cpp b/paddle/capi/GradientMachine.cpp index 6ca3cf7e4d8..9f0ffd6599f 100644 --- a/paddle/capi/GradientMachine.cpp +++ b/paddle/capi/GradientMachine.cpp @@ -70,8 +70,8 @@ paddle_error PDGradientMachineLoadParameterFromDisk(PD_GradientMachine machine, } paddle_error PDGradientMachineForward(PD_GradientMachine machine, - PD_Arguments inArgs, - PD_Arguments outArgs, + paddle_arguments inArgs, + paddle_arguments outArgs, bool isTrain) { auto m = cast(machine); auto in = paddle::capi::cast(inArgs); diff --git a/paddle/capi/PaddleCAPI.h b/paddle/capi/PaddleCAPI.h index 37dfb13814b..eea7c3bd05f 100644 --- a/paddle/capi/PaddleCAPI.h +++ b/paddle/capi/PaddleCAPI.h @@ -36,20 +36,21 @@ extern "C" { * Arguments functions. Each argument means layer output. Arguments means a * array of arguemnt. */ -typedef void* PD_Arguments; +typedef void* paddle_arguments; /** - * @brief PDArgsCreateNone Create a array of arguments, which size is zero. + * @brief paddle_arguments_create_none Create a array of arguments, which size + * is zero. * @return Arguemnts */ -PD_API PD_Arguments PDArgsCreateNone(); +PD_API paddle_arguments paddle_arguments_create_none(); /** - * @brief PDArgsDestroy Destroy the arguments + * @brief paddle_arguments_destroy Destroy the arguments * @param args arguments to destroy * @return paddle_error */ -PD_API paddle_error PDArgsDestroy(PD_Arguments args); +PD_API paddle_error paddle_arguments_destroy(paddle_arguments args); /** * @brief PDArgsGetSize Get size of arguments array @@ -57,7 +58,8 @@ PD_API paddle_error PDArgsDestroy(PD_Arguments args); * @param [out] size array size * @return paddle_error */ -PD_API paddle_error PDArgsGetSize(PD_Arguments args, uint64_t* size); +PD_API paddle_error paddle_arguments_size(paddle_arguments args, + uint64_t* size); /** * @brief PDArgsResize Resize a arguments array. @@ -65,7 +67,8 @@ PD_API paddle_error PDArgsGetSize(PD_Arguments args, uint64_t* size); * @param size target size of array * @return paddle_error */ -PD_API paddle_error PDArgsResize(PD_Arguments args, uint64_t size); +PD_API paddle_error paddle_arguments_resize(paddle_arguments args, + uint64_t size); /** * @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); * @param mat matrix pointer * @return paddle_error */ -PD_API paddle_error PDArgsSetValue(PD_Arguments args, - uint64_t ID, - paddle_matrix mat); +PD_API paddle_error paddle_arguments_set_value(paddle_arguments args, + uint64_t ID, + paddle_matrix mat); /** * @brief PDArgsGetValue Get value matrix of one argument in array, which index @@ -87,9 +90,9 @@ PD_API paddle_error PDArgsSetValue(PD_Arguments args, * @param [out] mat matrix pointer * @return paddle_error */ -PD_API paddle_error PDArgsGetValue(PD_Arguments args, - uint64_t ID, - paddle_matrix mat); +PD_API paddle_error paddle_arguments_value(paddle_arguments args, + uint64_t ID, + paddle_matrix mat); /** * @brief PDArgsGetIds Get the integer vector of one argument in array, which @@ -99,9 +102,9 @@ PD_API paddle_error PDArgsGetValue(PD_Arguments args, * @param ids integer vector pointer * @return paddle_error */ -PD_API paddle_error PDArgsGetIds(PD_Arguments args, - uint64_t ID, - paddle_ivector ids); +PD_API paddle_error paddle_arguments_ids(paddle_arguments args, + uint64_t ID, + paddle_ivector ids); /** * @brief PDArgsSetIds Set the integer vector of one argument in array, which @@ -111,9 +114,9 @@ PD_API paddle_error PDArgsGetIds(PD_Arguments args, * @param [out] ids integer vector pointer * @return paddle_error */ -PD_API paddle_error PDArgsSetIds(PD_Arguments args, - uint64_t ID, - paddle_ivector ids); +PD_API paddle_error paddle_arguments_set_ids(paddle_arguments args, + uint64_t ID, + paddle_ivector ids); /** * @brief PDArgsSetSequenceStartPos Set sequence start position vector of one @@ -123,9 +126,8 @@ PD_API paddle_error PDArgsSetIds(PD_Arguments args, * @param seqPos sequence position array. * @return paddle_error */ -PD_API paddle_error PDArgsSetSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector seqPos); +PD_API paddle_error paddle_arguments_set_sequence_start_pos( + paddle_arguments args, uint64_t ID, paddle_ivector seqPos); /** * @brief PDArgsGetSequenceStartPos Get sequence start position vector of one * argument in array, which index is `ID`. @@ -134,9 +136,9 @@ PD_API paddle_error PDArgsSetSequenceStartPos(PD_Arguments args, * @param [out] seqPos sequence position array * @return paddle_error */ -PD_API paddle_error PDArgsGetSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector seqPos); +PD_API paddle_error paddle_arguments_sequence_start_pos(paddle_arguments args, + uint64_t ID, + paddle_ivector seqPos); /** * @brief PDArgsSetSubSequenceStartPos Set sub-sequence start position vector of @@ -146,9 +148,8 @@ PD_API paddle_error PDArgsGetSequenceStartPos(PD_Arguments args, * @param subSeqPos sub-sequence start position array. * @return paddle_error */ -PD_API paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector subSeqPos); +PD_API paddle_error paddle_arguments_set_sub_sequence_start_pos( + paddle_arguments args, uint64_t ID, paddle_ivector subSeqPos); /** * @brief PDArgsGetSubSequenceStartPos Get sub-sequence start position vector of @@ -158,9 +159,8 @@ PD_API paddle_error PDArgsSetSubSequenceStartPos(PD_Arguments args, * @param subSeqPos sub-sequence start position array * @return paddle_error */ -PD_API paddle_error PDArgsGetSubSequenceStartPos(PD_Arguments args, - uint64_t ID, - paddle_ivector subSeqPos); +PD_API paddle_error paddle_arguments_sub_sequence_start_pos( + paddle_arguments args, uint64_t ID, paddle_ivector subSeqPos); /** * @brief GradientMachine means a neural network. */ @@ -195,8 +195,8 @@ PD_API paddle_error PDGradientMachineLoadParameterFromDisk( * @return paddle_error */ PD_API paddle_error PDGradientMachineForward(PD_GradientMachine machine, - PD_Arguments inArgs, - PD_Arguments outArgs, + paddle_arguments inArgs, + paddle_arguments outArgs, bool isTrain); /** diff --git a/paddle/capi/tests/test_Arguments.cpp b/paddle/capi/tests/test_Arguments.cpp index 92dcf6bf9c5..b445b396f3c 100644 --- a/paddle/capi/tests/test_Arguments.cpp +++ b/paddle/capi/tests/test_Arguments.cpp @@ -28,27 +28,27 @@ static std::vector randomBuffer(size_t bufSize) { } TEST(CAPIArguments, create) { - PD_Arguments args = PDArgsCreateNone(); + paddle_arguments args = paddle_arguments_create_none(); uint64_t size; - ASSERT_EQ(kPD_NO_ERROR, PDArgsGetSize(args, &size)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_size(args, &size)); ASSERT_EQ(0UL, size); - ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args)); } TEST(CAPIArguments, value) { - PD_Arguments args = PDArgsCreateNone(); - ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(args, 1)); + paddle_arguments args = paddle_arguments_create_none(); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(args, 1)); paddle_matrix mat = paddle_matrix_create(128, 64, false); for (size_t i = 0; i < 128; ++i) { std::vector sampleBuf = randomBuffer(64); paddle_matrix_set_row(mat, i, sampleBuf.data()); } - ASSERT_EQ(kPD_NO_ERROR, PDArgsSetValue(args, 0, mat)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_set_value(args, 0, mat)); paddle_matrix val = paddle_matrix_create_none(); - ASSERT_EQ(kPD_NO_ERROR, PDArgsGetValue(args, 0, val)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_value(args, 0, val)); for (size_t i = 0; i < 128; ++i) { pd_real* row1; @@ -63,29 +63,29 @@ TEST(CAPIArguments, value) { ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(ivec)); ASSERT_EQ(kPD_NO_ERROR, paddle_matrix_destroy(val)); ASSERT_EQ(kPD_NO_ERROR, paddle_matrix_destroy(mat)); - ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args)); } TEST(CAPIArguments, ids) { - PD_Arguments args = PDArgsCreateNone(); - ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(args, 1)); + paddle_arguments args = paddle_arguments_create_none(); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(args, 1)); paddle_ivector ivec; int array[3] = {1, 2, 3}; ivec = paddle_ivector_create(array, 3, true, false); - ASSERT_EQ(kPD_NO_ERROR, PDArgsSetIds(args, 0, ivec)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_set_ids(args, 0, ivec)); paddle_ivector val = paddle_ivector_create_none(); - ASSERT_EQ(kPD_NO_ERROR, PDArgsGetIds(args, 0, val)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_ids(args, 0, val)); ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(ivec)); ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(val)); - ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args)); } template void testSequenceHelper(T1 setter, T2 getter) { - PD_Arguments args = PDArgsCreateNone(); - ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(args, 1)); + paddle_arguments args = paddle_arguments_create_none(); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(args, 1)); paddle_ivector ivec; int array[3] = {1, 2, 3}; @@ -105,11 +105,12 @@ void testSequenceHelper(T1 setter, T2 getter) { ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(ivec)); ASSERT_EQ(kPD_NO_ERROR, paddle_ivector_destroy(val)); - ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(args)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(args)); } TEST(CAPIArguments, Sequence) { - testSequenceHelper(PDArgsSetSequenceStartPos, PDArgsGetSequenceStartPos); - testSequenceHelper(PDArgsSetSubSequenceStartPos, - PDArgsGetSubSequenceStartPos); + testSequenceHelper(paddle_arguments_set_sequence_start_pos, + paddle_arguments_sequence_start_pos); + testSequenceHelper(paddle_arguments_set_sub_sequence_start_pos, + paddle_arguments_sub_sequence_start_pos); } diff --git a/paddle/capi/tests/test_GradientMachine.cpp b/paddle/capi/tests/test_GradientMachine.cpp index 05a06445c27..c35432288b4 100644 --- a/paddle/capi/tests/test_GradientMachine.cpp +++ b/paddle/capi/tests/test_GradientMachine.cpp @@ -55,10 +55,10 @@ TEST(GradientMachine, testPredict) { PDGradientMachineCreateSharedParam( machine, &buffer[0], (int)buffer.size(), &machineSlave)); std::swap(machineSlave, machine); - PD_Arguments outArgs = PDArgsCreateNone(); + paddle_arguments outArgs = paddle_arguments_create_none(); - PD_Arguments inArgs = PDArgsCreateNone(); - ASSERT_EQ(kPD_NO_ERROR, PDArgsResize(inArgs, 1)); + paddle_arguments inArgs = paddle_arguments_create_none(); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_resize(inArgs, 1)); paddle_matrix mat = paddle_matrix_create(1, 100, false); static_assert(std::is_same::value, ""); @@ -67,15 +67,15 @@ TEST(GradientMachine, testPredict) { ASSERT_EQ(kPD_NO_ERROR, paddle_matrix_get_row(mat, 0, &rowPtr)); memcpy(rowPtr, data.data(), data.size() * sizeof(pd_real)); - ASSERT_EQ(kPD_NO_ERROR, PDArgsSetValue(inArgs, 0, mat)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_set_value(inArgs, 0, mat)); ASSERT_EQ(kPD_NO_ERROR, PDGradientMachineForward(machine, inArgs, outArgs, false)); uint64_t sz; - ASSERT_EQ(kPD_NO_ERROR, PDArgsGetSize(outArgs, &sz)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_size(outArgs, &sz)); ASSERT_EQ(1UL, sz); - ASSERT_EQ(kPD_NO_ERROR, PDArgsGetValue(outArgs, 0, mat)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_value(outArgs, 0, mat)); std::vector paddleInArgs; std::vector paddleOutArgs; paddleInArgs.resize(1); @@ -97,8 +97,8 @@ TEST(GradientMachine, testPredict) { } ASSERT_EQ(kPD_NO_ERROR, paddle_matrix_destroy(mat)); - ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(inArgs)); - ASSERT_EQ(kPD_NO_ERROR, PDArgsDestroy(outArgs)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(inArgs)); + ASSERT_EQ(kPD_NO_ERROR, paddle_arguments_destroy(outArgs)); std::swap(machineSlave, machine); ASSERT_EQ(kPD_NO_ERROR, PDGradientMachineDestroy(machineSlave)); ASSERT_EQ(kPD_NO_ERROR, PDGradientMachineDestroy(machine)); -- GitLab