Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
b8dc673d
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看板
未验证
提交
b8dc673d
编写于
3月 21, 2022
作者:
L
lilong12
提交者:
GitHub
3月 21, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add _init_parallel_env and _new_group (#40579)
上级
d67fe921
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
281 addition
and
2 deletion
+281
-2
python/paddle/distributed/collective.py
python/paddle/distributed/collective.py
+229
-2
python/paddle/fluid/tests/unittests/init_process_group.py
python/paddle/fluid/tests/unittests/init_process_group.py
+49
-0
python/paddle/fluid/tests/unittests/test_collective_process_group.py
...le/fluid/tests/unittests/test_collective_process_group.py
+3
-0
未找到文件。
python/paddle/distributed/collective.py
浏览文件 @
b8dc673d
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
import
numpy
as
np
import
numpy
as
np
import
os
import
os
from
datetime
import
timedelta
from
..fluid.layer_helper
import
LayerHelper
from
..fluid.layer_helper
import
LayerHelper
from
..fluid.framework
import
Variable
from
..fluid.framework
import
Variable
from
..fluid.framework
import
OpProtoHolder
from
..fluid.framework
import
OpProtoHolder
...
@@ -73,6 +74,7 @@ class ReduceOp:
...
@@ -73,6 +74,7 @@ class ReduceOp:
MAX
=
1
MAX
=
1
MIN
=
2
MIN
=
2
PROD
=
3
PROD
=
3
AVG
=
4
class
Group
():
class
Group
():
...
@@ -80,11 +82,13 @@ class Group():
...
@@ -80,11 +82,13 @@ class Group():
The abstract representation of group.
The abstract representation of group.
"""
"""
def
__init__
(
self
,
rank
,
rank_num
,
id
=
0
,
ranks
=
[]):
def
__init__
(
self
,
rank
,
rank_num
,
id
=
0
,
ranks
=
[]
,
pg
=
None
,
name
=
None
):
self
.
rank
=
rank
self
.
rank
=
rank
self
.
nranks
=
rank_num
self
.
nranks
=
rank_num
self
.
id
=
id
self
.
id
=
id
self
.
ranks
=
ranks
self
.
ranks
=
ranks
self
.
pg
=
pg
self
.
name
=
name
def
is_member
(
self
):
def
is_member
(
self
):
if
self
.
rank
<
0
:
if
self
.
rank
<
0
:
...
@@ -99,11 +103,16 @@ class Group():
...
@@ -99,11 +103,16 @@ class Group():
else
:
else
:
return
-
1
return
-
1
@
property
def
process_group
(
self
):
return
self
.
pg
def
__repr__
(
self
):
def
__repr__
(
self
):
debug_str
=
"rank: {}, nranks: {}, id: {}, ranks: "
.
format
(
debug_str
=
"rank: {}, nranks: {}, id: {}, ranks: "
.
format
(
self
.
rank
,
self
.
nranks
,
self
.
id
)
self
.
rank
,
self
.
nranks
,
self
.
id
)
debug_str
+=
", "
.
join
(
map
(
str
,
self
.
ranks
))
debug_str
+=
", "
.
join
(
map
(
str
,
self
.
ranks
))
debug_str
+=
". "
debug_str
+=
"; name: "
debug_str
+=
self
.
name
if
self
.
name
else
"None"
return
debug_str
return
debug_str
...
@@ -121,6 +130,17 @@ def _get_global_env():
...
@@ -121,6 +130,17 @@ def _get_global_env():
# Dict[int, Group]
# Dict[int, Group]
_group_map
=
{}
_group_map
=
{}
# group map by name : the map of all groups from their names
# Dict[name, Group]
_group_map_by_name
=
{}
# Name of the default group for init_parallel_env
_default_group_name
=
"_default_pg"
_valid_backend_list
=
[
'nccl'
,
'gloo'
,
'hccl'
]
_default_store
=
None
# the default tcp store
_default_backend
=
None
def
_get_group_map
():
def
_get_group_map
():
global
_group_map
global
_group_map
...
@@ -135,10 +155,29 @@ def _get_global_group():
...
@@ -135,10 +155,29 @@ def _get_global_group():
return
_get_group_map
()[
0
]
return
_get_group_map
()[
0
]
def
_get_group_map_by_name
():
global
_group_map_by_name
assert
_default_group_name
in
_group_map_by_name
,
(
"Call paddle.distributed.init_parallel_env first "
"to initialize the distributed environment."
)
return
_group_map_by_name
def
_get_default_group
():
assert
_default_group_name
in
_group_map_by_name
,
(
"Call paddle.distributed.init_parallel_env first "
"to initialize the distributed environment."
)
return
_get_group_map_by_name
()[
_default_group_name
]
def
_new_ring_id
():
def
_new_ring_id
():
return
len
(
_get_group_map
())
+
max
(
_get_global_env
().
nrings
,
9
)
return
len
(
_get_group_map
())
+
max
(
_get_global_env
().
nrings
,
9
)
def
_new_group_name_id
():
return
len
(
_get_group_map_by_name
())
+
max
(
_get_global_env
().
nrings
,
9
)
def
get_group
(
id
=
0
):
def
get_group
(
id
=
0
):
"""
"""
...
@@ -163,6 +202,194 @@ def get_group(id=0):
...
@@ -163,6 +202,194 @@ def get_group(id=0):
return
gm
[
id
]
if
id
in
gm
else
None
return
gm
[
id
]
if
id
in
gm
else
None
def
_new_process_group_impl
(
backend
,
store
,
rank
,
world_size
,
group_name
,
pg_options
):
if
backend
==
"gloo"
:
gloo_store
=
core
.
GlooStore
(
store
)
pg
=
None
if
backend
==
"gloo"
:
pg
=
core
.
ProcessGroupGloo
(
gloo_store
,
rank
,
world_size
)
elif
backend
==
"nccl"
:
pg
=
core
.
ProcessGroupNCCL
(
store
,
rank
,
world_size
)
elif
backend
==
"hccl"
:
pg
=
core
.
ProcessGroupHCCL
(
store
,
rank
,
world_size
)
return
pg
def
_init_parallel_env
(
rank
=
None
,
world_size
=
None
,
backend
=
"nccl"
,
timeout
=
timedelta
(
0
),
pg_options
=
None
):
"""
Initializes the default distributed environment.
Args:
rank (int, optional): the rank of the current process or device from 0 to world_size (exclusive).
If you launch your training with paddle.distributed.run or
paddle.distributed.launch module, None can be given. Default: None.
world_size (int, optional): total number of processes or devices.
If you launch your training with paddle.distributed.run or
paddle.distributed.launch module, None can be given. Default: None.
backend (str, optional): the name of the backend used to initialize
the distributed environment. The value can be one of 'nccl' for
GPU, 'gloo' for CPU or 'hccl' for NPU. Default: 'nccl'.
timeout (datetime.timedelta, optional): timeout used for operations of
the group. Default: datetime.timedelta(0) which means no timeout.
pg_options (dict, optional): options for the group. Default: None.
Returns:
Group: a group.
Examples:
.. code-block:: python
# filename: train.py
import paddle
paddle.distributed.init_parallel_env(0, 1)
# how to start
# python paddle.distributed.run --gpus="0,1" train.py
"""
global
_group_map_by_name
global
_default_group_name
assert
_default_group_name
not
in
_group_map_by_name
,
(
"The default distributed environment has been initialized."
)
assert
backend
in
_valid_backend_list
,
(
"Backend must be one of {}, but the given one is: {}"
.
format
(
_valid_backend_list
,
backend
))
_default_backend
=
backend
assert
isinstance
(
timeout
,
timedelta
),
(
"timeout must be of the type datetime.timedelta."
)
if
rank
is
None
or
world_size
is
None
:
assert
rank
is
None
and
world_size
is
None
,
(
"rank and world_size should be unset at the same time."
)
trainer_id
=
os
.
getenv
(
"PADDLE_TRAINER_ID"
,
None
)
trainer_num
=
os
.
getenv
(
"PADDLE_TRAINERS_NUM"
,
None
)
if
trainer_id
is
None
or
trainer_num
is
None
:
warnings
.
warn
(
"If rank and world_size are both None, please start "
"your training with paddle.distributed.run or "
"paddle.distributed.launch module. Otherwise, "
"init_parallel_env will do nothing."
)
return
None
rank
=
int
(
trainer_id
)
world_size
=
int
(
trainer_num
)
assert
rank
>=
0
and
world_size
>
rank
and
world_size
>
1
,
(
"rank must be non-negative and world_size must be the "
"maximum rank plus one. Moreover, at least two processes are "
"required to create a process group."
)
master_addr
=
os
.
getenv
(
"MASTER_ADDR"
,
None
)
master_port
=
os
.
getenv
(
"MASTER_PORT"
,
None
)
if
not
master_addr
or
not
master_port
:
endpoints
=
os
.
getenv
(
"PADDLE_MASTER"
,
None
)
if
endpoints
is
None
:
endpoints
=
os
.
getenv
(
"PADDLE_TRAINER_ENDPOINTS"
,
None
)
if
not
endpoints
:
raise
ValueError
(
"The environment variable 'MASTER_ADDR' and 'MASTER_PORT' "
"must be specified, for example 'export MASTER_ADDR=127.0.0.1' "
"and 'export MASTER_ADDR=54612'. Or you can start your training"
"with paddle.distributed.run or "
"paddle.distributed.luanch module."
)
if
','
in
endpoints
:
endpoints
=
endpoints
.
split
(
','
)[
0
]
master_addr
,
master_port
=
endpoints
.
split
(
":"
)
master_port
=
int
(
master_port
)
is_master
=
rank
==
0
global
_default_store
_default_store
=
core
.
TCPStore
(
master_addr
,
master_port
,
is_master
,
world_size
,
timeout
)
pg
=
_new_process_group_impl
(
backend
,
_default_store
,
rank
,
world_size
,
_default_group_name
,
pg_options
)
ranks
=
list
(
range
(
world_size
))
group
=
Group
(
rank
,
world_size
,
id
=
0
,
ranks
=
ranks
,
pg
=
pg
,
name
=
_default_group_name
)
paddle
.
fluid
.
dygraph
.
parallel_helper
.
_set_parallel_ctx
(
True
)
_group_map_by_name
[
_default_group_name
]
=
group
return
group
def
_new_group
(
ranks
=
None
,
backend
=
None
,
group_name
=
None
,
timeout
=
timedelta
(
0
),
pg_options
=
None
):
"""
Create a new process group.
Args:
ranks (list, optional): list of ranks for the new group. If None is given,
all processes is used. Default: None.
backend (str, optional): the name of the backend used to initialize
the distributed environment. Default: the one for init_parallel_env.
timeout (datetime.timedelta, optional): timeout used for operations of
the group. Default: datetime.timedelta(0).
pg_options (dict, optional): options for the group. Default: None.
Examples:
.. code-block:: python
import paddle
paddle.distributed.init_parallel_env(0, 1)
paddle.distributed.new_group([0, 1])
# how to start
# python paddle.distributed.run --gpus="0,1" train.py
"""
global
_default_group_name
if
group_name
is
None
:
group_name
=
_default_group_name
+
str
(
_new_group_name_id
())
if
group_name
==
_default_group_name
:
raise
ValueError
(
"group_name must be specified and it cannot be '{}' "
"which is used for the default process group created "
"by init_parallel_env."
.
format
(
_default_group_name
))
global_group
=
_get_default_group
()
global_rank
=
global_group
.
rank
global_ranks
=
global_group
.
ranks
if
ranks
is
None
:
ranks
=
global_ranks
assert
len
(
ranks
)
<=
len
(
global_ranks
),
(
"Size of new group must be less than or "
"equal to that of the default global group."
)
size
=
len
(
ranks
)
assert
size
>
1
,
"A group must have at least two memebers."
ranks
=
sorted
(
ranks
)
if
global_rank
in
ranks
:
rank
=
ranks
.
index
(
global_rank
)
pg
=
_new_process_group_impl
(
backend
,
_default_store
,
rank
,
size
,
group_name
,
pg_options
)
else
:
rank
=
-
1
pg
=
None
group
=
Group
(
rank
,
size
,
id
=
_new_group_name_id
(),
ranks
=
ranks
,
pg
=
pg
,
name
=
group_name
)
_group_map_by_name
[
group_name
]
=
group
return
group
def
barrier
(
group
=
None
):
def
barrier
(
group
=
None
):
"""
"""
...
...
python/paddle/fluid/tests/unittests/init_process_group.py
0 → 100644
浏览文件 @
b8dc673d
# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from
__future__
import
print_function
import
unittest
import
random
import
numpy
as
np
import
os
import
shutil
import
paddle
from
paddle.fluid
import
core
import
datetime
from
datetime
import
timedelta
import
paddle.fluid.core
as
core
from
paddle.fluid.framework
import
_test_eager_guard
from
paddle.fluid.dygraph.parallel
import
ParallelEnv
class
TestProcessGroupFp32
(
unittest
.
TestCase
):
def
setUp
(
self
):
self
.
config
()
def
config
(
self
):
pass
def
test_init_process_group
(
self
):
paddle
.
distributed
.
collective
.
_init_parallel_env
()
paddle
.
distributed
.
collective
.
_new_group
()
with
self
.
assertRaises
(
ValueError
):
paddle
.
distributed
.
collective
.
_new_group
(
backend
=
"gloo"
,
group_name
=
"_default_pg"
)
print
(
"test ok
\n
"
)
if
__name__
==
"__main__"
:
unittest
.
main
()
python/paddle/fluid/tests/unittests/test_collective_process_group.py
浏览文件 @
b8dc673d
...
@@ -25,6 +25,9 @@ class TestProcessGroup(TestMultipleGpus):
...
@@ -25,6 +25,9 @@ class TestProcessGroup(TestMultipleGpus):
def
test_process_group_gloo
(
self
):
def
test_process_group_gloo
(
self
):
self
.
run_mnist_2gpu
(
'process_group_gloo.py'
)
self
.
run_mnist_2gpu
(
'process_group_gloo.py'
)
def
test_init_process_group
(
self
):
self
.
run_mnist_2gpu
(
'init_process_group.py'
)
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录