From e6c5730ec9a69f49007d04146da1ac595dd94da5 Mon Sep 17 00:00:00 2001
From: eclipsess <wowchinasuiyang@163.com>
Date: Fri, 29 Jun 2018 18:09:53 +0800
Subject: [PATCH] conflict

---
 src/operators/fusion_conv_add.h                      | 10 +++++-----
 src/operators/kernel/arm/conv_add_kernel.cpp         |  2 +-
 src/operators/kernel/mali/elementwise_add_kernel.cpp |  3 +--
 src/operators/kernel/mali/fushion_fc_kernel.cpp      |  2 +-
 src/operators/kernel/mali/mul_kernel.cpp             |  2 +-
 src/operators/kernel/mali/reshape_kernel.cpp         |  2 +-
 src/operators/math/depthwise_conv_3x3.cpp            |  1 +
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/operators/fusion_conv_add.h b/src/operators/fusion_conv_add.h
index e9677b33de..8b843f5526 100644
--- a/src/operators/fusion_conv_add.h
+++ b/src/operators/fusion_conv_add.h
@@ -68,11 +68,11 @@ class FusionConvAddOp : public framework::OperatorWithKernel<
 
 #ifdef PADDLE_MOBILE_CPU
 
-//#ifndef CONV_ADD_REGISTER
-//static framework::FusionOpRegistrar convadd_registrar(
-//    new FusionConvAddMatcher());
-//#define CONV_ADD_REGISTER
-//#endif
+#ifndef CONV_ADD_REGISTER
+static framework::FusionOpRegistrar convadd_registrar(
+    new FusionConvAddMatcher());
+#define CONV_ADD_REGISTER
+#endif
 
 #endif
 
diff --git a/src/operators/kernel/arm/conv_add_kernel.cpp b/src/operators/kernel/arm/conv_add_kernel.cpp
index 2c7aef932d..3ca7e8ed11 100644
--- a/src/operators/kernel/arm/conv_add_kernel.cpp
+++ b/src/operators/kernel/arm/conv_add_kernel.cpp
@@ -19,7 +19,7 @@ namespace paddle_mobile {
 namespace operators {
 
 template <>
-bool ConvAddKernel<CPU, float>::Init(const FusionConvAddParam &para) const {
+bool ConvAddKernel<CPU, float>::Init(FusionConvAddParam *param) const {
   return true;
 }
 
diff --git a/src/operators/kernel/mali/elementwise_add_kernel.cpp b/src/operators/kernel/mali/elementwise_add_kernel.cpp
index 43d33b3fd2..80d660da35 100644
--- a/src/operators/kernel/mali/elementwise_add_kernel.cpp
+++ b/src/operators/kernel/mali/elementwise_add_kernel.cpp
@@ -27,8 +27,7 @@ struct AddFunctor {
 };
 
 template <>
-bool ElementwiseAddKernel<GPU_MALI, float>::Init(
-    const ElementwiseAddParam &para) const {
+bool ElementwiseAddKernel<GPU_MALI, float>::Init(ElementwiseAddParam *param) const {
   return true;
 }
 
diff --git a/src/operators/kernel/mali/fushion_fc_kernel.cpp b/src/operators/kernel/mali/fushion_fc_kernel.cpp
index 64ab07a9b9..fcdeffa4a7 100644
--- a/src/operators/kernel/mali/fushion_fc_kernel.cpp
+++ b/src/operators/kernel/mali/fushion_fc_kernel.cpp
@@ -22,7 +22,7 @@ namespace paddle_mobile {
 namespace operators {
 
 template <>
-bool FusionFcKernel<GPU_MALI, float>::Init(const FusionFcParam &para) const {
+bool FusionFcKernel<GPU_MALI, float>::Init(FusionFcParam *param) const {
   return true;
 }
 
diff --git a/src/operators/kernel/mali/mul_kernel.cpp b/src/operators/kernel/mali/mul_kernel.cpp
index f2a84deaa1..9e7e4566f8 100644
--- a/src/operators/kernel/mali/mul_kernel.cpp
+++ b/src/operators/kernel/mali/mul_kernel.cpp
@@ -22,7 +22,7 @@ namespace paddle_mobile {
 namespace operators {
 
 template <>
-bool MulKernel<GPU_MALI, float>::Init(const MulParam &para) const {
+bool MulKernel<GPU_MALI, float>::Init(MulParam *param) const {
   return true;
 }
 
diff --git a/src/operators/kernel/mali/reshape_kernel.cpp b/src/operators/kernel/mali/reshape_kernel.cpp
index d7521454d4..80e884ce8b 100644
--- a/src/operators/kernel/mali/reshape_kernel.cpp
+++ b/src/operators/kernel/mali/reshape_kernel.cpp
@@ -22,7 +22,7 @@ namespace paddle_mobile {
 namespace operators {
 
 template <>
-bool ReshapeKernel<GPU_MALI, float>::Init(const ReshapeParam &para) const {
+bool ReshapeKernel<GPU_MALI, float>::Init(ReshapeParam *param) const {
   return true;
 }
 
diff --git a/src/operators/math/depthwise_conv_3x3.cpp b/src/operators/math/depthwise_conv_3x3.cpp
index 9c37cdea8f..fd65383b89 100644
--- a/src/operators/math/depthwise_conv_3x3.cpp
+++ b/src/operators/math/depthwise_conv_3x3.cpp
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include "operators/math/depthwise_conv_3x3.h"
 #include <vector>
+#include <arm_neon.h>
 
 namespace paddle_mobile {
 namespace operators {
-- 
GitLab