Make operator Input/Output can return nullptr #3831
Merged
Conversation
This file contains 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
jacquesqiao
reviewed
Sep 3, 2017
paddle/framework/operator.h
Outdated
| @@ -238,46 +238,58 @@ class InferShapeContext { | |||
| } | |||
|
|
|||
| const Variable* InputVar(const std::string& name) const { | |||
| return scope_.FindVar(op_.Input(name)); | |||
| auto ipt = op_.Input(name); | |||
| if (ipt == kEmptyVarName) { | |||
There was a problem hiding this comment.
如果在scope中检查如果name是kEmptyVarName就报个错，是不是不用加这么多代码
JiayiFeng
reviewed
Sep 3, 2017
paddle/framework/operator.h
Outdated
| @@ -238,46 +238,58 @@ class InferShapeContext { | |||
| } | |||
|
|
|||
| const Variable* InputVar(const std::string& name) const { | |||
| return scope_.FindVar(op_.Input(name)); | |||
| auto ipt = op_.Input(name); | |||
| if (ipt == kEmptyVarName) { | |||
There was a problem hiding this comment.
using
return ipt == kEmptyVarName ? nullptr : scope_.FindVar(ipt);can make the code shorter.
JiayiFeng
reviewed
Sep 3, 2017
paddle/framework/operator.cc
Outdated
| PADDLE_THROW("Op %s input %s should contain only one variable", type_, | ||
| name); | ||
| return ""; | ||
| } |
There was a problem hiding this comment.
std::string OperatorBase::Input(const std::string& name) const {
auto& ins = Inputs(name);
PADDLE_ENFORCE(ins.size() <= 1, ".....");
return ins.empty() ? kEmptyVarName : ins[0];
}The code is much shorter.
JiayiFeng
reviewed
Sep 3, 2017
paddle/framework/operator.cc
Outdated
| PADDLE_THROW("Op %s output %s should contain only one variable", type_, | ||
| name); | ||
| return ""; | ||
| } |
There was a problem hiding this comment.
See my comment on OperatorBase::Input().
|
是不是应该在construct op的时候检查input output参数列表是否完整? |
reyoung
force-pushed
the
feature/fix_empty_input_and_output
branch
from
ae85ed2 to
d7a1e40
Compare
|
@jacquesqiao @Canpio All things done. |
lcy-seso
pushed a commit
to lcy-seso/Paddle
that referenced
this pull request
Sep 4, 2017
…nput_and_output Make operator Input/Output can return nullptr
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #3822