diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt index 0c073cc00d123cd60dddf287dcb58620577015f0..4aaa43d79612111856dd4dfc954ca2bfd8f4fa63 100644 --- a/paddle/framework/CMakeLists.txt +++ b/paddle/framework/CMakeLists.txt @@ -18,9 +18,8 @@ cc_test(scope_test SRCS scope_test.cc DEPS scope) proto_library(framework_proto SRCS framework.proto) -cc_library(var_desc SRCS var_desc.cc DEPS framework_proto) - cc_library(attribute SRCS attribute.cc DEPS framework_proto) +cc_library(proto_desc SRCS var_desc.cc op_desc.cc block_desc.cc program_desc.cc DEPS attribute) cc_library(op_proto_maker SRCS op_proto_maker.cc DEPS framework_proto attribute) cc_test(op_proto_maker_test SRCS op_proto_maker_test.cc DEPS op_proto_maker) cc_library(op_info SRCS op_info.cc DEPS attribute framework_proto) diff --git a/paddle/framework/block_desc.cc b/paddle/framework/block_desc.cc index 60f793a16096f170e29b106938ab350ac5a89508..9570aedfdda332b797a8f348e0f6cf81bb2aee2f 100644 --- a/paddle/framework/block_desc.cc +++ b/paddle/framework/block_desc.cc @@ -13,8 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "paddle/framework/block_desc.h" -#include "paddle/framework/op_desc.h" -#include "paddle/framework/var_desc.h" +#include "paddle/framework/program_desc.h" namespace paddle { namespace framework { @@ -86,5 +85,5 @@ void OpDescBind::SetBlockAttr(const std::string &name, BlockDescBind &block) { BlockDesc *desc = block.RawPtr(); this->attrs_[name] = desc; } -} -} \ No newline at end of file +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/block_desc.h b/paddle/framework/block_desc.h index 4ae6cb7b0e19181046e95aa7fe2d6f60d116f989..1a1135bab44cd27bb7d784c3b486188aa40635e4 100644 --- a/paddle/framework/block_desc.h +++ b/paddle/framework/block_desc.h @@ -14,16 +14,16 @@ limitations under the License. */ #pragma once +#include #include #include -#include "paddle/framework/framework.pb.h" +#include "paddle/framework/op_desc.h" +#include "paddle/framework/var_desc.h" namespace paddle { namespace framework { class ProgramDescBind; -class OpDescBind; -class VarDescBind; // Each Protobuf Message, we provide a XXXBind class. In that class, we optimize // read/write speed. Only when we want the protobuf message, the local changes @@ -67,5 +67,5 @@ class BlockDescBind { std::deque> ops_; std::unordered_map> vars_; }; -} -} +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/op_desc.cc b/paddle/framework/op_desc.cc index c85fd8a0a47b44ac82bc9d11610f366f00df66c1..99b5a9c37700adce56f9a83af3792ef113a873ff 100644 --- a/paddle/framework/op_desc.cc +++ b/paddle/framework/op_desc.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ #include "paddle/framework/op_desc.h" -#include "paddle/frameword/block_desc.h" +#include "paddle/framework/block_desc.h" namespace paddle { namespace framework { @@ -129,5 +129,5 @@ void OpDescBind::Sync() { need_update_ = false; } } -} -} \ No newline at end of file +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/op_desc.h b/paddle/framework/op_desc.h index 0967e2d44075448859b3f9750d55b1a37640a5c3..ffc8ac61abfb74e4716f10c457d0fbc18b2e2ab8 100644 --- a/paddle/framework/op_desc.h +++ b/paddle/framework/op_desc.h @@ -102,5 +102,5 @@ class OpDescBind { // local changes should be synchronized, need_update_ should be set to true. bool need_update_{false}; }; -} -} +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/program_desc.cc b/paddle/framework/program_desc.cc index c5e6fb7ef85179c3d412f5f28c4493e3096df7fe..e89f9a46d587b6378aa3be92306c5680093e1926 100644 --- a/paddle/framework/program_desc.cc +++ b/paddle/framework/program_desc.cc @@ -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 "paddle/farmework/block_desc.h" -#include "paddle/framework/programe_desc.h" +#include "paddle/framework/program_desc.h" +#include "paddle/framework/block_desc.h" namespace paddle { namespace framework { @@ -56,5 +56,5 @@ ProgramDescBind::ProgramDescBind(ProgramDesc *prog) { blocks_.emplace_back(new BlockDescBind(this, &block)); } } -} -} \ No newline at end of file +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/programe_desc.h b/paddle/framework/program_desc.h similarity index 96% rename from paddle/framework/programe_desc.h rename to paddle/framework/program_desc.h index 2a2f9cc92119ecc735a72dea316f17d105cd0f84..06ffcd4b15078f62ea8b7a3714e73de799530785 100644 --- a/paddle/framework/programe_desc.h +++ b/paddle/framework/program_desc.h @@ -47,5 +47,5 @@ class ProgramDescBind { std::vector> blocks_; }; -} -} +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/var_desc.cc b/paddle/framework/var_desc.cc index b4e9aab8c25490986578d692af985f735729a7b7..1ccb81879ad293ad90cf64169952aa7f0f3df89a 100644 --- a/paddle/framework/var_desc.cc +++ b/paddle/framework/var_desc.cc @@ -32,5 +32,5 @@ std::vector VarDescBind::Shape() const { DataType VarDescBind::DataType() const { return desc_.lod_tensor().data_type(); } -} -} \ No newline at end of file +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/var_desc.h b/paddle/framework/var_desc.h index 5c88a7bd93dd562a0002f831fe643d68904fa28a..6384da90967503a7b4b4e7fe3f9f9dcb06301991 100644 --- a/paddle/framework/var_desc.h +++ b/paddle/framework/var_desc.h @@ -69,5 +69,5 @@ class VarDescBind { private: VarDesc desc_; }; -} -} +} // namespace framework +} // namespace paddle diff --git a/paddle/pybind/CMakeLists.txt b/paddle/pybind/CMakeLists.txt index 326cc4a75bd5cc29f79de88a3e0802d17c812ecd..18ecbd1aa34c82d63ae7f8ec1bd8f81b35eee30b 100644 --- a/paddle/pybind/CMakeLists.txt +++ b/paddle/pybind/CMakeLists.txt @@ -1,6 +1,6 @@ if(WITH_PYTHON) cc_library(paddle_pybind SHARED SRCS pybind.cc exception.cc protobuf.cc - DEPS pybind python backward + DEPS pybind python backward proto_desc ${GLOB_OP_LIB}) endif(WITH_PYTHON) diff --git a/paddle/pybind/protobuf.cc b/paddle/pybind/protobuf.cc index b85e752a68c9a4130ad462ab0cc79e3469224568..19ea26897f538ee3be611bb7629fc59b81c9c67a 100644 --- a/paddle/pybind/protobuf.cc +++ b/paddle/pybind/protobuf.cc @@ -94,61 +94,61 @@ struct type_caster> namespace paddle { namespace pybind { +using namespace paddle::framework; // NOLINT + // Bind Methods void BindProgramDesc(py::module &m) { - py::class_(m, "ProgramDesc", "") - .def_static( - "instance", - []() -> framework::ProgramDescBind * { - return &framework::ProgramDescBind::Instance(&GetProgramDesc()); - }, - py::return_value_policy::reference) + py::class_(m, "ProgramDesc", "") + .def_static("instance", + []() -> ProgramDescBind * { + return &ProgramDescBind::Instance(&GetProgramDesc()); + }, + py::return_value_policy::reference) .def_static("__create_program_desc__", - []() -> framework::ProgramDescBind * { + []() -> ProgramDescBind * { // Only used for unit-test auto *prog_desc = new ProgramDesc; auto *block = prog_desc->mutable_blocks()->Add(); block->set_idx(0); block->set_parent_idx(-1); - return &framework::ProgramDescBind::Instance(prog_desc); + return &ProgramDescBind::Instance(prog_desc); }, py::return_value_policy::reference) - .def("append_block", &framework::ProgramDescBind::AppendBlock, + .def("append_block", &ProgramDescBind::AppendBlock, py::return_value_policy::reference) - .def("block", &framework::ProgramDescBind::Block, - py::return_value_policy::reference) - .def("__str__", &framework::ProgramDescBind::DebugString) - .def("num_blocks", &framework::ProgramDescBind::Size); + .def("block", &ProgramDescBind::Block, py::return_value_policy::reference) + .def("__str__", &ProgramDescBind::DebugString) + .def("num_blocks", &ProgramDescBind::Size); } void BindBlockDesc(py::module &m) { - py::class_(m, "BlockDesc", "") - .def_property_readonly("id", &framework::BlockDescBind::ID) - .def_property_readonly("parent", &framework::BlockDescBind::Parent) - .def("append_op", &framework::BlockDescBind::AppendOp, + py::class_(m, "BlockDesc", "") + .def_property_readonly("id", &BlockDescBind::ID) + .def_property_readonly("parent", &BlockDescBind::Parent) + .def("append_op", &BlockDescBind::AppendOp, py::return_value_policy::reference) - .def("prepend_op", &framework::BlockDescBind::PrependOp, + .def("prepend_op", &BlockDescBind::PrependOp, py::return_value_policy::reference) .def("new_var", - [](framework::BlockDescBind &self, py::bytes byte_name) { + [](BlockDescBind &self, py::bytes byte_name) { std::string name = byte_name; return self.NewVar(name); }, py::return_value_policy::reference) .def("var", - [](framework::BlockDescBind &self, py::bytes byte_name) { + [](BlockDescBind &self, py::bytes byte_name) { std::string name = byte_name; return self.Var(name); }, py::return_value_policy::reference) - .def("all_vars", &framework::BlockDescBind::AllVars, + .def("all_vars", &BlockDescBind::AllVars, py::return_value_policy::reference) - .def("all_ops", &framework::BlockDescBind::AllOps, + .def("all_ops", &BlockDescBind::AllOps, py::return_value_policy::reference); } void BindVarDsec(py::module &m) { - py::enum_(m, "DataType", "") + py::enum_(m, "DataType", "") .value("BOOL", DataType::BOOL) .value("INT16", DataType::INT16) .value("INT32", DataType::INT32) @@ -157,22 +157,21 @@ void BindVarDsec(py::module &m) { .value("FP32", DataType::FP32) .value("FP64", DataType::FP64); - py::class_(m, "VarDesc", "") + py::class_(m, "VarDesc", "") .def("name", - [](const framework::framework::VarDescBind &self) { + [](const VarDescBind &self) { py::bytes name = self.Name(); return name; }, py::return_value_policy::reference) - .def("set_shape", &framework::VarDescBind::SetShape) - .def("set_data_type", &framework::VarDescBind::SetDataType) - .def("shape", &framework::VarDescBind::Shape, - py::return_value_policy::reference) - .def("data_type", &framework::VarDescBind::DataType); + .def("set_shape", &VarDescBind::SetShape) + .def("set_data_type", &VarDescBind::SetDataType) + .def("shape", &VarDescBind::Shape, py::return_value_policy::reference) + .def("data_type", &VarDescBind::DataType); } void BindOpDesc(py::module &m) { - py::enum_(m, "AttrType", "") + py::enum_(m, "AttrType", "") .value("INT", AttrType::INT) .value("INTS", AttrType::INTS) .value("FLOAT", AttrType::FLOAT) @@ -183,24 +182,24 @@ void BindOpDesc(py::module &m) { .value("BOOLS", AttrType::BOOLEANS) .value("BLOCK", AttrType::BLOCK); - py::class_ op_desc(m, "OpDesc", ""); - op_desc.def("type", &framework::OpDescBind::Type) - .def("set_type", &framework::OpDescBind::SetType) - .def("input", &framework::OpDescBind::Input) - .def("input_names", &framework::OpDescBind::InputNames) - .def("set_input", &framework::OpDescBind::SetInput) - .def("output", &framework::OpDescBind::Output) - .def("output_names", &framework::OpDescBind::OutputNames) - .def("set_output", &framework::OpDescBind::SetOutput) - .def("__str__", &framework::OpDescBind::DebugString) - .def("__repr__", &framework::OpDescBind::DebugString) - .def("has_attr", &framework::OpDescBind::HasAttr) - .def("attr_type", &framework::OpDescBind::GetAttrType) - .def("attr_names", &framework::OpDescBind::AttrNames) - .def("set_attr", &framework::OpDescBind::SetAttr) - .def("attr", &framework::OpDescBind::GetAttr) - .def("set_block_attr", &framework::OpDescBind::SetBlockAttr) - .def("get_block_attr", &framework::OpDescBind::GetBlockAttr); + py::class_ op_desc(m, "OpDesc", ""); + op_desc.def("type", &OpDescBind::Type) + .def("set_type", &OpDescBind::SetType) + .def("input", &OpDescBind::Input) + .def("input_names", &OpDescBind::InputNames) + .def("set_input", &OpDescBind::SetInput) + .def("output", &OpDescBind::Output) + .def("output_names", &OpDescBind::OutputNames) + .def("set_output", &OpDescBind::SetOutput) + .def("__str__", &OpDescBind::DebugString) + .def("__repr__", &OpDescBind::DebugString) + .def("has_attr", &OpDescBind::HasAttr) + .def("attr_type", &OpDescBind::GetAttrType) + .def("attr_names", &OpDescBind::AttrNames) + .def("set_attr", &OpDescBind::SetAttr) + .def("attr", &OpDescBind::GetAttr) + .def("set_block_attr", &OpDescBind::SetBlockAttr) + .def("get_block_attr", &OpDescBind::GetBlockAttr); } } // namespace pybind