Skip to content

Commit bc5555b

Browse files
committed
Change git apply patches to cp because third_party is not managed in Paddle repo
1 parent 8f18f4d commit bc5555b

File tree

3 files changed

+1
-56
lines changed

3 files changed

+1
-56
lines changed

cmake/external/grpc.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ExternalProject_Add(
5050
UPDATE_COMMAND ""
5151
CONFIGURE_COMMAND ""
5252
BUILD_IN_SOURCE 1
53-
PATCH_COMMAND git apply ${PADDLE_SOURCE_DIR}/patches/grpc/fix_too_early_destory.patch
53+
PATCH_COMMAND cp ${PADDLE_SOURCE_DIR}/patches/grpc/grpc_library.h ${GRPC_SOURCES_DIR}/include/grpcpp/impl/codegen/grpc_library.h && cp ${PADDLE_SOURCE_DIR}/patches/grpc/completion_queue.h ${GRPC_SOURCES_DIR}/include/grpcpp/impl/codegen/completion_queue.h
5454
# NOTE(yuyang18):
5555
# Disable -Werror, otherwise the compile will fail in MacOS.
5656
# It seems that we cannot configure that by make command.

patches/grpc/fix_too_early_destory.patch

Lines changed: 0 additions & 47 deletions
This file was deleted.

python/paddle/reader/decorator.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,14 +325,6 @@ def xreader():
325325
else:
326326
yield sample
327327

328-
assert finish == process_num
329-
for w in workers:
330-
print('join worker: ', w)
331-
print('join worker: ', w.is_alive())
332-
w.join()
333-
print('join worker: ', w.is_alive())
334-
del workers
335-
336328
return xreader
337329

338330

0 commit comments

Comments
 (0)