Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into lod_tensor2

paddle/operators/CMakeLists.txt

@@ -7,7 +7,7 @@ function(op_library TARGET)
     set(OP_LIBRARY ${TARGET} ${OP_LIBRARY} PARENT_SCOPE)
     set(cc_srcs)
     set(cu_srcs)
-    set(op_common_deps operator op_registry)
+    set(op_common_deps operator op_registry math_function)
     set(options "")
     set(oneValueArgs "")
     set(multiValueArgs SRCS DEPS)
@@ -51,17 +51,10 @@ endfunction()
 add_subdirectory(math)
 
 set(DEPS_OPS
-    identity_op
-    minus_op
-    mul_op
-    recurrent_op
-    scale_op)
-op_library(identity_op DEPS scale_op)
-op_library(minus_op DEPS scale_op)
-op_library(mul_op DEPS math_function)
+    recurrent_op)
+
 op_library(recurrent_op SRCS recurrent_op.cc rnn/recurrent_op_utils.cc
   DEPS framework_proto tensor operator net_op)
-op_library(scale_op DEPS net_op)
 
 list(REMOVE_ITEM GENERAL_OPS ${DEPS_OPS})
 foreach(src ${GENERAL_OPS})