Refactoring InferShape by jacquesqiao · Pull Request #3946 · PaddlePaddle/Paddle

jacquesqiao · 2017-09-07T03:37:18Z

fix: #4183
design: #4142

support compile time and runtime infershape.

… impl-vardesc

…into impl-vardesc

… impl-vardesc

reyoung · 2017-09-25T22:06:33Z

paddle/framework/operator.h

+    return GetDim(op_.Output(name));
+  }
+
+  void SetOutputDim(const std::string& name, const DDim& dim) const {


Set methods should change private data members, so they cannot be const

reyoung · 2017-09-25T22:07:05Z

paddle/framework/operator.h

+    if (!var->IsType<LoDTensor>() && !var->IsType<Tensor>()) {
+      t = var->GetMutable<LoDTensor>();
+    } else {
+      t = const_cast<Tensor*>(GetTensorFromVar(scope_.FindVar(name)));


const_cast should not be used.

reyoung · 2017-09-25T22:08:46Z

paddle/framework/operator.h

 protected:
-  virtual void InferShape(const InferShapeContext& ctx) const = 0;
+  virtual void InferShape(const InferShapeContext& ctx) const {}
+  virtual void InferShape(const InferShapeContextBase& ctx) const {}


Why there are two interfaces?

The old one is for compiling and test, has been removed after transform all the old operators.

… impl-vardesc

reyoung · 2017-09-26T17:14:55Z

paddle/framework/ddim.cc

  return result;
 }

+std::string debug_str(const DDim& ddim) {


Is debug_str used?

I use it a lot when debug the code

removed since we can use cout << ddim to print the debug string.

reyoung · 2017-09-26T17:17:53Z

paddle/framework/operator.h

+  }
+
+ private:
+  Tensor* GetTensor(const std::string& name, bool allocate) const {


allocate could be a template parameter.

reyoung · 2017-09-26T17:18:22Z

paddle/framework/operator.h

+      if (allocate) {
+        t = var->GetMutable<LoDTensor>();
+      } else {
+        PADDLE_ENFORCE(false, "Variable(%s) should be tensor", name);


PADDLE_THROW(...);

Superjomn · 2017-09-26T17:19:58Z

paddle/framework/operator.h

  const platform::DeviceContext& device_context_;
 };

+class RunTimeInferShapeContext : public InferShapeContextBase {


RunTime-> Runtime

runtime is a word

reyoung · 2017-09-26T17:23:23Z

paddle/framework/operator.h


 protected:
-  virtual void InferShape(const InferShapeContext& ctx) const = 0;
+  virtual void InferShape(InferShapeContextBase* ctx) const = 0;


This file should be changed a lot. void OperatorBase::InferShape(const Scope& scope) should be removed. void InferShape(InferShapeContextBase* ctx) const should be public.

Yes, This will be done in next pr that will modify all the python related code.

reyoung

Excellent

jacquesqiao added 19 commits September 6, 2017 01:05

init Infershape

125a528

add static InferShape interface

8ab2d86

refactor add-op infershape

1b7e6e3

add AttrReader

9e1ba61

add all maker's infershape

fcaea1f

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

676c7fd

… impl-vardesc

add all InferShape

703d6ce

add python infer api

570ebb2

Merge branch 'fix-cpu-build' of https://github.com/jacquesqiao/Paddle …

80a1c63

…into impl-vardesc

add VarDesc interface

41996d2

add python VarDesc and OpDesc interface

fc3b55c

update python code

4e7058e

use infershape function to do shape inference

267f0e3

clean code

129599d

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

92964d6

… impl-vardesc

do not use pointer

53eb75a

refine code of op_proto_maker

309765c

add get_dims to VarDesc

93903fb

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

872a570

… impl-vardesc

jacquesqiao changed the title ~~[wip] Impl vardesc~~ [wip] refactoring InferShape Sep 14, 2017

jacquesqiao added 6 commits September 14, 2017 15:57

refine the code

fc3c095

remove the dependency from operator to op registry

8304c74

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

59fa374

… impl-vardesc

remove OpProtoAndCheckerMaker from operator

afdfeb9

restore complete_add_op

228ddf8

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

175abe6

… impl-vardesc

jacquesqiao mentioned this pull request Sep 17, 2017

InferShape Design #4142

Closed

jacquesqiao added 2 commits September 18, 2017 19:32

add shape_infer_impl.h

060677f

code optimization

91134b2

jacquesqiao mentioned this pull request Sep 19, 2017

Implement Compile time & Runtime Infershape #4183

Closed

8 tasks

jacquesqiao added 6 commits September 24, 2017 18:06

update modified_huber_loss_op

5605a30

update rowwise_add_op

40f2b53

update mean_op

794d5df

update sequence_avg_pool_op

dc0d153

typo

4e55aae

remove old InferShape interface

32c1d29

reyoung reviewed Sep 25, 2017

View reviewed changes

jacquesqiao added 8 commits September 25, 2017 15:21

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

a522653

… impl-vardesc

can compile

cdf9bfc

fix or unit test

e22d7c4

clean code

d2d500e

clean code

997cbc5

remove const before InferShapeContext

50cec66

change InferenceContextBase to pointer

01bfcdd

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

017b27c

… impl-vardesc

reyoung reviewed Sep 26, 2017

View reviewed changes

Superjomn reviewed Sep 26, 2017

View reviewed changes

reyoung reviewed Sep 26, 2017

View reviewed changes

rename RunTime to Runtime, code clean

f3bd1ad

reyoung approved these changes Sep 26, 2017

View reviewed changes

jacquesqiao merged commit 9a9d50a into PaddlePaddle:develop Sep 26, 2017

This was referenced Sep 27, 2017

compile error after PR 4144 merged. #4410

Closed

SoftmaxWithCrossEntropyOp have conflict when merge #4416

Closed

Yancey0623 mentioned this pull request Sep 27, 2017

Add HasInputs/HasOutputs in shape interface #4434

Closed

dzhwinter mentioned this pull request Sep 27, 2017

bilinear_interp_op #3925

Closed

lcy-seso mentioned this pull request Oct 16, 2017

InferShape cannot obtain LoD information. #4835

Closed

Comments

Conversation

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

Uh oh!

Uh oh!

reyoung Sep 25, 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!

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!

reyoung Sep 25, 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!

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

reyoung left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jacquesqiao commented Sep 7, 2017 •

edited

Loading

reyoung Sep 25, 2017 •

edited

Loading

reyoung Sep 25, 2017 •

edited

Loading