Skip to content

P
Paddle-Lite

PaddlePaddle / Paddle-Lite

通知 337
Star 4
Fork 1
P
Paddle-Lite
提交 3483d02d 编写于 作者: qnqinan's avatar qnqinan
浏览文件
操作

update

上级 2b52d1ef
隐藏空白更改
内联 并排
Showing with 13 addition and 28 deletion
src/operators/fusion_elementwise_add_relu_op.h
浏览文件 @ 3483d02d
...@@ -62,23 +62,19 @@ class FusionElementwiseAddReluOp ...@@ -62,23 +62,19 @@ class FusionElementwiseAddReluOp
}; };
#ifdef PADDLE_MOBILE_CPU #ifdef PADDLE_MOBILE_CPU
/*
#ifndef FUSION_ELEMENTWISE_ADD_RELU_REGISTER #ifndef FUSION_ELEMENTWISE_ADD_RELU_REGISTER
static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( static framework::FusionOpRegistrar fusion_elementwise_relu_registrar(
new FusioneElementwiseAddReluMatcher()); new FusioneElementwiseAddReluMatcher());
#define FUSION_ELEMENTWISE_ADD_RELU_REGISTER #define FUSION_ELEMENTWISE_ADD_RELU_REGISTER
#endif #endif
*/
#endif #endif
#ifdef PADDLE_MOBILE_MALI_GPU #ifdef PADDLE_MOBILE_MALI_GPU
/*
#ifndef FUSION_ELEMENTWISE_ADD_RELU_REGISTER #ifndef FUSION_ELEMENTWISE_ADD_RELU_REGISTER
static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( static framework::FusionOpRegistrar fusion_elementwise_relu_registrar(
new FusioneElementwiseAddReluMatcher()); new FusioneElementwiseAddReluMatcher());
#define FUSION_ELEMENTWISE_ADD_RELU_REGISTER #define FUSION_ELEMENTWISE_ADD_RELU_REGISTER
#endif #endif
*/
#endif #endif
#ifdef PADDLE_MOBILE_FPGA #ifdef PADDLE_MOBILE_FPGA
...@@ -88,7 +84,6 @@ static framework::FusionOpRegistrar fusion_elementwise_relu_registrar( ...@@ -88,7 +84,6 @@ static framework::FusionOpRegistrar fusion_elementwise_relu_registrar(
#define FUSION_ELEMENTWISE_ADD_RELU_REGISTER #define FUSION_ELEMENTWISE_ADD_RELU_REGISTER
#endif #endif
#endif #endif
} // namespace operators } // namespace operators
} // namespace paddle_mobile } // namespace paddle_mobile
......
src/operators/fusion_fc_op.h
浏览文件 @ 3483d02d
...@@ -66,30 +66,25 @@ class FusionFcOp ...@@ -66,30 +66,25 @@ class FusionFcOp
}; };
#ifdef PADDLE_MOBILE_CPU #ifdef PADDLE_MOBILE_CPU
#ifndef FUSION_FC_REGISTER
#ifndef FUSION_FC_CPU_REGISTER
#define FUSION_FC_CPU_REGISTER
static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher()); static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher());
#define FUSION_FC_REGISTER
#endif #endif
#endif #endif
#ifdef PADDLE_MOBILE_MALI_GPU #ifdef PADDLE_MOBILE_MALI_GPU
#ifndef FUSION_FC_REGISTER
#ifndef CONV_CPU_REGISTER
#define CONV_CPU_REGISTER
static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher()); static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher());
#define FUSION_FC_REGISTER
#endif #endif
#endif #endif
#ifdef PADDLE_MOBILE_FPGA #ifdef PADDLE_MOBILE_FPGA
#ifndef FUSION_FC_CPU_REGISTER #ifndef FUSION_FC_REGISTER
#define FUSION_FC_CPU_REGISTER
static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher()); static framework::FusionOpRegistrar fc_registrar(new FusionFcMatcher());
#define FUSION_FC_REGISTER
#endif #endif
#endif #endif
} // namespace operators } // namespace operators
} // namespace paddle_mobile } // namespace paddle_mobile
......
src/operators/fusion_fc_relu_op.h
浏览文件 @ 3483d02d
...@@ -65,33 +65,28 @@ class FusionFcReluOp : public framework::OperatorWithKernel< ...@@ -65,33 +65,28 @@ class FusionFcReluOp : public framework::OperatorWithKernel<
}; };
#ifdef PADDLE_MOBILE_CPU #ifdef PADDLE_MOBILE_CPU
#ifndef FUSION_FC_RELU_REGISTER #ifndef FUSION_FC_RELU_REGISTER
#define FUSION_FC_RELU_REGISTER
static framework::FusionOpRegistrar fc_relu_registrar( static framework::FusionOpRegistrar fc_relu_registrar(
new FusionFcReluMatcher()); new FusionFcReluMatcher());
#define FUSION_FC_RELU_REGISTER
#endif #endif
#endif #endif
#ifdef PADDLE_MOBILE_MALI_GPU #ifdef PADDLE_MOBILE_MALI_GPU
#ifndef FUSION_FC_RELU_REGISTER #ifndef FUSION_FC_RELU_REGISTER
#define FUSION_FC_RELU_REGISTER
static framework::FusionOpRegistrar fc_relu_registrar( static framework::FusionOpRegistrar fc_relu_registrar(
new FusionFcReluMatcher()); new FusionFcReluMatcher());
#define FUSION_FC_RELU_REGISTER
#endif #endif
#endif #endif
#ifdef PADDLE_MOBILE_FPGA #ifdef PADDLE_MOBILE_FPGA
#ifndef FUSION_FC_RELU_REGISTER #ifndef FUSION_FC_RELU_REGISTER
#define FUSION_FC_RELU_REGISTER
static framework::FusionOpRegistrar fc_relu_registrar( static framework::FusionOpRegistrar fc_relu_registrar(
new FusionFcReluMatcher()); new FusionFcReluMatcher());
#define FUSION_FC_RELU_REGISTER
#endif #endif
#endif #endif
} // namespace operators } // namespace operators
} // namespace paddle_mobile } // namespace paddle_mobile
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或