Feature/pybind for protobuf desc by reyoung · Pull Request #4397 · PaddlePaddle/Paddle

reyoung · 2017-09-26T17:12:04Z

No description provided.

…/Paddle into feature/pybind_for_protobuf_desc

…/reyoung/Paddle into feature/pybind_for_protobuf_desc

… feature/pybind_for_protobuf_desc

…_for_protobuf_desc

…_protobuf_desc

… feature/pybind_for_protobuf_desc

…/reyoung/Paddle into feature/pybind_for_protobuf_desc

…_desc

…otobuf_desc

…/Paddle into feature/pybind_for_protobuf_desc

…_for_protobuf_desc

…/reyoung/Paddle into feature/pybind_for_protobuf_desc

…_for_protobuf_desc

…/Paddle into feature/pybind_for_protobuf_desc

…_for_protobuf_desc

jacquesqiao · 2017-09-26T21:45:30Z

python/paddle/v2/framework/tests/test_protobuf_descs.py

+
+        op.set_block_attr("block_attr", prog.block(0))
+        self.assertEqual(0, op.get_block_attr("block_attr"))
+        self.assertEqual(core.AttrType.INT, op.attr_type("int_attr"))


this line should be moved to line 26

jacquesqiao · 2017-09-26T22:10:32Z

paddle/pybind/protobuf.cc

+};
+
+class OpDescBind {
+public:


need a space before public/private/protected

Actually, there are some missing clang-format files. I fix it in PR #4402. However, we should merge this PR before #4402 for resolving conflict easily.

jacquesqiao · 2017-09-26T22:41:21Z

paddle/pybind/protobuf.cc

+  }
+
+  void SetAttr(const std::string &name, const Attribute &v) {
+    this->attrs_[name] = v;


need

need_update_ = true;

jacquesqiao · 2017-09-26T22:46:08Z

paddle/pybind/protobuf.cc

+
+private:
+  OpDesc op_desc_;
+  std::unordered_map<std::string, std::vector<std::string>> inputs_;


should add a comment that: every method change these data members should set
need_update_ = true;

jacquesqiao · 2017-09-26T23:01:25Z

paddle/pybind/protobuf.cc

+    return ops_.back().get();
+  }
+
+  OpDescBind *PrependOp() {


what is the situation of PrependOp?

for init_ops

jacquesqiao · 2017-09-26T23:18:13Z

paddle/pybind/protobuf.cc

+      .def(
+          "new_var", &BlockDescBind::NewVar, py::return_value_policy::reference)
+      .def("var", &BlockDescBind::Var, py::return_value_policy::reference)
+      .def("all_vars",


need interface:

has_input() has_output() has_var()

for infer_shape

Since when writing this PR, infer_shape has not been merged. So the interface will be added in next PR.

jacquesqiao · 2017-09-26T23:37:45Z

paddle/pybind/protobuf.cc

+  return prog_->Block(static_cast<size_t>(this->desc_->parent_idx()));
+}
+
+void OpDescBind::SetBlockAttr(const std::string &name, BlockDescBind &block) {


我记得之前讨论是把BlockDisk的index存到 attr里边，这里为什么把整个结构都保存下来了，而且Get也只能Get到index

jacquesqiao

LGTM!

jacquesqiao · 2017-09-27T03:18:44Z

paddle/pybind/protobuf.cc

+    return it->second;
+  }
+
+  int GetBlockAttr(const std::string &name) const {


还有一个小问题，既然SetBlockAttr是保存了BlockDesc的结构，那GetBlockAttr何不直接返回BlockDesc？拿到BlockDesc也是可以拿到index的

因为这个接口要返回给Python呀。。

reyoung and others added 30 commits September 21, 2017 20:13

Init commit

859dba5

Expose VarDesc interface

7788b46

Update

70f398e

Merge branch 'feature/pybind_for_protobuf_desc' of github.com:reyoung…

65bec3b

…/Paddle into feature/pybind_for_protobuf_desc

Add new_var for BlockDesc

332369c

Complete unittest for ProgramDesc

618884d

Merge branch 'feature/pybind_for_protobuf_desc' of github.com:reyoung…

a6b2197

…/Paddle into feature/pybind_for_protobuf_desc

Update

b154c0e

Add unittests

ee547f6

Add Helper for Vector2Repeated

17d93f4

Merge branch 'feature/pybind_for_protobuf_desc' of https://github.com…

62b469f

…/reyoung/Paddle into feature/pybind_for_protobuf_desc

Moving protobuf binding code to protobuf module

e290036

Fix typo

37fd8fa

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

6db6475

… feature/pybind_for_protobuf_desc

Merge branch 'develop' of github.com:baidu/Paddle into feature/pybind…

64ea2af

…_for_protobuf_desc

Merge remote-tracking branch 'origin/pr/4341' into feature/pybind_for…

9ddfc23

…_protobuf_desc

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

06beec0

… feature/pybind_for_protobuf_desc

Merge branch 'feature/pybind_for_protobuf_desc' of https://github.com…

d633bdf

…/reyoung/Paddle into feature/pybind_for_protobuf_desc

Update namespace of pybind/protobuf.cc and .h

f5aa8b4

Use Vec2Repeated Repeated2Vec

027fc62

Buggy code

bddb406

Hot fix unittest

dc643a3

Fix bug

e05e27a

Compelete VarDescBind

eeb7c8a

Update Input/Output of Op

ddf2448

Merge branch 'fix_lod_tensor_dim_64' into feature/pybind_for_protobuf…

57c95c7

…_desc

Merge branch 'feature/simplify_attr_parse' into feature/pybind_for_pr…

b941865

…otobuf_desc

Fix bugs

08e9900

Stash

afeb01f

Merge branch 'feature/pybind_for_protobuf_desc' of github.com:reyoung…

9fa7c93

…/Paddle into feature/pybind_for_protobuf_desc

reyoung and others added 9 commits September 25, 2017 10:14

Refine Visitor

fdd68fd

Add Prepend for BlockDescBind

1bfa0e1

Merge branch 'feature/pybind_for_protobuf_desc' of github.com:reyoung…

6cf396b

…/Paddle into feature/pybind_for_protobuf_desc

Merge branch 'develop' of github.com:baidu/Paddle into feature/pybind…

1cd2014

…_for_protobuf_desc

Complete op

f9f910a

Complete unittest for OP

16c5f62

Add unittests

5419f16

Merge branch 'feature/pybind_for_protobuf_desc' of https://github.com…

4fb106a

…/reyoung/Paddle into feature/pybind_for_protobuf_desc

Fix bug

6915c92

reyoung requested review from QiJune and jacquesqiao September 26, 2017 17:12

reyoung added 4 commits September 26, 2017 10:12

Merge branch 'develop' of github.com:baidu/Paddle into feature/pybind…

62d597c

…_for_protobuf_desc

Merge branch 'feature/pybind_for_protobuf_desc' of github.com:reyoung…

9e5de16

…/Paddle into feature/pybind_for_protobuf_desc

Add comments

b4a4ae1

Merge branch 'develop' of github.com:baidu/Paddle into feature/pybind…

cc4c641

…_for_protobuf_desc

jacquesqiao reviewed Sep 26, 2017

View reviewed changes

Fix CI test

d72a140

jacquesqiao reviewed Sep 26, 2017

View reviewed changes

reyoung force-pushed the feature/pybind_for_protobuf_desc branch 2 times, most recently from 62a4fda to de35098 Compare September 27, 2017 02:51

Fix CI and follow comment

de35098

jacquesqiao approved these changes Sep 27, 2017

View reviewed changes

jacquesqiao reviewed Sep 27, 2017

View reviewed changes

reyoung merged commit dcfd31d into PaddlePaddle:develop Sep 27, 2017

reyoung deleted the feature/pybind_for_protobuf_desc branch September 27, 2017 03:26

Comments

Conversation

reyoung commented Sep 26, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jacquesqiao Sep 26, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jacquesqiao left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jacquesqiao Sep 26, 2017 •

edited

Loading