Merge remote-tracking branch 'upstream/develop' into windows/build

cmake/operators.cmake

@@ -195,7 +195,7 @@ endfunction()
 function(register_operators)
     set(options "")
     set(oneValueArgs "")
-    set(multiValueArgs EXCLUDES)
+    set(multiValueArgs EXCLUDES DEPS)
     cmake_parse_arguments(register_operators "${options}" "${oneValueArgs}"
             "${multiValueArgs}" ${ARGN})
 
@@ -203,11 +203,16 @@ function(register_operators)
     string(REPLACE "_mkldnn" "" OPS "${OPS}")
     string(REPLACE ".cc" "" OPS "${OPS}")
     list(REMOVE_DUPLICATES OPS)
+    list(LENGTH register_operators_DEPS register_operators_DEPS_len)
 
     foreach(src ${OPS})
         list(FIND register_operators_EXCLUDES ${src} _index)
         if (${_index} EQUAL -1)
-            op_library(${src})
+            if (${register_operators_DEPS_len} GREATER 0)
+                op_library(${src} DEPS ${register_operators_DEPS})
+            else()
+                op_library(${src})
+            endif()
         endif()
     endforeach()
 endfunction()

paddle/fluid/operators/distributed_ops/CMakeLists.txt

@@ -29,11 +29,11 @@ foreach(src ${OPS})
     set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
 endforeach()
 
-register_operators(EXCLUDES gen_nccl_id_op)
+register_operators(EXCLUDES gen_nccl_id_op DEPS ${DISTRIBUTE_DEPS})
 
 if(WITH_GPU AND NOT WIN32)
     set(DISTRIBUTE_DEPS ${DISTRIBUTE_DEPS} nccl_common)
-    op_library(gen_nccl_id_op)
+    op_library(gen_nccl_id_op ${DISTRIBUTE_DEPS} nccl_common)
 endif()
 
 set(OPERATOR_DEPS ${OPERATOR_DEPS} ${DISTRIBUTE_DEPS} PARENT_SCOPE)