From 740c8ba12a29418eefeb22a843bebb1781f300fe Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Mon, 4 Sep 2017 16:40:23 +0800
Subject: [PATCH] remove scatter_op.cu/gather_op.cu as they support only_cpu
 now

---
 paddle/operators/CMakeLists.txt | 24 ++++++++++++++++--------
 paddle/operators/gather_op.cu   | 20 --------------------
 paddle/operators/scatter_op.cu  | 20 --------------------
 3 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 paddle/operators/gather_op.cu
 delete mode 100644 paddle/operators/scatter_op.cu

diff --git a/paddle/operators/CMakeLists.txt b/paddle/operators/CMakeLists.txt
index d85c3d575a..90185101c4 100644
--- a/paddle/operators/CMakeLists.txt
+++ b/paddle/operators/CMakeLists.txt
@@ -46,15 +46,20 @@ endfunction()
 
 add_subdirectory(math)
 
-list(REMOVE_ITEM GENERAL_OPS
-     net_op
-     identity_op
-     minus_op
-     mul_op
-     recurrent_op
-     scale_op)
+set(ONLYCPU_OPS
+    net_op
+    gather_op
+    scatter_op)
+foreach(src ${ONLYCPU_OPS})
+    op_library(${src} SRCS ${src}.cc)
+endforeach()
 
-op_library(net_op SRCS net_op.cc)
+set(DEPS_OPS
+    identity_op
+    minus_op
+    mul_op
+    recurrent_op
+    scale_op)
 op_library(identity_op SRCS identity_op.cc DEPS scale_op)
 op_library(minus_op SRCS minus_op.cc minus_op.cu DEPS scale_op)
 op_library(mul_op SRCS mul_op.cc mul_op.cu DEPS math_function)
@@ -62,6 +67,9 @@ op_library(recurrent_op SRCS recurrent_op.cc rnn/recurrent_op_utils.cc
   DEPS framework_proto tensor operator net_op)
 op_library(scale_op SRCS scale_op.cc scale_op.cu DEPS net_op)
 
+list(REMOVE_ITEM GENERAL_OPS
+     ${ONLYCPU_OPS}
+     ${DEPS_OPS})
 foreach(src ${GENERAL_OPS})
     op_library(${src} SRCS ${src}.cc ${src}.cu)
 endforeach()
diff --git a/paddle/operators/gather_op.cu b/paddle/operators/gather_op.cu
deleted file mode 100644
index 3f04a7b3f8..0000000000
--- a/paddle/operators/gather_op.cu
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
-
-   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. */
-
-#define EIGEN_USE_GPU
-#include "paddle/operators/gather_op.h"
-
-namespace ops = paddle::operators;
-REGISTER_OP_GPU_KERNEL(gather,
-                       ops::GatherOpKernel<paddle::platform::GPUPlace, float>);
diff --git a/paddle/operators/scatter_op.cu b/paddle/operators/scatter_op.cu
deleted file mode 100644
index 6716b47883..0000000000
--- a/paddle/operators/scatter_op.cu
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
-
-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. */
-
-#define EIGEN_USE_GPU
-#include "paddle/operators/scatter_op.h"
-
-namespace ops = paddle::operators;
-REGISTER_OP_GPU_KERNEL(scatter,
-                       ops::ScatterOpKernel<paddle::platform::GPUPlace, float>);
-- 
GitLab