Skip to content

Commit c1feb27

Browse files
reyoungreyoung
authored
Merge pull request #3831 from reyoung/feature/fix_empty_input_and_output
Make operator Input/Output can return nullptr
2 parents 11697a5 + 13b4327 commit c1feb27

File tree

4 files changed

+76
-43
lines changed

4 files changed

+76
-43
lines changed

‎paddle/framework/backward_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ class FillZeroOpMaker : public OpProtoAndCheckerMaker {
127127
public:
128128
FillZeroOpMaker(OpProto *proto, OpAttrChecker *op_checker)
129129
: OpProtoAndCheckerMaker(proto, op_checker) {
130-
AddInput("x", "x");
131-
AddOutput("out", "out");
130+
AddInput("Src", "x");
131+
AddOutput("Dst", "out");
132132
AddComment("");
133133
}
134134
};
@@ -138,7 +138,7 @@ class AddOpMaker : public OpProtoAndCheckerMaker {
138138
AddOpMaker(OpProto *proto, OpAttrChecker *op_checker)
139139
: OpProtoAndCheckerMaker(proto, op_checker) {
140140
AddInput("X", "x").AsDuplicable();
141-
AddOutput("Y", "y");
141+
AddOutput("Out", "out");
142142
AddComment("");
143143
}
144144
};

‎paddle/framework/op_info.h‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,19 @@ class OpInfoMap {
8080
}
8181

8282
const OpInfo& Get(const std::string& type) const {
83+
auto op_info_ptr = GetNullable(type);
84+
PADDLE_ENFORCE_NOT_NULL(op_info_ptr, "Operator %s has not been registered",
85+
type);
86+
return *op_info_ptr;
87+
}
88+
89+
const OpInfo* GetNullable(const std::string& type) const {
8390
auto it = map_.find(type);
84-
PADDLE_ENFORCE(it != map_.end(), "Operator %s are not found", type);
85-
return it->second;
91+
if (it == map_.end()) {
92+
return nullptr;
93+
} else {
94+
return &it->second;
95+
}
8696
}
8797

8898
template <typename Callback>

‎paddle/framework/operator.cc‎

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ ExecutionContext::GetEigenDevice<platform::GPUPlace, Eigen::GpuDevice>() const {
3333
}
3434
#endif
3535

36-
const std::string& OperatorBase::Input(const std::string& name) const {
36+
std::string OperatorBase::Input(const std::string& name) const {
3737
auto& ins = Inputs(name);
38-
PADDLE_ENFORCE_EQ(ins.size(), 1UL,
38+
PADDLE_ENFORCE_LE(ins.size(), 1UL,
3939
"Op %s input %s should contain only one variable", type_,
4040
name);
41-
return ins[0];
41+
return ins.empty() ? kEmptyVarName : ins[0];
4242
}
4343

4444
const std::vector<std::string>& OperatorBase::Inputs(
@@ -49,12 +49,12 @@ const std::vector<std::string>& OperatorBase::Inputs(
4949
return it->second;
5050
}
5151

52-
const std::string& OperatorBase::Output(const std::string& name) const {
52+
std::string OperatorBase::Output(const std::string& name) const {
5353
auto& outs = Outputs(name);
54-
PADDLE_ENFORCE_EQ(outs.size(), 1UL,
54+
PADDLE_ENFORCE_LE(outs.size(), 1UL,
5555
"Op %s output %s should contain only one variable", type_,
5656
name);
57-
return outs[0];
57+
return outs.empty() ? kEmptyVarName : outs[0];
5858
}
5959

6060
const std::vector<std::string>& OperatorBase::Outputs(
@@ -119,16 +119,8 @@ OperatorBase::OperatorBase(const std::string& type,
119119
const VariableNameMap& outputs,
120120
const AttributeMap& attrs)
121121
: type_(type), inputs_(inputs), outputs_(outputs), attrs_(attrs) {
122-
static std::atomic<size_t> gUniqId(0UL);
123-
for (auto& output : outputs_) {
124-
for (auto& output_name : output.second) {
125-
if (output_name == kTempVarName) {
126-
output_name += type_;
127-
output_name += "@";
128-
output_name += std::to_string(gUniqId.fetch_add(1));
129-
}
130-
}
131-
}
122+
GenerateTemporaryNames();
123+
CheckAllInputOutputSet();
132124
}
133125

134126
std::vector<std::string> OperatorBase::OutputVars(bool has_intermediate) const {
@@ -156,6 +148,35 @@ std::vector<std::string> OperatorBase::OutputVars(bool has_intermediate) const {
156148
return ret_val;
157149
}
158150

151+
void OperatorBase::CheckAllInputOutputSet() const {
152+
auto& info_map = OpInfoMap::Instance();
153+
auto* op_info = info_map.GetNullable(Type());
154+
if (op_info == nullptr || op_info->proto_ == nullptr) return;
155+
156+
for (auto& in : op_info->Proto().inputs()) {
157+
PADDLE_ENFORCE(inputs_.find(in.name()) != inputs_.end(),
158+
"Type %s's input %s is not set", Type(), in.name());
159+
}
160+
161+
for (auto& out : op_info->Proto().outputs()) {
162+
PADDLE_ENFORCE(outputs_.find(out.name()) != outputs_.end(),
163+
"Type %s's output %s is not set", Type(), out.name());
164+
}
165+
}
166+
167+
void OperatorBase::GenerateTemporaryNames() {
168+
static std::atomic<size_t> gUniqId(0UL);
169+
for (auto& output : outputs_) {
170+
for (auto& output_name : output.second) {
171+
if (output_name == kTempVarName) {
172+
output_name += type_;
173+
output_name += "@";
174+
output_name += std::to_string(gUniqId.fetch_add(1));
175+
}
176+
}
177+
}
178+
}
179+
159180
void OpProtoAndCheckerMaker::Validate() {
160181
validated_ = true;
161182
CheckNoDuplicatedInOutAttrs();

‎paddle/framework/operator.h‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ class OperatorBase {
9595
const VariableNameMap& Inputs() const { return inputs_; }
9696
const VariableNameMap& Outputs() const { return outputs_; }
9797
//! Get a input with argument's name described in `op_proto`
98-
const std::string& Input(const std::string& name) const;
98+
std::string Input(const std::string& name) const;
9999
//! Get a input which has multiple variables.
100100
const std::vector<std::string>& Inputs(const std::string& name) const;
101101

102102
//! Get a output with argument's name described in `op_proto`
103-
const std::string& Output(const std::string& name) const;
103+
std::string Output(const std::string& name) const;
104104
//! Get an output which has multiple variables.
105105
//! TODO add a vector_view to prevent memory copy.
106106
const std::vector<std::string>& Outputs(const std::string& name) const;
@@ -127,6 +127,10 @@ class OperatorBase {
127127
// IG (Inputs Gradients)
128128
VariableNameMap outputs_;
129129
AttributeMap attrs_;
130+
131+
private:
132+
void GenerateTemporaryNames();
133+
void CheckAllInputOutputSet() const;
130134
};
131135

132136
// Macro for define a clone method.
@@ -238,46 +242,50 @@ class InferShapeContext {
238242
}
239243

240244
const Variable* InputVar(const std::string& name) const {
241-
return scope_.FindVar(op_.Input(name));
245+
auto ipt = op_.Input(name);
246+
return ipt == kEmptyVarName ? nullptr : scope_.FindVar(ipt);
242247
}
243248

244249
Variable* OutputVar(const std::string& name) const {
245-
return scope_.FindVar(op_.Output(name));
250+
auto opt = op_.Output(name);
251+
return opt == kEmptyVarName ? nullptr : scope_.FindVar(opt);
246252
}
247253

248254
const std::vector<const Variable*> MultiInputVar(
249255
const std::string& name) const {
250256
auto names = op_.Inputs(name);
251257
std::vector<const Variable*> res;
252258
res.reserve(names.size());
253-
std::transform(
254-
names.begin(), names.end(), std::back_inserter(res),
255-
[this](const std::string& name) { return scope_.FindVar(name); });
259+
std::transform(names.begin(), names.end(), std::back_inserter(res),
260+
[this](const std::string& name) {
261+
return name == kEmptyVarName ? nullptr
262+
: scope_.FindVar(name);
263+
});
256264
return res;
257265
}
258266

259267
std::vector<const Variable*> MultiOutputVar(const std::string& name) const {
260268
auto names = op_.Outputs(name);
261269
std::vector<const Variable*> res;
262270
res.reserve(names.size());
263-
std::transform(
264-
names.begin(), names.end(), std::back_inserter(res),
265-
[this](const std::string& name) { return scope_.FindVar(name); });
271+
std::transform(names.begin(), names.end(), std::back_inserter(res),
272+
[this](const std::string& name) {
273+
return name == kEmptyVarName ? nullptr
274+
: scope_.FindVar(name);
275+
});
266276
return res;
267277
}
268278

269279
template <typename T>
270280
const T* Input(const std::string& name) const {
271281
auto* var = InputVar(name);
272-
PADDLE_ENFORCE_NOT_NULL(var, "Input(%s) should not be nullptr", name);
273-
return &var->Get<T>();
282+
return var == nullptr ? nullptr : &var->Get<T>();
274283
}
275284

276285
template <typename T>
277286
T* Output(const std::string& name) const {
278287
auto var = OutputVar(name);
279-
PADDLE_ENFORCE_NOT_NULL(var, "Output(%s) should not be nullptr", name);
280-
return var->GetMutable<T>();
288+
return var == nullptr ? nullptr : var->GetMutable<T>();
281289
}
282290

283291
template <typename T>
@@ -288,10 +296,7 @@ class InferShapeContext {
288296
std::transform(names.begin(), names.end(), std::back_inserter(res),
289297
[&](const std::string& sub_name) {
290298
auto var = scope_.FindVar(sub_name);
291-
PADDLE_ENFORCE_NOT_NULL(
292-
var, "MultiInput(%s:%s) should not be nullptr", name,
293-
sub_name);
294-
return &var->Get<T>();
299+
return var == nullptr ? nullptr : &var->Get<T>();
295300
});
296301
return res;
297302
}
@@ -304,10 +309,7 @@ class InferShapeContext {
304309
std::transform(names.begin(), names.end(), std::back_inserter(res),
305310
[&](const std::string& sub_name) {
306311
auto var = scope_.FindVar(sub_name);
307-
PADDLE_ENFORCE_NOT_NULL(
308-
var, "MultiOutput(%s:%s) should not be nullptr.", name,
309-
sub_name);
310-
return var->GetMutable<T>();
312+
return var == nullptr ? nullptr : var->GetMutable<T>();
311313
});
312314
return res;
313315
}

0 commit comments

Comments
 (0)