use operator context and infer context #3024
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,22 +31,9 @@ limitations under the License. */ | |
| namespace paddle { | ||
| namespace framework { | ||
|
|
||
| class OperatorBase; | ||
| class InferShapeContext; | ||
| class KernelContext; | ||
| /** | ||
| * OperatorBase has the basic element that Net will call to do computation. | ||
| * Only CreateOperator from OpRegistry will new Operator directly. User | ||
|
|
@@ -84,7 +71,8 @@ class OperatorBase { | |
|
|
||
| /// InferShape infer the size of Variables used by this Operator with | ||
| /// information inside scope | ||
| virtual void InferShape(const std::shared_ptr<Scope>& scope) const final; | ||
|
||
| virtual void InferShapeImpl(const InferShapeContext& ctx) const = 0; | ||
|
|
||
| /// Net will call this function to Run an op. | ||
| virtual void Run(const std::shared_ptr<Scope>& scope, | ||
|
|
@@ -110,29 +98,32 @@ class OperatorBase { | |
| std::shared_ptr<std::unordered_map<std::string, int>> in_out_idxs_; | ||
| }; | ||
|
|
||
| class OperatorContext { | ||
|
There was a problem hiding this comment. OperatorContext => ExecutionContext? 我们会有两个概念分别叫做 OperatorContext 和 KernelContext 的吗？如果其实没有，那么就叫 Context 或者 ExecutionContext 是不是更清楚？ There was a problem hiding this comment. ExecutionContext is better There was a problem hiding this comment. We actually have two contexts, one for InferShape, other for Run. |
||
| public: | ||
| OperatorContext(const OperatorBase* op, const std::shared_ptr<Scope>& scope) | ||
| : op_(*op), scope_(scope) {} | ||
|
There was a problem hiding this comment. Have to check OperatorBase* op not null first. There was a problem hiding this comment. we donot need to check because context will only be construct inside a op, so op will nevel be null. And so be need not to use std::shared_ptr |
||
|
|
||
| int InputSize() const { return static_cast<int>(op_.inputs_.size()); } | ||
|
||
|
|
||
| int OutputSize() const { return static_cast<int>(op_.outputs_.size()); } | ||
|
|
||
| const Variable* InputVar(int index) const { | ||
|
||
| return scope_->GetVariable(op_.inputs_[index]); | ||
| } | ||
|
|
||
| Variable* OutputVar(int index) const { | ||
| return scope_->GetVariable(op_.outputs_[index]); | ||
| } | ||
|
|
||
| const Variable* InputVar(const std::string& name) const { | ||
|
There was a problem hiding this comment. 可不可以 typedef std::vector<Tensor*> TensorArray;
TensorArray tensors = var.Get<TensorArray>();There was a problem hiding this comment. Still need Isn't |
||
| return scope_->GetVariable(op_.Input(name)); | ||
| } | ||
|
|
||
| Variable* OutputVar(const std::string& name) const { | ||
| return scope_->GetVariable(op_.Output(name)); | ||
| } | ||
|
|
||
| const std::vector<const Variable*> InputVars(const std::string& name) const { | ||
| auto names = op_.Inputs(name); | ||
| std::vector<const Variable*> res; | ||
| std::transform( | ||
|
|
@@ -141,7 +132,7 @@ class KernelContext { | |
| return res; | ||
| } | ||
|
|
||
| const std::vector<const Variable*> OutputVars(const std::string& name) const { | ||
| auto names = op_.Outputs(name); | ||
| std::vector<const Variable*> res; | ||
| std::transform( | ||
|
|
@@ -150,15 +141,80 @@ class KernelContext { | |
| return res; | ||
| } | ||
|
|
||
| const Tensor& Input(int index) const { | ||
| return InputVar(index)->Get<Tensor>(); | ||
| } | ||
|
|
||
| Tensor* Output(int index) const { | ||
| return OutputVar(index)->GetMutable<Tensor>(); | ||
| } | ||
|
|
||
| const Tensor& Input(const std::string& name) const { | ||
| return InputVar(name)->Get<Tensor>(); | ||
| } | ||
|
|
||
| Tensor* Output(const std::string& name) const { | ||
| return OutputVar(name)->GetMutable<Tensor>(); | ||
| } | ||
|
|
||
| const std::vector<const Tensor*> Inputs(const std::string& name) const { | ||
| auto names = op_.Inputs(name); | ||
| std::vector<const Tensor*> res; | ||
| std::transform(names.begin(), names.end(), res.begin(), | ||
| [this](const std::string& name) { | ||
| return &scope_->GetVariable(name)->Get<Tensor>(); | ||
| }); | ||
| return res; | ||
| } | ||
|
|
||
| std::vector<const Tensor*> Outputs(const std::string& name) const { | ||
| auto names = op_.Outputs(name); | ||
| std::vector<const Tensor*> res; | ||
| std::transform(names.begin(), names.end(), res.begin(), | ||
| [this](const std::string& name) { | ||
| return scope_->GetVariable(name)->GetMutable<Tensor>(); | ||
| }); | ||
| return res; | ||
| } | ||
|
|
||
| const OperatorBase& op_; | ||
| const std::shared_ptr<Scope>& scope_; | ||
| }; | ||
|
|
||
| class InferShapeContext : public OperatorContext { | ||
| public: | ||
| InferShapeContext(const OperatorBase* op, const std::shared_ptr<Scope>& scope) | ||
| : OperatorContext(op, scope) {} | ||
| }; | ||
|
|
||
| template <typename T> | ||
| struct EigenDeviceConverter; | ||
|
|
||
| template <> | ||
| struct EigenDeviceConverter<platform::CPUPlace> { | ||
| using EigenDeviceType = Eigen::DefaultDevice; | ||
| }; | ||
|
|
||
| #ifndef PADDLE_ONLY_CPU | ||
| template <> | ||
| struct EigenDeviceConverter<platform::GPUPlace> { | ||
| using EigenDeviceType = Eigen::GpuDevice; | ||
| }; | ||
| #endif | ||
|
|
||
| class KernelContext : public OperatorContext { | ||
| public: | ||
| KernelContext(const OperatorBase* op, const std::shared_ptr<Scope>& scope, | ||
| const platform::DeviceContext& device_context) | ||
| : OperatorContext(op, scope), device_context_(device_context) {} | ||
|
|
||
| template <typename PlaceType, | ||
| typename DeviceType = | ||
| typename EigenDeviceConverter<PlaceType>::EigenDeviceType> | ||
| DeviceType* GetEigenDevice() const; | ||
|
|
||
| platform::Place GetPlace() const { return device_context_.GetPlace(); } | ||
|
|
||
| const platform::DeviceContext& device_context_; | ||
| }; | ||
|
|
||
|
|
@@ -176,19 +232,6 @@ class OpKernel { | |
| virtual ~OpKernel() {} | ||
| }; | ||
|
|
||
| class OperatorWithKernel : public OperatorBase { | ||
| public: | ||
| struct OpKernelKey { | ||
|
|
@@ -223,35 +266,6 @@ class OperatorWithKernel : public OperatorBase { | |
| static std::unordered_map<std::string, OpKernelMap> g_all_op_kernels; | ||
| return g_all_op_kernels; | ||
| } | ||
| }; | ||
|
|
||
| } // namespace framework | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my mind,
Implis usually a suffix for a class name, which implements an interface. Do we really need to name a functionImplhere?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's right, maybe just called
InferShapeis cool.