Skip to content

Commit d7bd036

Browse files
typhoonzeroluotao1
authored andcommitted
fix dist deps (#14471)
* fix dist deps test=develop * update test=develop * update test=develop * update test=develop * update test=develop
1 parent 05c15a0 commit d7bd036

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

cmake/operators.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,19 +196,24 @@ endfunction()
196196
function(register_operators)
197197
set(options "")
198198
set(oneValueArgs "")
199-
set(multiValueArgs EXCLUDES)
199+
set(multiValueArgs EXCLUDES DEPS)
200200
cmake_parse_arguments(register_operators "${options}" "${oneValueArgs}"
201201
"${multiValueArgs}" ${ARGN})
202202

203203
file(GLOB OPS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*_op.cc")
204204
string(REPLACE "_mkldnn" "" OPS "${OPS}")
205205
string(REPLACE ".cc" "" OPS "${OPS}")
206206
list(REMOVE_DUPLICATES OPS)
207+
list(LENGTH register_operators_DEPS register_operators_DEPS_len)
207208

208209
foreach(src ${OPS})
209210
list(FIND register_operators_EXCLUDES ${src} _index)
210211
if (${_index} EQUAL -1)
211-
op_library(${src})
212+
if (${register_operators_DEPS_len} GREATER 0)
213+
op_library(${src} DEPS ${register_operators_DEPS})
214+
else()
215+
op_library(${src})
216+
endif()
212217
endif()
213218
endforeach()
214219
endfunction()

paddle/fluid/operators/distributed_ops/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ foreach(src ${OPS})
2929
set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
3030
endforeach()
3131

32-
register_operators(EXCLUDES gen_nccl_id_op)
32+
register_operators(EXCLUDES gen_nccl_id_op DEPS ${DISTRIBUTE_DEPS})
3333

3434
if(WITH_GPU AND NOT WIN32)
3535
set(DISTRIBUTE_DEPS ${DISTRIBUTE_DEPS} nccl_common)
36-
op_library(gen_nccl_id_op)
36+
op_library(gen_nccl_id_op ${DISTRIBUTE_DEPS} nccl_common)
3737
endif()
3838

3939
set(OPERATOR_DEPS ${OPERATOR_DEPS} ${DISTRIBUTE_DEPS} PARENT_SCOPE)

0 commit comments

Comments
 (0)