From 094623eefda2fb5393db64648d3e7f84508fc970 Mon Sep 17 00:00:00 2001
From: "Yao,kun" <yaokun01@baidu.com>
Date: Mon, 2 Jul 2018 11:25:06 +0800
Subject: [PATCH] Add op init

---
 src/operators/dropout_op.cpp                    |  9 +++++++++
 src/operators/dropout_op.h                      | 17 +++++++++--------
 src/operators/im2sequence_op.cpp                | 10 ++++++++++
 src/operators/im2sequence_op.h                  | 17 ++++++++---------
 src/operators/kernel/arm/dropout_kernel.cpp     |  5 +++++
 src/operators/kernel/arm/im2sequence_kernel.cpp |  5 +++++
 src/operators/kernel/dropout_kernel.h           |  1 +
 src/operators/kernel/im2sequence_kernel.h       |  1 +
 8 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/src/operators/dropout_op.cpp b/src/operators/dropout_op.cpp
index 5f68b5f8b5..1b2295a9c3 100644
--- a/src/operators/dropout_op.cpp
+++ b/src/operators/dropout_op.cpp
@@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#ifdef DROPOUT_OP
 #include "operators/dropout_op.h"
 namespace paddle_mobile {
 namespace operators {
@@ -26,5 +27,13 @@ template class DropoutOp<CPU, float>;
 }  // namespace paddle_mobile
 
 namespace ops = paddle_mobile::operators;
+#ifdef PADDLE_MOBILE_CPU
 USE_OP(Dropout);
 REGISTER_OPERATOR(dropout, ops::DropoutOp);
+#endif
+#ifdef PADDLE_MOBILE_MALI_GPU
+#endif
+#ifdef PADDLE_MOBILE_FPGA
+#endif
+
+#endif
diff --git a/src/operators/dropout_op.h b/src/operators/dropout_op.h
index 3943eed162..d10008d37f 100644
--- a/src/operators/dropout_op.h
+++ b/src/operators/dropout_op.h
@@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#ifdef DROPOUT_OP
+
 #pragma once
 
 #include <string>
@@ -26,7 +28,8 @@ namespace operators {
 using paddle_mobile::framework::Tensor;
 
 template <typename DeviceType, typename T>
-class DropoutOp : public framework::OperatorWithKernel<DeviceType> {
+class DropoutOp : public framework::OperatorWithKernel<DeviceType, DropoutParam,
+                                    operators::DropoutKernal<DeviceType, T>> {
  public:
   DropoutOp(const std::string &type, const VariableNameMap &inputs,
             const VariableNameMap &outputs, const framework::AttributeMap attrs,
@@ -35,17 +38,15 @@ class DropoutOp : public framework::OperatorWithKernel<DeviceType> {
                                                   scope),
         param_(inputs, outputs, attrs, *scope) {}
 
-  void Run() const {
-    operators::DropoutKernel<DeviceType, T> kernel;
-    kernel.Compute(param_);
-  }
-
-  using framework::OperatorWithKernel<DeviceType>::OperatorWithKernel;
+  using framework::OperatorWithKernel<DeviceType, DropoutParam,
+                    operators::DropoutKernel<DeviceType, T>>;
   void InferShape() const override;
 
  protected:
-  DropoutParam param_;
 };
 
 }  // namespace operators
 }  // namespace paddle_mobile
+
+#endif
+
diff --git a/src/operators/im2sequence_op.cpp b/src/operators/im2sequence_op.cpp
index 58adcf22bf..ce05cb7d64 100644
--- a/src/operators/im2sequence_op.cpp
+++ b/src/operators/im2sequence_op.cpp
@@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#ifdef IM2SEQUENCE_OP
+
 #include "operators/im2sequence_op.h"
 
 namespace paddle_mobile {
@@ -51,5 +53,13 @@ template class Im2SequenceOp<CPU, float>;
 }  // namespace paddle_mobile
 
 namespace ops = paddle_mobile::operators;
+#ifdef PADDLE_MOBILE_CPU
 USE_OP(im2sequence);
 REGISTER_OPERATOR(im2sequence, ops::Im2SequenceOp);
+#endif
+#ifdef PADDLE_MOBILE_MALI_GPU
+#endif
+#ifdef PADDLE_MOBILE_FPGA
+#endif
+
+#endif
diff --git a/src/operators/im2sequence_op.h b/src/operators/im2sequence_op.h
index 6b7b4d291a..40717bce95 100644
--- a/src/operators/im2sequence_op.h
+++ b/src/operators/im2sequence_op.h
@@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#ifdef IM2SEQUENCE_OP
+
 #pragma once
 
 #include <operators/op_param.h>
@@ -24,7 +26,8 @@ namespace operators {
 using namespace framework;
 
 template <typename DeviceType, typename T>
-class Im2SequenceOp : public framework::OperatorWithKernel<DeviceType> {
+class Im2SequenceOp : public framework::OperatorWithKernel<DeviceType, Im2SequenceParam,
+                                        operators::Im2SequenceKernal<DeviceType, T>> {
  public:
   Im2SequenceOp(const std::string &type, const VariableNameMap &inputs,
                 const VariableNameMap &outputs,
@@ -34,18 +37,14 @@ class Im2SequenceOp : public framework::OperatorWithKernel<DeviceType> {
                                                   scope),
         param_(inputs, outputs, attrs, *scope) {}
 
-  using framework::OperatorWithKernel<DeviceType>::OperatorWithKernel;
+  using framework::OperatorWithKernel<DeviceType, Im2SequenceParam,
+                                            operators::Im2SequenceKernel<DeviceType, T>>::OperatorWithKernel;
   void InferShape() const override;
 
-  void RunImpl() const {
-    operators::Im2SequenceKernel<DeviceType, T> kernel;
-    kernel.Compute(param_);
-    this->ClearVariables({"X"});
-  }
-
  private:
-  Im2SequenceParam param_;
 };
 
 }  // namespace operators
 }  // namespace paddle_mobile
+
+#endif
diff --git a/src/operators/kernel/arm/dropout_kernel.cpp b/src/operators/kernel/arm/dropout_kernel.cpp
index 10e0a7cc88..32e2eeca80 100644
--- a/src/operators/kernel/arm/dropout_kernel.cpp
+++ b/src/operators/kernel/arm/dropout_kernel.cpp
@@ -20,6 +20,11 @@ limitations under the License. */
 namespace paddle_mobile {
 namespace operators {
 
+template <>
+bool DropoutKernel<CPU, float>::Init(const DropoutParam &para) const {
+    return true;
+}
+    
 template <typename T>
 struct DropoutFunctor {
   inline T operator()(T in) const { return in; }
diff --git a/src/operators/kernel/arm/im2sequence_kernel.cpp b/src/operators/kernel/arm/im2sequence_kernel.cpp
index 79e4d7bc4a..254bfb8a5d 100644
--- a/src/operators/kernel/arm/im2sequence_kernel.cpp
+++ b/src/operators/kernel/arm/im2sequence_kernel.cpp
@@ -17,6 +17,11 @@ limitations under the License. */
 namespace paddle_mobile {
 namespace operators {
 
+template <>
+bool Im2SequenceKernel<CPU, float>::Init(const Im2SequenceParam &para) const {
+  return true;
+}
+    
 inline int Im2SeqOutputSize(int input_size, int filter_size, int padding_0,
                             int padding_1, int stride) {
   const int output_size =
diff --git a/src/operators/kernel/dropout_kernel.h b/src/operators/kernel/dropout_kernel.h
index 92caab1c7a..98146fab73 100644
--- a/src/operators/kernel/dropout_kernel.h
+++ b/src/operators/kernel/dropout_kernel.h
@@ -24,6 +24,7 @@ template <typename DeviceType, typename T>
 class DropoutKernel : public framework::OpKernelBase<DeviceType, DropoutParam> {
  public:
   void Compute(const DropoutParam& param) const;
+  bool Init(const DropoutParam &para) const;
 };
 }  // namespace operators
 }  // namespace paddle_mobile
diff --git a/src/operators/kernel/im2sequence_kernel.h b/src/operators/kernel/im2sequence_kernel.h
index c0a1aff1da..0b02a7bd4d 100644
--- a/src/operators/kernel/im2sequence_kernel.h
+++ b/src/operators/kernel/im2sequence_kernel.h
@@ -30,6 +30,7 @@ class Im2SequenceKernel
     : public framework::OpKernelBase<DeviceType, Im2SequenceParam> {
  public:
   void Compute(const Im2SequenceParam &param) const;
+  bool Init(const Im2SequenceParam &para) const;
 };
 }  // namespace operators
 }  // namespace paddle_mobile
-- 
GitLab