From 9d2909be2abcb9b8728f7c4de7437c07a1254b8b Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Fri, 1 Sep 2017 19:27:52 +0800
Subject: [PATCH] rename add_op to add_two_op

---
 paddle/framework/CMakeLists.txt               | 2 +-
 paddle/operators/{add_op.cc => add_two_op.cc} | 2 +-
 paddle/operators/{add_op.cu => add_two_op.cu} | 2 +-
 paddle/operators/{add_op.h => add_two_op.h}   | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename paddle/operators/{add_op.cc => add_two_op.cc} (98%)
 rename paddle/operators/{add_op.cu => add_two_op.cu} (95%)
 rename paddle/operators/{add_op.h => add_two_op.h} (100%)

diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt
index c0838d9b7..e138517b6 100644
--- a/paddle/framework/CMakeLists.txt
+++ b/paddle/framework/CMakeLists.txt
@@ -25,7 +25,7 @@ cc_test(operator_test SRCS operator_test.cc DEPS operator op_registry)
 cc_library(grad_op_builder SRCS grad_op_builder.cc DEPS operator)
 cc_library(op_registry SRCS op_registry.cc DEPS grad_op_builder)
 cc_test(op_registry_test SRCS op_registry_test.cc DEPS op_registry)
-cc_test(grad_op_builder_test SRCS grad_op_builder_test.cc DEPS grad_op_builder op_registry add_op)
+cc_test(grad_op_builder_test SRCS grad_op_builder_test.cc DEPS grad_op_builder op_registry add_two_op)
 
 py_proto_compile(framework_py_proto SRCS framework.proto)
 # Generate an empty __init__.py to make framework_py_proto as a valid python module.
diff --git a/paddle/operators/add_op.cc b/paddle/operators/add_two_op.cc
similarity index 98%
rename from paddle/operators/add_op.cc
rename to paddle/operators/add_two_op.cc
index 8ab748ed7..bc99e306e 100644
--- a/paddle/operators/add_op.cc
+++ b/paddle/operators/add_two_op.cc
@@ -12,7 +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. */
 
-#include "paddle/operators/add_op.h"
+#include "paddle/operators/add_two_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/operators/add_op.cu b/paddle/operators/add_two_op.cu
similarity index 95%
rename from paddle/operators/add_op.cu
rename to paddle/operators/add_two_op.cu
index cec5f558c..acc03b2c8 100644
--- a/paddle/operators/add_op.cu
+++ b/paddle/operators/add_two_op.cu
@@ -14,7 +14,7 @@
 
 #define EIGEN_USE_GPU
 #include "paddle/framework/op_registry.h"
-#include "paddle/operators/add_op.h"
+#include "paddle/operators/add_two_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_GPU_KERNEL(add_two,
diff --git a/paddle/operators/add_op.h b/paddle/operators/add_two_op.h
similarity index 100%
rename from paddle/operators/add_op.h
rename to paddle/operators/add_two_op.h
-- 
GitLab