提交 b865b6b4 编写于 作者: L liuruilong

format files

上级 2ac900b6
......@@ -48,13 +48,13 @@ class FusionConvAddMatcher : public framework::FusionOpMatcher {
template <typename DeviceType, typename T>
class FusionConvAddOp : public framework::OperatorWithKernel<
DeviceType, FusionConvAddParam,
operators::ConvAddKernel<DeviceType, T>> {
DeviceType, FusionConvAddParam,
operators::ConvAddKernel<DeviceType, T>> {
public:
FusionConvAddOp(const string &type, const VariableNameMap &inputs,
const VariableNameMap &outputs,
const framework::AttributeMap &attrs,
std::shared_ptr<framework::Scope> scope)
const VariableNameMap &outputs,
const framework::AttributeMap &attrs,
std::shared_ptr<framework::Scope> scope)
: framework::OperatorWithKernel<DeviceType, FusionConvAddParam,
operators::ConvAddKernel<DeviceType, T>>(
type, inputs, outputs, attrs, scope) {}
......
......@@ -45,18 +45,17 @@ class FusionFcMatcher : public framework::FusionOpMatcher {
};
template <typename DeviceType, typename T>
class FusionFcOp : public framework::OperatorWithKernel<
DeviceType, FusionFcParam,
operators::FusionFcKernel<DeviceType, T>> {
class FusionFcOp
: public framework::OperatorWithKernel<
DeviceType, FusionFcParam, operators::FusionFcKernel<DeviceType, T>> {
public:
FusionFcOp(const string &type, const VariableNameMap &inputs,
const VariableNameMap &outputs,
const framework::AttributeMap &attrs,
std::shared_ptr<framework::Scope> scope)
: framework::OperatorWithKernel<
DeviceType, FusionFcParam,
operators::FusionFcKernel<DeviceType, T>>(type, inputs, outputs,
attrs, scope) {}
const VariableNameMap &outputs,
const framework::AttributeMap &attrs,
std::shared_ptr<framework::Scope> scope)
: framework::OperatorWithKernel<DeviceType, FusionFcParam,
operators::FusionFcKernel<DeviceType, T>>(
type, inputs, outputs, attrs, scope) {}
using framework::OperatorWithKernel<
DeviceType, FusionFcParam,
......
......@@ -19,8 +19,7 @@ namespace paddle_mobile {
namespace operators {
template <>
void ConvAddKernel<CPU, float>::Compute(
const FusionConvAddParam &param) const {
void ConvAddKernel<CPU, float>::Compute(const FusionConvAddParam &param) const {
const Tensor *input = param.Input();
Tensor filter = *param.Filter();
Tensor bias = *param.Bias();
......
......@@ -755,7 +755,7 @@ class ReluParam : public OpParam {
class FusionFcParam : public OpParam {
public:
FusionFcParam(const VariableNameMap &inputs, const VariableNameMap &outputs,
const AttributeMap &attrs, const Scope &scope) {
const AttributeMap &attrs, const Scope &scope) {
input_x_ = InputXFrom<LoDTensor>(inputs, scope);
input_y_ = InputYFrom<LoDTensor>(inputs, scope);
input_z_ = InputZFrom<LoDTensor>(inputs, scope);
......@@ -793,8 +793,8 @@ class FusionFcParam : public OpParam {
class FusionConvAddParam : public OpParam {
public:
FusionConvAddParam(const VariableNameMap &inputs,
const VariableNameMap &outputs, const AttributeMap &attrs,
const Scope &scope) {
const VariableNameMap &outputs, const AttributeMap &attrs,
const Scope &scope) {
bias_ = InputYFrom<LoDTensor>(inputs, scope);
axis_ = GetAttr<int>("axis", attrs);
filter_ = FilterFrom<LoDTensor>(inputs, scope);
......@@ -842,8 +842,8 @@ Print &operator<<(Print &printer, const FusionConvAddParam &conv_param);
class FusionConvAddReluParam : public FusionConvAddParam {
public:
FusionConvAddReluParam(const VariableNameMap &inputs,
const VariableNameMap &outputs,
const AttributeMap &attrs, const Scope &scope)
const VariableNameMap &outputs,
const AttributeMap &attrs, const Scope &scope)
: FusionConvAddParam(inputs, outputs, attrs, scope) {}
};
#endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册