Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
2532b922
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2532b922
编写于
3月 20, 2018
作者:
F
fengjiayi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add more unittests and fix bugs
上级
f8638664
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
7 deletion
+14
-7
paddle/fluid/operators/reader/open_files_op.cc
paddle/fluid/operators/reader/open_files_op.cc
+1
-0
python/paddle/fluid/tests/unittests/.gitignore
python/paddle/fluid/tests/unittests/.gitignore
+3
-0
python/paddle/fluid/tests/unittests/test_multiple_reader.py
python/paddle/fluid/tests/unittests/test_multiple_reader.py
+10
-7
未找到文件。
paddle/fluid/operators/reader/open_files_op.cc
浏览文件 @
2532b922
...
@@ -122,6 +122,7 @@ void MultipleReader::ScheduleThreadFunc() {
...
@@ -122,6 +122,7 @@ void MultipleReader::ScheduleThreadFunc() {
// No more file to read.
// No more file to read.
++
completed_thread_num
;
++
completed_thread_num
;
if
(
completed_thread_num
==
prefetchers_
.
size
())
{
if
(
completed_thread_num
==
prefetchers_
.
size
())
{
buffer_
->
Close
();
break
;
break
;
}
}
}
}
...
...
python/paddle/fluid/tests/unittests/.gitignore
浏览文件 @
2532b922
mnist.recordio
mnist.recordio
mnist_0.recordio
mnist_1.recordio
mnist_2.recordio
python/paddle/fluid/tests/unittests/test_multiple_reader.py
浏览文件 @
2532b922
...
@@ -22,9 +22,10 @@ from shutil import copyfile
...
@@ -22,9 +22,10 @@ from shutil import copyfile
class
TestMultipleReader
(
unittest
.
TestCase
):
class
TestMultipleReader
(
unittest
.
TestCase
):
def
setUp
(
self
):
def
setUp
(
self
):
self
.
batch_size
=
64
# Convert mnist to recordio file
# Convert mnist to recordio file
with
fluid
.
program_guard
(
fluid
.
Program
(),
fluid
.
Program
()):
with
fluid
.
program_guard
(
fluid
.
Program
(),
fluid
.
Program
()):
reader
=
paddle
.
batch
(
mnist
.
train
(),
batch_size
=
32
)
reader
=
paddle
.
batch
(
mnist
.
train
(),
batch_size
=
self
.
batch_size
)
feeder
=
fluid
.
DataFeeder
(
feeder
=
fluid
.
DataFeeder
(
feed_list
=
[
# order is image and label
feed_list
=
[
# order is image and label
fluid
.
layers
.
data
(
fluid
.
layers
.
data
(
...
@@ -37,9 +38,8 @@ class TestMultipleReader(unittest.TestCase):
...
@@ -37,9 +38,8 @@ class TestMultipleReader(unittest.TestCase):
'./mnist_0.recordio'
,
reader
,
feeder
)
'./mnist_0.recordio'
,
reader
,
feeder
)
copyfile
(
'./mnist_0.recordio'
,
'./mnist_1.recordio'
)
copyfile
(
'./mnist_0.recordio'
,
'./mnist_1.recordio'
)
copyfile
(
'./mnist_0.recordio'
,
'./mnist_2.recordio'
)
copyfile
(
'./mnist_0.recordio'
,
'./mnist_2.recordio'
)
print
(
self
.
num_batch
)
def
test_multiple_reader
(
self
,
thread_num
=
3
):
def
main
(
self
,
thread_num
):
file_list
=
[
file_list
=
[
'./mnist_0.recordio'
,
'./mnist_1.recordio'
,
'./mnist_2.recordio'
'./mnist_0.recordio'
,
'./mnist_1.recordio'
,
'./mnist_2.recordio'
]
]
...
@@ -64,8 +64,11 @@ class TestMultipleReader(unittest.TestCase):
...
@@ -64,8 +64,11 @@ class TestMultipleReader(unittest.TestCase):
while
not
data_files
.
eof
():
while
not
data_files
.
eof
():
img_val
,
=
exe
.
run
(
fetch_list
=
[
img
])
img_val
,
=
exe
.
run
(
fetch_list
=
[
img
])
batch_count
+=
1
batch_count
+=
1
print
(
batch_count
)
self
.
assertLessEqual
(
img_val
.
shape
[
0
],
self
.
batch_size
)
# data_files.reset()
data_files
.
reset
()
print
(
"FUCK"
)
self
.
assertEqual
(
batch_count
,
self
.
num_batch
*
3
)
self
.
assertEqual
(
batch_count
,
self
.
num_batch
*
3
)
def
test_main
(
self
):
self
.
main
(
thread_num
=
3
)
# thread number equals to file number
self
.
main
(
thread_num
=
10
)
# thread number is larger than file number
self
.
main
(
thread_num
=
2
)
# thread number is less than file number
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录