Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
f1d63029
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
f1d63029
编写于
5月 12, 2021
作者:
K
Kaipeng Deng
提交者:
GitHub
5月 12, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix dataloader exit hang when join re-enter (#32827)
* fix dataloader exit hang when join re-enter. test=develop
上级
6b3bb796
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
9 deletion
+17
-9
python/paddle/fluid/dataloader/dataloader_iter.py
python/paddle/fluid/dataloader/dataloader_iter.py
+17
-9
未找到文件。
python/paddle/fluid/dataloader/dataloader_iter.py
浏览文件 @
f1d63029
...
@@ -289,10 +289,14 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
...
@@ -289,10 +289,14 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
# if user exit python program when dataloader is still
# if user exit python program when dataloader is still
# iterating, resource may no release safely, so we
# iterating, resource may no release safely, so we
# add _
_del__
function to to CleanupFuncRegistrar
# add _
shutdown_on_exit
function to to CleanupFuncRegistrar
# to make sure _
_del__
is always called when program
# to make sure _
try_shutdown_all
is always called when program
# exit for resoure releasing safely
# exit for resoure releasing safely
CleanupFuncRegistrar
.
register
(
self
.
__del__
)
# worker join may hang for in _try_shutdown_all call in atexit
# for main process is in atexit state in some OS, so we add
# timeout=1 for shutdown function call in atexit, for shutdown
# function call in __del__, we keep it as it is
CleanupFuncRegistrar
.
register
(
self
.
_shutdown_on_exit
)
def
_init_workers
(
self
):
def
_init_workers
(
self
):
# multiprocess worker and indice queue list initial as empty
# multiprocess worker and indice queue list initial as empty
...
@@ -363,7 +367,7 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
...
@@ -363,7 +367,7 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
self
.
_indices_queues
[
worker_id
].
put
(
None
)
self
.
_indices_queues
[
worker_id
].
put
(
None
)
self
.
_worker_status
[
worker_id
]
=
False
self
.
_worker_status
[
worker_id
]
=
False
def
_try_shutdown_all
(
self
):
def
_try_shutdown_all
(
self
,
timeout
=
None
):
if
not
self
.
_shutdown
:
if
not
self
.
_shutdown
:
try
:
try
:
self
.
_exit_thread_expectedly
()
self
.
_exit_thread_expectedly
()
...
@@ -376,11 +380,12 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
...
@@ -376,11 +380,12 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
for
i
in
range
(
self
.
_num_workers
):
for
i
in
range
(
self
.
_num_workers
):
self
.
_shutdown_worker
(
i
)
self
.
_shutdown_worker
(
i
)
for
w
in
self
.
_workers
:
if
not
self
.
_shutdown
:
w
.
join
()
for
w
in
self
.
_workers
:
for
q
in
self
.
_indices_queues
:
w
.
join
(
timeout
)
q
.
cancel_join_thread
()
for
q
in
self
.
_indices_queues
:
q
.
close
()
q
.
cancel_join_thread
()
q
.
close
()
finally
:
finally
:
core
.
_erase_process_pids
(
id
(
self
))
core
.
_erase_process_pids
(
id
(
self
))
self
.
_shutdown
=
True
self
.
_shutdown
=
True
...
@@ -560,6 +565,9 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
...
@@ -560,6 +565,9 @@ class _DataLoaderIterMultiProcess(_DataLoaderIterBase):
def
__del__
(
self
):
def
__del__
(
self
):
self
.
_try_shutdown_all
()
self
.
_try_shutdown_all
()
def
_shutdown_on_exit
(
self
):
self
.
_try_shutdown_all
(
1
)
def
__next__
(
self
):
def
__next__
(
self
):
try
:
try
:
# _batches_outstanding here record the total batch data number
# _batches_outstanding here record the total batch data number
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录