bugfix

src/operators/dropout_op.cpp

@@ -19,8 +19,8 @@ namespace operators {
 
 template <typename Dtype, typename T>
 void DropoutOp<Dtype, T>::InferShape() const {
-  auto input_dims = param_.InputX()->dims();
-  param_.Out()->Resize(input_dims);
+  auto input_dims = thsi->param_.InputX()->dims();
+  this->param_.Out()->Resize(input_dims);
 }
 template class DropoutOp<CPU, float>;
 }  // namespace operators
@@ -28,7 +28,7 @@ template class DropoutOp<CPU, float>;
 
 namespace ops = paddle_mobile::operators;
 #ifdef PADDLE_MOBILE_CPU
-USE_OP_CPU(Dropout);
+USE_OP_CPU(dropout);
 REGISTER_OPERATOR_CPU(dropout, ops::DropoutOp);
 #endif
 #ifdef PADDLE_MOBILE_MALI_GPU

src/operators/dropout_op.h

@@ -37,11 +37,10 @@ class DropoutOp
             std::shared_ptr<framework::Scope> scope)
       : framework::OperatorWithKernel<DeviceType, DropoutParam,
                                       operators::DropoutKernel<DeviceType, T>>(
-            type, inputs, outputs, attrs, scope),
-        param_(inputs, outputs, attrs, *scope) {}
+            type, inputs, outputs, attrs, scope) {}
 
-  using framework::OperatorWithKernel<DeviceType, DropoutParam,
-                                      operators::DropoutKernel<DeviceType, T>>;
+  //using framework::OperatorWithKernel<DeviceType, DropoutParam,
+  //                                    operators::DropoutKernel<DeviceType, T>>;
   void InferShape() const override;
 
  protected:

src/operators/im2sequence_op.cpp

@@ -28,13 +28,13 @@ int Im2SequenceOutputSize(int input_size, int kernel, int padding_1,
 
 template <typename Dtype, typename T>
 void Im2SequenceOp<Dtype, T>::InferShape() const {
-  auto in_x_dims = param_.Input()->dims();
+  auto in_x_dims = this->param_.Input()->dims();
 
-  const std::vector<int> &kernels = param_.Kernels();
+  const std::vector<int> &kernels = this->param_.Kernels();
 
-  const std::vector<int> &strides = param_.Strides();
+  const std::vector<int> &strides = this->param_.Strides();
 
-  std::vector<int> paddings = param_.Paddings();
+  std::vector<int> paddings = this->param_.Paddings();
 
   std::vector<int64_t> output_shape({in_x_dims[0], in_x_dims[1]});
   for (size_t i = 0; i < strides.size(); ++i) {
@@ -44,7 +44,7 @@ void Im2SequenceOp<Dtype, T>::InferShape() const {
   }
 
   framework::DDim ddim = framework::make_ddim(output_shape);
-  param_.Output()->Resize(ddim);
+  this->param_.Output()->Resize(ddim);
 }
 
 template class Im2SequenceOp<CPU, float>;

src/operators/im2sequence_op.h

@@ -37,12 +37,11 @@ class Im2SequenceOp : public framework::OperatorWithKernel<
       : framework::OperatorWithKernel<
             DeviceType, Im2SequenceParam,
             operators::Im2SequenceKernel<DeviceType, T>>(type, inputs, outputs,
-                                                         attrs, scope),
-        param_(inputs, outputs, attrs, *scope) {}
+                                                         attrs, scope) {}
 
-  using framework::OperatorWithKernel<
-      DeviceType, Im2SequenceParam,
-      operators::Im2SequenceKernel<DeviceType, T>>::OperatorWithKernel;
+  //using framework::OperatorWithKernel<
+  //    DeviceType, Im2SequenceParam,
+  //    operators::Im2SequenceKernel<DeviceType, T>>::OperatorWithKernel;
   void InferShape() const override;
 
  private:

src/operators/kernel/arm/dropout_kernel.cpp

@@ -23,7 +23,7 @@ namespace paddle_mobile {
 namespace operators {
 
 template <>
-bool DropoutKernel<CPU, float>::Init(const DropoutParam &para) const {
+bool DropoutKernel<CPU, float>::Init(DropoutParam *para) {
   return true;
 }
 

src/operators/kernel/arm/im2sequence_kernel.cpp

@@ -20,7 +20,7 @@ namespace paddle_mobile {
 namespace operators {
 
 template <>
-bool Im2SequenceKernel<CPU, float>::Init(const Im2SequenceParam &para) const {
+bool Im2SequenceKernel<CPU, float>::Init(Im2SequenceParam *para) {
   return true;
 }
 

src/operators/kernel/dropout_kernel.h

@@ -26,7 +26,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;
+  bool Init(DropoutParam *para);
 };
 }  // namespace operators
 }  // namespace paddle_mobile

src/operators/kernel/im2sequence_kernel.h

@@ -32,7 +32,7 @@ class Im2SequenceKernel
     : public framework::OpKernelBase<DeviceType, Im2SequenceParam> {
  public:
   void Compute(const Im2SequenceParam &param) const;
-  bool Init(const Im2SequenceParam &para) const;
+  bool Init(Im2SequenceParam* para);
 };
 }  // namespace operators
 }  // namespace paddle_mobile

tools/op.cmake

@@ -156,6 +156,6 @@ endif()
 if (DROPOUT_OP)
   add_definitions(-DDROPOUT_OP)
 endif()
-if (IM2SQUENCE_OP)
-  add_definitions(-DIM2SQUENCE_OP)
+if (IM2SEQUENCE_OP)
+  add_definitions(-DIM2SEQUENCE_OP)
 endif()