提交 62dce83a 编写于 作者: Y yangfei

add some function

上级 05838c7a
......@@ -946,12 +946,6 @@ class FetchParam : public OpParam {
FetchParam(const VariableNameMap &inputs, const VariableNameMap &outputs,
const AttributeMap &attrs, const Scope &scope) {
input_x_ = InputXFrom<GType>(inputs, scope);
<<<<<<< HEAD
out_ = OutFrom<LoDTensor>(outputs, scope);
}
const RType *InputX() const { return input_x_; }
Tensor *Out() const { return out_; }
=======
out_ = OutFrom(outputs, scope);
}
const RType *InputX() const { return input_x_; }
......@@ -960,7 +954,6 @@ class FetchParam : public OpParam {
static Tensor *OutFrom(const VariableNameMap &outputs, const Scope &scope) {
return GetVarValue<Tensor>("Out", outputs, scope);
}
>>>>>>> df230944d11f0f09aea4c2c6bc0489d8667fa8ca
private:
RType *input_x_;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册