提交 b865b6b4 编写于 作者: L liuruilong

format files

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