Merge pull request #1137 from smilejames/opencl

add fetch kernel for CPU

src/operators/fetch_op.cpp

@@ -22,14 +22,6 @@ void FetchOp<DeviceType, T>::InferShape() const {
   this->param_.Out()->Resize(x_dims);
 }
 
-template <typename DeviceType, typename T>
-void FetchOp<DeviceType, T>::RunImpl() {
-#ifdef PADDLE_MOBILE_CL
-  this->kernel_.Compute(this->param_);
-#else
-  this->param_.Out()->ShareDataWith(*(this->param_.InputX()));
-#endif
-}
 }  // namespace operators
 }  // namespace paddle_mobile
 

src/operators/fetch_op.h

@@ -24,7 +24,6 @@ namespace operators {
 using std::string;
 
 template <typename DeviceType, typename T>
-#ifdef PADDLE_MOBILE_CL
 class FetchOp
     : public framework::OperatorWithKernel<DeviceType, FetchParam<DeviceType>,
                                            FetchKernel<DeviceType, T>> {
@@ -35,26 +34,10 @@ class FetchOp
       : framework::OperatorWithKernel<DeviceType, FetchParam<DeviceType>,
                                       FetchKernel<DeviceType, T>>(
             type, inputs, outputs, attrs, scope) {}
-#else
-class FetchOp : public framework::OperatorBase<DeviceType> {
- public:
-  FetchOp(const string &type, const VariableNameMap &inputs,
-          const VariableNameMap &outputs, const framework::AttributeMap attrs,
-          std::shared_ptr<framework::Scope> scope)
-      : framework::OperatorBase<DeviceType>(type, inputs, outputs, attrs,
-                                            scope),
-        param_(inputs, outputs, attrs, *scope) {}
 
-  void Init() {}
-#endif
   void InferShape() const override;
 
-  void RunImpl() override;
-
  protected:
-#ifndef PADDLE_MOBILE_CL
-  FetchParam<DeviceType> param_;
-#endif
 };
 
 }  // namespace operators

src/operators/kernel/arm/fetch_kernel.cpp

+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 FUSION_CONVADD_OP
+
+#include "operators/kernel/fetch_kernel.h"
+
+namespace paddle_mobile {
+namespace operators {
+
+template <>
+bool FetchKernel<CPU, float>::Init(FetchParam<CPU> *param) {
+  return true;
+}
+
+template <>
+void FetchKernel<CPU, float>::Compute(const FetchParam<CPU> &param) {
+  param.Out()->ShareDataWith(*(param.InputX()));
+}
+
+template class FetchKernel<CPU, float>;
+
+}  // namespace operators
+}  // namespace paddle_mobile
+
+#endif