diff --git a/src/operators/fusion_elementwise_add_relu_op.h b/src/operators/fusion_elementwise_add_relu_op.h index b9d662cae559781789130e0483bccef06e1ac9b0..286b1efcc85d480aaae614bf6bd72646f327b048 100644 --- a/src/operators/fusion_elementwise_add_relu_op.h +++ b/src/operators/fusion_elementwise_add_relu_op.h @@ -62,23 +62,19 @@ class FusionElementwiseAddReluOp }; #ifdef PADDLE_MOBILE_CPU -/* #ifndef FUSION_ELEMENTWISE_ADD_RELU_REGISTER - static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( - new FusioneElementwiseAddReluMatcher()); +static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( + new FusioneElementwiseAddReluMatcher()); #define FUSION_ELEMENTWISE_ADD_RELU_REGISTER #endif -*/ #endif #ifdef PADDLE_MOBILE_MALI_GPU -/* #ifndef FUSION_ELEMENTWISE_ADD_RELU_REGISTER - static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( - new FusioneElementwiseAddReluMatcher()); +static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( + new FusioneElementwiseAddReluMatcher()); #define FUSION_ELEMENTWISE_ADD_RELU_REGISTER #endif -*/ #endif #ifdef PADDLE_MOBILE_FPGA @@ -88,7 +84,6 @@ static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( #define FUSION_ELEMENTWISE_ADD_RELU_REGISTER #endif #endif - } // namespace operators } // namespace paddle_mobile diff --git a/src/operators/fusion_fc_op.h b/src/operators/fusion_fc_op.h index e6c7e9fdbd5f449eea004615fa31e49af0746086..a6fefc16a80a8d2c1d645ae0e6d7394366209de3 100644 --- a/src/operators/fusion_fc_op.h +++ b/src/operators/fusion_fc_op.h @@ -66,30 +66,25 @@ class FusionFcOp }; #ifdef PADDLE_MOBILE_CPU - -#ifndef FUSION_FC_CPU_REGISTER -#define FUSION_FC_CPU_REGISTER +#ifndef FUSION_FC_REGISTER static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher()); +#define FUSION_FC_REGISTER #endif - #endif #ifdef PADDLE_MOBILE_MALI_GPU - -#ifndef CONV_CPU_REGISTER -#define CONV_CPU_REGISTER +#ifndef FUSION_FC_REGISTER static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher()); +#define FUSION_FC_REGISTER #endif - #endif #ifdef PADDLE_MOBILE_FPGA -#ifndef FUSION_FC_CPU_REGISTER -#define FUSION_FC_CPU_REGISTER +#ifndef FUSION_FC_REGISTER static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher()); +#define FUSION_FC_REGISTER #endif #endif - } // namespace operators } // namespace paddle_mobile diff --git a/src/operators/fusion_fc_relu_op.h b/src/operators/fusion_fc_relu_op.h index 7a680695715b042152c8279510cdbf3100e84bb4..10bbf5580220ea0bce9c3845e42845e3fac1085e 100644 --- a/src/operators/fusion_fc_relu_op.h +++ b/src/operators/fusion_fc_relu_op.h @@ -65,33 +65,28 @@ class FusionFcReluOp : public framework::OperatorWithKernel< }; #ifdef PADDLE_MOBILE_CPU - #ifndef FUSION_FC_RELU_REGISTER -#define FUSION_FC_RELU_REGISTER static framework::FusionOpRegistrar fc_relu_registrar( new FusionFcReluMatcher()); +#define FUSION_FC_RELU_REGISTER #endif - #endif #ifdef PADDLE_MOBILE_MALI_GPU - #ifndef FUSION_FC_RELU_REGISTER -#define FUSION_FC_RELU_REGISTER static framework::FusionOpRegistrar fc_relu_registrar( new FusionFcReluMatcher()); +#define FUSION_FC_RELU_REGISTER #endif - #endif #ifdef PADDLE_MOBILE_FPGA #ifndef FUSION_FC_RELU_REGISTER -#define FUSION_FC_RELU_REGISTER static framework::FusionOpRegistrar fc_relu_registrar( new FusionFcReluMatcher()); +#define FUSION_FC_RELU_REGISTER #endif #endif - } // namespace operators } // namespace paddle_mobile