Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
f58cb018
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看板
未验证
提交
f58cb018
编写于
3月 25, 2021
作者:
C
Chengmo
提交者:
GitHub
3月 25, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【Paddle.Fleet】fix dataset zip py3 bug (#31441)
* fix zip py3 bug
上级
bf09dcb3
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
56 addition
and
10 deletion
+56
-10
python/paddle/distributed/fleet/data_generator/data_generator.py
...paddle/distributed/fleet/data_generator/data_generator.py
+16
-10
python/paddle/fluid/tests/unittests/test_data_generator.py
python/paddle/fluid/tests/unittests/test_data_generator.py
+40
-0
未找到文件。
python/paddle/distributed/fleet/data_generator/data_generator.py
浏览文件 @
f58cb018
...
...
@@ -259,6 +259,9 @@ class MultiSlotStringDataGenerator(DataGenerator):
Returns:
Return a string data that can be read directly by the MultiSlotDataFeed.
'''
if
sys
.
version
>
'3'
and
isinstance
(
line
,
zip
):
line
=
list
(
line
)
if
not
isinstance
(
line
,
list
)
and
not
isinstance
(
line
,
tuple
):
raise
ValueError
(
"the output of process() must be in list or tuple type"
...
...
@@ -304,6 +307,9 @@ class MultiSlotDataGenerator(DataGenerator):
Returns:
Return a string data that can be read directly by the MultiSlotDataFeed.
'''
if
sys
.
version
>
'3'
and
isinstance
(
line
,
zip
):
line
=
list
(
line
)
if
not
isinstance
(
line
,
list
)
and
not
isinstance
(
line
,
tuple
):
raise
ValueError
(
"the output of process() must be in list or tuple type"
...
...
python/paddle/fluid/tests/unittests/test_data_generator.py
浏览文件 @
f58cb018
...
...
@@ -95,6 +95,32 @@ class MyMultiSlotDataGenerator_error_5(fleet.MultiSlotDataGenerator):
return
data_iter
class
MyMultiSlotStringDataGenerator_zip
(
fleet
.
MultiSlotStringDataGenerator
):
def
generate_sample
(
self
,
line
):
def
data_iter
():
for
i
in
range
(
40
):
if
i
==
1
:
yield
None
feature_name
=
[
"words"
,
"label"
]
data
=
[[
"1"
,
"2"
,
"3"
,
"4"
],
[
"0"
]]
yield
zip
(
feature_name
,
data
)
return
data_iter
class
MyMultiSlotDataGenerator_zip
(
fleet
.
MultiSlotDataGenerator
):
def
generate_sample
(
self
,
line
):
def
data_iter
():
for
i
in
range
(
40
):
if
i
==
1
:
yield
None
feature_name
=
[
"words"
,
"label"
]
data
=
[[
1
,
2
,
3
,
4
],
[
0
]]
yield
zip
(
feature_name
,
data
)
return
data_iter
class
TestMultiSlotDataGenerator
(
unittest
.
TestCase
):
def
test_MultiSlotDataGenerator_basic
(
self
):
my_ms_dg
=
MyMultiSlotDataGenerator
()
...
...
@@ -149,5 +175,19 @@ class TestMultiSlotDataGenerator_error_5(unittest.TestCase):
my_ms_dg
.
run_from_memory
()
class
TestMultiSlotStringDataGeneratorZip
(
unittest
.
TestCase
):
def
test_MultiSlotStringDataGenerator_zip
(
self
):
my_ms_dg
=
MyMultiSlotStringDataGenerator_zip
()
my_ms_dg
.
set_batch
(
1
)
my_ms_dg
.
run_from_memory
()
class
TestMultiSlotDataGeneratorZip
(
unittest
.
TestCase
):
def
test_MultiSlotDataGenerator_zip
(
self
):
my_ms_dg
=
MyMultiSlotDataGenerator_zip
()
my_ms_dg
.
set_batch
(
1
)
my_ms_dg
.
run_from_memory
()
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录