From 183c88805a1534318f6d6229c7d172089535d820 Mon Sep 17 00:00:00 2001 From: Yu Yang Date: Wed, 27 Sep 2017 09:53:54 -0700 Subject: [PATCH] `clang-format` after merge --- paddle/pybind/protobuf.cc | 59 +++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/paddle/pybind/protobuf.cc b/paddle/pybind/protobuf.cc index de3f7bb97b..1a29621bdf 100644 --- a/paddle/pybind/protobuf.cc +++ b/paddle/pybind/protobuf.cc @@ -46,8 +46,7 @@ struct variant_caster> { template typename std::enable_if< - !std::is_same::value, - bool>::type + !std::is_same::value, bool>::type try_load(handle src, bool convert) { auto caster = make_caster(); if (!load_success_ && caster.load(src, convert)) { @@ -71,8 +70,7 @@ struct variant_caster> { return load_success_; } - static handle cast(Type const &src, - return_value_policy policy, + static handle cast(Type const &src, return_value_policy policy, handle parent) { variant_caster_visitor visitor(policy, parent); return boost::apply_visitor(visitor, src); @@ -101,8 +99,8 @@ inline std::vector RepeatedToVector( const google::protobuf::RepeatedField &repeated_field) { std::vector ret; ret.reserve(repeated_field.size()); - std::copy( - repeated_field.begin(), repeated_field.end(), std::back_inserter(ret)); + std::copy(repeated_field.begin(), repeated_field.end(), + std::back_inserter(ret)); return ret; } @@ -134,7 +132,7 @@ class VarDescBind; // read/write speed. Only when we want the protobuf message, the local changes // will be synchronized (by `Sync` method). class VarDescBind { -public: + public: explicit VarDescBind(const std::string &name) { desc_.set_name(name); } VarDesc *Proto() { return &desc_; } @@ -157,12 +155,12 @@ public: return desc_.lod_tensor().data_type(); } -private: + private: VarDesc desc_; }; class OpDescBind { -public: + public: OpDesc *Proto() { Sync(); return &op_desc_; @@ -174,8 +172,8 @@ public: const std::vector &Input(const std::string &name) const { auto it = inputs_.find(name); - PADDLE_ENFORCE( - it != inputs_.end(), "Input %s cannot be found in Op %s", name, Type()); + PADDLE_ENFORCE(it != inputs_.end(), "Input %s cannot be found in Op %s", + name, Type()); return it->second; } @@ -196,10 +194,8 @@ public: const std::vector &Output(const std::string &name) const { auto it = outputs_.find(name); - PADDLE_ENFORCE(it != outputs_.end(), - "Output %s cannot be found in Op %s", - name, - Type()); + PADDLE_ENFORCE(it != outputs_.end(), "Output %s cannot be found in Op %s", + name, Type()); return it->second; } @@ -258,7 +254,7 @@ public: return boost::get(it->second)->idx(); } -private: + private: struct SetAttrDescVisitor : public boost::static_visitor { explicit SetAttrDescVisitor(OpDesc::Attr *attr) : attr_(attr) {} mutable OpDesc::Attr *attr_; @@ -325,7 +321,7 @@ private: }; class BlockDescBind { -public: + public: BlockDescBind(ProgramDescBind *prog, BlockDesc *desc) : prog_(prog), desc_(desc), need_update_(false) {} @@ -349,8 +345,8 @@ public: VarDescBind *Var(py::bytes name_bytes) const { std::string name = name_bytes; auto it = vars_.find(name); - PADDLE_ENFORCE( - it != vars_.end(), "Can not find variable %s in current block.", name); + PADDLE_ENFORCE(it != vars_.end(), + "Can not find variable %s in current block.", name); return it->second.get(); } @@ -398,7 +394,7 @@ public: BlockDesc *RawPtr() { return desc_; } -private: + private: ProgramDescBind *prog_; // not_own BlockDesc *desc_; // not_own bool need_update_; @@ -412,7 +408,7 @@ using ProgDescMap = static ProgDescMap *g_bind_map = nullptr; class ProgramDescBind { -public: + public: static ProgramDescBind &Instance(ProgramDesc *prog) { if (g_bind_map == nullptr) { g_bind_map = new ProgDescMap(); @@ -449,7 +445,7 @@ public: return prog_; } -private: + private: explicit ProgramDescBind(ProgramDesc *prog) : prog_(prog) { for (auto &block : *prog->mutable_blocks()) { blocks_.emplace_back(new BlockDescBind(this, &block)); @@ -492,8 +488,7 @@ void BindProgramDesc(py::module &m) { return &ProgramDescBind::Instance(prog_desc); }, py::return_value_policy::reference) - .def("append_block", - &ProgramDescBind::AppendBlock, + .def("append_block", &ProgramDescBind::AppendBlock, py::return_value_policy::reference) .def("block", &ProgramDescBind::Block, py::return_value_policy::reference) .def("__str__", &ProgramDescBind::DebugString) @@ -504,20 +499,16 @@ void BindBlockDesc(py::module &m) { py::class_(m, "BlockDesc", "") .def_property_readonly("id", &BlockDescBind::ID) .def_property_readonly("parent", &BlockDescBind::Parent) - .def("append_op", - &BlockDescBind::AppendOp, + .def("append_op", &BlockDescBind::AppendOp, py::return_value_policy::reference) - .def("prepend_op", - &BlockDescBind::PrependOp, + .def("prepend_op", &BlockDescBind::PrependOp, + py::return_value_policy::reference) + .def("new_var", &BlockDescBind::NewVar, py::return_value_policy::reference) - .def( - "new_var", &BlockDescBind::NewVar, py::return_value_policy::reference) .def("var", &BlockDescBind::Var, py::return_value_policy::reference) - .def("all_vars", - &BlockDescBind::AllVars, + .def("all_vars", &BlockDescBind::AllVars, py::return_value_policy::reference) - .def("all_ops", - &BlockDescBind::AllOps, + .def("all_ops", &BlockDescBind::AllOps, py::return_value_policy::reference); } -- GitLab