Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
cadea35a
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
694
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cadea35a
编写于
6月 20, 2017
作者:
W
wanghaoshuang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format code
上级
09cc4408
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
10 deletion
+15
-10
python/paddle/v2/reader/decorator.py
python/paddle/v2/reader/decorator.py
+9
-8
python/paddle/v2/reader/tests/decorator_test.py
python/paddle/v2/reader/tests/decorator_test.py
+6
-2
未找到文件。
python/paddle/v2/reader/decorator.py
浏览文件 @
cadea35a
...
@@ -251,18 +251,19 @@ def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
...
@@ -251,18 +251,19 @@ def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
in_queue
=
Queue
(
buffer_size
)
in_queue
=
Queue
(
buffer_size
)
out_queue
=
Queue
(
buffer_size
)
out_queue
=
Queue
(
buffer_size
)
out_order
=
[
0
]
out_order
=
[
0
]
# define a worker to read samples from reader to in_queue
# define a worker to read samples from reader to in_queue
def
read_worker
(
reader
,
in_queue
):
def
read_worker
(
reader
,
in_queue
):
for
i
in
reader
():
for
i
in
reader
():
in_queue
.
put
(
i
)
in_queue
.
put
(
i
)
in_queue
.
put
(
end
)
in_queue
.
put
(
end
)
# define a worker to read samples from reader to in_queue with order flag
# define a worker to read samples from reader to in_queue with order flag
def
order_read_worker
(
reader
,
in_queue
):
def
order_read_worker
(
reader
,
in_queue
):
in_order
=
0
in_order
=
0
for
i
in
reader
():
for
i
in
reader
():
in_queue
.
put
((
in_order
,
i
))
in_queue
.
put
((
in_order
,
i
))
in_order
+=
1
in_order
+=
1
in_queue
.
put
(
end
)
in_queue
.
put
(
end
)
# start a read worker in a thread
# start a read worker in a thread
...
@@ -281,7 +282,7 @@ def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
...
@@ -281,7 +282,7 @@ def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
sample
=
in_queue
.
get
()
sample
=
in_queue
.
get
()
in_queue
.
put
(
end
)
in_queue
.
put
(
end
)
out_queue
.
put
(
end
)
out_queue
.
put
(
end
)
# define a worker to handle samples from in_queue by mapper
# define a worker to handle samples from in_queue by mapper
# and put mapped samples into out_queue by order
# and put mapped samples into out_queue by order
def
order_handle_worker
(
in_queue
,
out_queue
,
mapper
,
out_order
):
def
order_handle_worker
(
in_queue
,
out_queue
,
mapper
,
out_order
):
...
@@ -292,18 +293,18 @@ def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
...
@@ -292,18 +293,18 @@ def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
while
order
!=
out_order
[
0
]:
while
order
!=
out_order
[
0
]:
pass
pass
out_queue
.
put
(
r
)
out_queue
.
put
(
r
)
out_order
[
0
]
+=
1
out_order
[
0
]
+=
1
ins
=
in_queue
.
get
()
ins
=
in_queue
.
get
()
in_queue
.
put
(
end
)
in_queue
.
put
(
end
)
out_queue
.
put
(
end
)
out_queue
.
put
(
end
)
# start several handle_workers
# start several handle_workers
target
=
order_handle_worker
if
order
else
handle_worker
target
=
order_handle_worker
if
order
else
handle_worker
args
=
(
in_queue
,
out_queue
,
mapper
,
out_order
)
if
order
else
(
in_queue
,
out_queue
,
mapper
)
args
=
(
in_queue
,
out_queue
,
mapper
,
out_order
)
if
order
else
(
in_queue
,
out_queue
,
mapper
)
workers
=
[]
workers
=
[]
for
i
in
xrange
(
process_num
):
for
i
in
xrange
(
process_num
):
worker
=
Thread
(
worker
=
Thread
(
target
=
target
,
args
=
args
)
target
=
target
,
args
=
args
)
worker
.
daemon
=
True
worker
.
daemon
=
True
workers
.
append
(
worker
)
workers
.
append
(
worker
)
for
w
in
workers
:
for
w
in
workers
:
...
...
python/paddle/v2/reader/tests/decorator_test.py
浏览文件 @
cadea35a
...
@@ -120,10 +120,12 @@ class TestShuffle(unittest.TestCase):
...
@@ -120,10 +120,12 @@ class TestShuffle(unittest.TestCase):
total
+=
1
total
+=
1
self
.
assertEqual
(
total
,
10
)
self
.
assertEqual
(
total
,
10
)
class
TestXmap
(
unittest
.
TestCase
):
class
TestXmap
(
unittest
.
TestCase
):
def
test_xmap
(
self
):
def
test_xmap
(
self
):
def
mapper
(
x
):
def
mapper
(
x
):
return
(
x
+
1
)
return
(
x
+
1
)
orders
=
(
True
,
False
)
orders
=
(
True
,
False
)
thread_nums
=
(
1
,
2
,
4
,
8
,
16
)
thread_nums
=
(
1
,
2
,
4
,
8
,
16
)
buffered_size
=
(
1
,
2
,
4
,
8
,
16
)
buffered_size
=
(
1
,
2
,
4
,
8
,
16
)
...
@@ -131,13 +133,15 @@ class TestXmap(unittest.TestCase):
...
@@ -131,13 +133,15 @@ class TestXmap(unittest.TestCase):
for
tNum
in
thread_nums
:
for
tNum
in
thread_nums
:
for
size
in
buffered_size
:
for
size
in
buffered_size
:
result
=
[]
result
=
[]
for
i
in
paddle
.
v2
.
reader
.
xmap_readers
(
mapper
,
reader_creator_10
(),
tNum
,
size
,
order
)():
for
i
in
paddle
.
v2
.
reader
.
xmap_readers
(
mapper
,
reader_creator_10
(),
tNum
,
size
,
order
)():
result
.
append
(
i
)
result
.
append
(
i
)
if
not
order
:
if
not
order
:
result
.
sort
()
result
.
sort
()
for
idx
,
e
in
enumerate
(
result
):
for
idx
,
e
in
enumerate
(
result
):
self
.
assertEqual
(
e
,
mapper
(
idx
))
self
.
assertEqual
(
e
,
mapper
(
idx
))
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
unittest
.
main
()
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录