Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
4adddcc8
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
4adddcc8
编写于
11月 30, 2020
作者:
T
Thunderbrook
提交者:
GitHub
11月 30, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add set_trainer_num api in dataset (#29133)
上级
e0344081
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
23 addition
and
3 deletion
+23
-3
python/paddle/fluid/dataset.py
python/paddle/fluid/dataset.py
+21
-3
python/paddle/fluid/tests/unittests/test_dataset.py
python/paddle/fluid/tests/unittests/test_dataset.py
+2
-0
未找到文件。
python/paddle/fluid/dataset.py
浏览文件 @
4adddcc8
...
@@ -351,6 +351,7 @@ class InMemoryDataset(DatasetBase):
...
@@ -351,6 +351,7 @@ class InMemoryDataset(DatasetBase):
self
.
enable_pv_merge
=
False
self
.
enable_pv_merge
=
False
self
.
merge_by_lineid
=
False
self
.
merge_by_lineid
=
False
self
.
fleet_send_sleep_seconds
=
None
self
.
fleet_send_sleep_seconds
=
None
self
.
trainer_num
=
-
1
@
deprecated
(
@
deprecated
(
since
=
"2.0.0"
,
since
=
"2.0.0"
,
...
@@ -480,6 +481,23 @@ class InMemoryDataset(DatasetBase):
...
@@ -480,6 +481,23 @@ class InMemoryDataset(DatasetBase):
"""
"""
self
.
parse_logkey
=
parse_logkey
self
.
parse_logkey
=
parse_logkey
def
_set_trainer_num
(
self
,
trainer_num
):
"""
Set trainer num
Args:
trainer_num(int): trainer num
Examples:
.. code-block:: python
import paddle.fluid as fluid
dataset = fluid.DatasetFactory().create_dataset("InMemoryDataset")
dataset._set_trainer_num(1)
"""
self
.
trainer_num
=
trainer_num
@
deprecated
(
@
deprecated
(
since
=
"2.0.0"
,
since
=
"2.0.0"
,
update_to
=
"paddle.distributed.InMemoryDataset._set_merge_by_sid"
)
update_to
=
"paddle.distributed.InMemoryDataset._set_merge_by_sid"
)
...
@@ -766,16 +784,16 @@ class InMemoryDataset(DatasetBase):
...
@@ -766,16 +784,16 @@ class InMemoryDataset(DatasetBase):
thread_num(int): shuffle thread num. Default is 12.
thread_num(int): shuffle thread num. Default is 12.
"""
"""
trainer_num
=
1
if
fleet
is
not
None
:
if
fleet
is
not
None
:
fleet
.
_role_maker
.
barrier_worker
()
fleet
.
_role_maker
.
barrier_worker
()
trainer_num
=
fleet
.
worker_num
()
if
self
.
trainer_num
==
-
1
:
self
.
trainer_num
=
fleet
.
worker_num
()
if
self
.
fleet_send_batch_size
is
None
:
if
self
.
fleet_send_batch_size
is
None
:
self
.
fleet_send_batch_size
=
1024
self
.
fleet_send_batch_size
=
1024
if
self
.
fleet_send_sleep_seconds
is
None
:
if
self
.
fleet_send_sleep_seconds
is
None
:
self
.
fleet_send_sleep_seconds
=
0
self
.
fleet_send_sleep_seconds
=
0
self
.
dataset
.
register_client2client_msg_handler
()
self
.
dataset
.
register_client2client_msg_handler
()
self
.
dataset
.
set_trainer_num
(
trainer_num
)
self
.
dataset
.
set_trainer_num
(
self
.
trainer_num
)
self
.
dataset
.
set_fleet_send_batch_size
(
self
.
fleet_send_batch_size
)
self
.
dataset
.
set_fleet_send_batch_size
(
self
.
fleet_send_batch_size
)
self
.
dataset
.
set_fleet_send_sleep_seconds
(
self
.
fleet_send_sleep_seconds
)
self
.
dataset
.
set_fleet_send_sleep_seconds
(
self
.
fleet_send_sleep_seconds
)
if
fleet
is
not
None
:
if
fleet
is
not
None
:
...
...
python/paddle/fluid/tests/unittests/test_dataset.py
浏览文件 @
4adddcc8
...
@@ -65,8 +65,10 @@ class TestDataset(unittest.TestCase):
...
@@ -65,8 +65,10 @@ class TestDataset(unittest.TestCase):
dataset
=
fluid
.
InMemoryDataset
()
dataset
=
fluid
.
InMemoryDataset
()
dataset
.
set_parse_ins_id
(
True
)
dataset
.
set_parse_ins_id
(
True
)
dataset
.
set_parse_content
(
True
)
dataset
.
set_parse_content
(
True
)
dataset
.
_set_trainer_num
(
1
)
self
.
assertTrue
(
dataset
.
parse_ins_id
)
self
.
assertTrue
(
dataset
.
parse_ins_id
)
self
.
assertTrue
(
dataset
.
parse_content
)
self
.
assertTrue
(
dataset
.
parse_content
)
self
.
assertEqual
(
dataset
.
trainer_num
,
1
)
def
test_run_with_dump
(
self
):
def
test_run_with_dump
(
self
):
"""
"""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录