Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
2e7e69d0
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2e7e69d0
编写于
5月 20, 2020
作者:
C
Chen Weihang
提交者:
GitHub
5月 20, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove imperative data loader place limit, test=develop (#24641)
上级
fa846da5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
17 deletion
+24
-17
python/paddle/fluid/reader.py
python/paddle/fluid/reader.py
+6
-5
python/paddle/fluid/tests/unittests/test_imperative_data_loader_base.py
...fluid/tests/unittests/test_imperative_data_loader_base.py
+18
-12
未找到文件。
python/paddle/fluid/reader.py
浏览文件 @
2e7e69d0
...
...
@@ -18,7 +18,7 @@ import six
import
numpy
as
np
import
threading
import
paddle
from
.framework
import
Program
,
Variable
,
program_guard
,
default_main_program
,
default_startup_program
,
in_dygraph_mode
,
cpu_places
from
.framework
import
Program
,
Variable
,
program_guard
,
default_main_program
,
default_startup_program
,
in_dygraph_mode
,
cpu_places
,
_current_expected_place
from
.executor
import
global_scope
from
.data_feeder
import
DataFeeder
,
BatchedTensorProvider
from
.multiprocess_utils
import
multiprocess_queue_set
,
CleanupFuncRegistrar
,
_cleanup_mmap
,
_cleanup
,
_set_SIGCHLD_handler
...
...
@@ -671,12 +671,12 @@ class DygraphGeneratorLoader(DataLoaderBase):
if
not
iterable
:
logging
.
warning
(
"Please NOTE:
dygraph
can support iterable mode only. Change to iterable mode."
"Please NOTE:
imperative mode
can support iterable mode only. Change to iterable mode."
)
self
.
_iterable
=
True
if
not
return_list
:
logging
.
warning
(
"Please NOTE:
dygraph
can support return as list only. Change to return as list."
"Please NOTE:
imperative mode
can support return as list only. Change to return as list."
)
self
.
_return_list
=
True
...
...
@@ -941,10 +941,11 @@ class DygraphGeneratorLoader(DataLoaderBase):
def
set_batch_generator
(
self
,
reader
,
places
=
None
):
self
.
_batch_reader
=
reader
assert
places
is
not
None
,
"Places cannot be None when DataLoader is iterable"
if
places
is
None
:
places
=
_current_expected_place
()
self
.
_places
=
_convert_places
(
places
)
assert
len
(
self
.
_places
)
==
1
,
\
"Number of places must be 1 in
dygraph
mode"
"Number of places must be 1 in
imperative
mode"
return
self
...
...
python/paddle/fluid/tests/unittests/test_imperative_data_loader_base.py
浏览文件 @
2e7e69d0
...
...
@@ -41,6 +41,14 @@ class TestDygraphDataLoader(unittest.TestCase):
self
.
epoch_num
=
1
self
.
capacity
=
5
def
iter_loader_data
(
self
,
loader
):
for
_
in
range
(
self
.
epoch_num
):
for
image
,
label
in
loader
():
relu
=
fluid
.
layers
.
relu
(
image
)
self
.
assertEqual
(
image
.
shape
,
[
self
.
batch_size
,
784
])
self
.
assertEqual
(
label
.
shape
,
[
self
.
batch_size
,
1
])
self
.
assertEqual
(
relu
.
shape
,
[
self
.
batch_size
,
784
])
def
test_single_process_loader
(
self
):
with
fluid
.
dygraph
.
guard
():
loader
=
fluid
.
io
.
DataLoader
.
from_generator
(
...
...
@@ -49,12 +57,7 @@ class TestDygraphDataLoader(unittest.TestCase):
sample_generator_creator
(
self
.
batch_size
,
self
.
batch_num
),
batch_size
=
self
.
batch_size
,
places
=
fluid
.
CPUPlace
())
for
_
in
range
(
self
.
epoch_num
):
for
image
,
label
in
loader
():
relu
=
fluid
.
layers
.
relu
(
image
)
self
.
assertEqual
(
image
.
shape
,
[
self
.
batch_size
,
784
])
self
.
assertEqual
(
label
.
shape
,
[
self
.
batch_size
,
1
])
self
.
assertEqual
(
relu
.
shape
,
[
self
.
batch_size
,
784
])
self
.
iter_loader_data
(
loader
)
def
test_multi_process_loader
(
self
):
with
fluid
.
dygraph
.
guard
():
...
...
@@ -64,12 +67,15 @@ class TestDygraphDataLoader(unittest.TestCase):
sample_generator_creator
(
self
.
batch_size
,
self
.
batch_num
),
batch_size
=
self
.
batch_size
,
places
=
fluid
.
CPUPlace
())
for
_
in
range
(
self
.
epoch_num
):
for
image
,
label
in
loader
():
relu
=
fluid
.
layers
.
relu
(
image
)
self
.
assertEqual
(
image
.
shape
,
[
self
.
batch_size
,
784
])
self
.
assertEqual
(
label
.
shape
,
[
self
.
batch_size
,
1
])
self
.
assertEqual
(
relu
.
shape
,
[
self
.
batch_size
,
784
])
self
.
iter_loader_data
(
loader
)
def
test_generator_no_places
(
self
):
with
fluid
.
dygraph
.
guard
():
loader
=
fluid
.
io
.
DataLoader
.
from_generator
(
capacity
=
self
.
capacity
)
loader
.
set_sample_generator
(
sample_generator_creator
(
self
.
batch_size
,
self
.
batch_num
),
batch_size
=
self
.
batch_size
)
self
.
iter_loader_data
(
loader
)
if
__name__
==
'__main__'
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录