Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
dc773828
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看板
未验证
提交
dc773828
编写于
3月 11, 2022
作者:
Z
zn
提交者:
GitHub
3月 11, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[MLU]add allgather_op mlu kernel (#40356)
上级
282cba48
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
319 addition
and
2 deletion
+319
-2
paddle/fluid/operators/collective/c_allgather_op_mlu.cc
paddle/fluid/operators/collective/c_allgather_op_mlu.cc
+81
-0
paddle/fluid/operators/collective/c_allreduce_op.h
paddle/fluid/operators/collective/c_allreduce_op.h
+1
-1
paddle/fluid/operators/collective/c_broadcast_op_mlu.cc
paddle/fluid/operators/collective/c_broadcast_op_mlu.cc
+1
-1
python/paddle/fluid/tests/unittests/mlu/CMakeLists.txt
python/paddle/fluid/tests/unittests/mlu/CMakeLists.txt
+2
-0
python/paddle/fluid/tests/unittests/mlu/collective_allgather_api.py
...dle/fluid/tests/unittests/mlu/collective_allgather_api.py
+55
-0
python/paddle/fluid/tests/unittests/mlu/collective_allgather_op.py
...ddle/fluid/tests/unittests/mlu/collective_allgather_op.py
+71
-0
python/paddle/fluid/tests/unittests/mlu/test_collective_allgather.py
...le/fluid/tests/unittests/mlu/test_collective_allgather.py
+55
-0
python/paddle/fluid/tests/unittests/mlu/test_collective_allgather_api_mlu.py
.../tests/unittests/mlu/test_collective_allgather_api_mlu.py
+43
-0
python/paddle/fluid/tests/unittests/mlu/test_collective_api_base_mlu.py
...fluid/tests/unittests/mlu/test_collective_api_base_mlu.py
+6
-0
python/paddle/fluid/tests/unittests/mlu/test_collective_base_mlu.py
...dle/fluid/tests/unittests/mlu/test_collective_base_mlu.py
+4
-0
未找到文件。
paddle/fluid/operators/collective/c_allgather_op_mlu.cc
0 → 100644
浏览文件 @
dc773828
/* 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. */
#include "paddle/fluid/operators/collective/c_allgather_op.h"
#if defined(PADDLE_WITH_CNCL)
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/mlu/cncl_helper.h"
#endif
#include "paddle/fluid/framework/convert_utils.h"
namespace
paddle
{
namespace
operators
{
template
<
typename
T
>
class
CAllGatherOpMLUKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
#if defined(PADDLE_WITH_CNCL)
auto
x
=
ctx
.
Input
<
framework
::
Tensor
>
(
"X"
);
auto
out
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
cnclDataType_t
dtype
=
platform
::
ToCNCLDataType
(
framework
::
TransToProtoVarType
(
x
->
dtype
()));
int
nranks
=
ctx
.
Attr
<
int
>
(
"nranks"
);
int
rid
=
ctx
.
Attr
<
int
>
(
"ring_id"
);
auto
place
=
ctx
.
GetPlace
();
auto
comm
=
platform
::
CNCLCommContext
::
Instance
().
Get
(
rid
,
place
);
PADDLE_ENFORCE_EQ
(
nranks
,
comm
->
nranks
(),
platform
::
errors
::
InvalidArgument
(
"nranks: %s should equal to %s"
,
nranks
,
comm
->
nranks
()));
framework
::
DDim
out_dims
=
x
->
dims
();
out_dims
[
0
]
*=
nranks
;
out
->
mutable_data
<
T
>
(
out_dims
,
place
);
uint32_t
send_numel
=
x
->
numel
();
void
*
send_buff
=
reinterpret_cast
<
void
*>
(
const_cast
<
T
*>
(
x
->
data
<
T
>
()));
void
*
recv_buff
=
reinterpret_cast
<
void
*>
(
out
->
data
<
T
>
());
mluStream
stream
=
nullptr
;
if
(
ctx
.
Attr
<
bool
>
(
"use_calc_stream"
))
{
auto
dev_ctx
=
platform
::
DeviceContextPool
::
Instance
().
Get
(
place
);
stream
=
static_cast
<
platform
::
MLUDeviceContext
*>
(
dev_ctx
)
->
stream
();
}
else
{
stream
=
comm
->
stream
();
}
PADDLE_ENFORCE_MLU_SUCCESS
(
cnclAllGather
(
send_buff
,
recv_buff
,
send_numel
,
dtype
,
comm
->
comm
(),
stream
));
#else
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"PaddlePaddle should compile with MLU."
));
#endif
}
};
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_MLU_KERNEL
(
c_allgather
,
ops
::
CAllGatherOpMLUKernel
<
float
>
,
ops
::
CAllGatherOpMLUKernel
<
uint8_t
>
,
ops
::
CAllGatherOpMLUKernel
<
int
>
,
ops
::
CAllGatherOpMLUKernel
<
int8_t
>
,
ops
::
CAllGatherOpMLUKernel
<
int16_t
>
,
ops
::
CAllGatherOpMLUKernel
<
plat
::
float16
>
);
paddle/fluid/operators/collective/c_allreduce_op.h
浏览文件 @
dc773828
...
@@ -413,7 +413,7 @@ class CAllReduceOpMLUKernel : public framework::OpKernel<T> {
...
@@ -413,7 +413,7 @@ class CAllReduceOpMLUKernel : public framework::OpKernel<T> {
auto
place
=
ctx
.
GetPlace
();
auto
place
=
ctx
.
GetPlace
();
cnclDataType_t
dtype
=
cnclDataType_t
dtype
=
platform
::
ToCNCLDataType
(
framework
::
TransToProtoVarType
(
in
->
type
()));
platform
::
ToCNCLDataType
(
framework
::
TransToProtoVarType
(
in
->
d
type
()));
int64_t
numel
=
in
->
numel
();
int64_t
numel
=
in
->
numel
();
const
void
*
sendbuff
=
in
->
data
<
T
>
();
const
void
*
sendbuff
=
in
->
data
<
T
>
();
out
->
Resize
(
in
->
dims
());
out
->
Resize
(
in
->
dims
());
...
...
paddle/fluid/operators/collective/c_broadcast_op_mlu.cc
浏览文件 @
dc773828
...
@@ -31,7 +31,7 @@ class CBroadcastOPMLUKernel : public framework::OpKernel<T> {
...
@@ -31,7 +31,7 @@ class CBroadcastOPMLUKernel : public framework::OpKernel<T> {
auto
out
=
ctx
.
Output
<
framework
::
LoDTensor
>
(
"Out"
);
auto
out
=
ctx
.
Output
<
framework
::
LoDTensor
>
(
"Out"
);
int
numel
=
x
->
numel
();
int
numel
=
x
->
numel
();
cnclDataType_t
dtype
=
cnclDataType_t
dtype
=
platform
::
ToCNCLDataType
(
framework
::
TransToProtoVarType
(
x
->
type
()));
platform
::
ToCNCLDataType
(
framework
::
TransToProtoVarType
(
x
->
d
type
()));
int
rid
=
ctx
.
Attr
<
int
>
(
"ring_id"
);
int
rid
=
ctx
.
Attr
<
int
>
(
"ring_id"
);
auto
place
=
ctx
.
GetPlace
();
auto
place
=
ctx
.
GetPlace
();
...
...
python/paddle/fluid/tests/unittests/mlu/CMakeLists.txt
浏览文件 @
dc773828
...
@@ -22,8 +22,10 @@ if (WITH_MLU)
...
@@ -22,8 +22,10 @@ if (WITH_MLU)
bash_test_modules
(
test_c_comm_init_op_mlu START_BASH test_c_comm_init_op_mlu.sh ENVS PADDLE_BINARY_DIR=
${
PADDLE_BINARY_DIR
}
)
bash_test_modules
(
test_c_comm_init_op_mlu START_BASH test_c_comm_init_op_mlu.sh ENVS PADDLE_BINARY_DIR=
${
PADDLE_BINARY_DIR
}
)
set_tests_properties
(
test_collective_broadcast PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_broadcast PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_allreduce PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_allreduce PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_allgather PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_broadcast_api_mlu PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_broadcast_api_mlu PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_allreduce_api_mlu PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_allreduce_api_mlu PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_collective_allgather_api_mlu PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_c_comm_init_op_mlu PROPERTIES TIMEOUT 120
)
set_tests_properties
(
test_c_comm_init_op_mlu PROPERTIES TIMEOUT 120
)
endif
(
WITH_CNCL
)
endif
(
WITH_CNCL
)
endif
()
endif
()
python/paddle/fluid/tests/unittests/mlu/collective_allgather_api.py
0 → 100755
浏览文件 @
dc773828
# 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
numpy
as
np
import
argparse
import
os
import
sys
import
signal
import
time
import
socket
from
contextlib
import
closing
from
six
import
string_types
import
math
import
paddle
import
paddle.fluid
as
fluid
import
paddle.fluid.profiler
as
profiler
import
paddle.fluid.unique_name
as
nameGen
from
paddle.fluid
import
core
import
unittest
from
multiprocessing
import
Process
import
paddle.fluid.layers
as
layers
from
functools
import
reduce
from
test_collective_api_base_mlu
import
TestCollectiveAPIRunnerBase
,
runtime_main
paddle
.
enable_static
()
class
TestCollectiveAllgatherAPI
(
TestCollectiveAPIRunnerBase
):
def
__init__
(
self
):
self
.
global_ring_id
=
0
def
get_model
(
self
,
main_prog
,
startup_program
,
rank
):
with
fluid
.
program_guard
(
main_prog
,
startup_program
):
tensor_list
=
[]
tindata
=
layers
.
data
(
name
=
"tindata"
,
shape
=
[
10
,
1000
],
dtype
=
'float32'
)
paddle
.
distributed
.
all_gather
(
tensor_list
,
tindata
)
return
tensor_list
if
__name__
==
"__main__"
:
runtime_main
(
TestCollectiveAllgatherAPI
,
"allgather"
)
python/paddle/fluid/tests/unittests/mlu/collective_allgather_op.py
0 → 100755
浏览文件 @
dc773828
# 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
numpy
as
np
import
argparse
import
os
import
sys
import
signal
import
time
from
contextlib
import
closing
from
six
import
string_types
import
math
import
paddle
import
paddle.fluid
as
fluid
import
paddle.fluid.profiler
as
profiler
import
paddle.fluid.unique_name
as
nameGen
from
paddle.fluid
import
core
import
unittest
from
multiprocessing
import
Process
import
paddle.fluid.layers
as
layers
from
functools
import
reduce
from
test_collective_base_mlu
import
TestCollectiveRunnerBase
,
runtime_main
paddle
.
enable_static
()
class
TestCollectiveAllgather
(
TestCollectiveRunnerBase
):
def
__init__
(
self
):
self
.
global_ring_id
=
0
def
get_model
(
self
,
main_prog
,
startup_program
):
ring_id
=
0
nranks
=
2
with
fluid
.
program_guard
(
main_prog
,
startup_program
):
tindata
=
layers
.
data
(
name
=
"tindata"
,
shape
=
[
10
,
1000
],
dtype
=
'float32'
)
toutdata
=
main_prog
.
current_block
().
create_var
(
name
=
"outofgather"
,
dtype
=
'float32'
,
type
=
core
.
VarDesc
.
VarType
.
LOD_TENSOR
,
persistable
=
False
,
stop_gradient
=
False
)
main_prog
.
global_block
().
append_op
(
type
=
"c_allgather"
,
inputs
=
{
'X'
:
tindata
},
attrs
=
{
'ring_id'
:
ring_id
,
'nranks'
:
nranks
},
outputs
=
{
'Out'
:
toutdata
})
main_prog
.
global_block
().
append_op
(
type
=
"c_sync_comm_stream"
,
inputs
=
{
'X'
:
toutdata
},
outputs
=
{
'Out'
:
toutdata
},
attrs
=
{
'ring_id'
:
ring_id
})
return
toutdata
if
__name__
==
"__main__"
:
runtime_main
(
TestCollectiveAllgather
,
"allgather"
,
0
)
python/paddle/fluid/tests/unittests/mlu/test_collective_allgather.py
0 → 100644
浏览文件 @
dc773828
# 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
sys
import
unittest
import
numpy
as
np
import
paddle
from
test_collective_base_mlu
import
TestDistBase
paddle
.
enable_static
()
class
TestCAllgatherOp
(
TestDistBase
):
def
_setup_config
(
self
):
pass
def
test_allgather_fp32
(
self
):
self
.
check_with_place
(
"collective_allgather_op.py"
,
"allgather"
,
"float32"
)
def
test_allgather_fp16
(
self
):
self
.
check_with_place
(
"collective_allgather_op.py"
,
"allgather"
,
"float16"
)
def
test_allgather_int32
(
self
):
self
.
check_with_place
(
"collective_allgather_op.py"
,
"allgather"
,
"int32"
)
def
test_allgather_int16
(
self
):
self
.
check_with_place
(
"collective_allgather_op.py"
,
"allgather"
,
"int16"
)
def
test_allgather_int8
(
self
):
self
.
check_with_place
(
"collective_allgather_op.py"
,
"allgather"
,
"int8"
)
def
test_allgather_uint8
(
self
):
self
.
check_with_place
(
"collective_allgather_op.py"
,
"allgather"
,
"uint8"
)
if
__name__
==
'__main__'
:
unittest
.
main
()
python/paddle/fluid/tests/unittests/mlu/test_collective_allgather_api_mlu.py
0 → 100755
浏览文件 @
dc773828
# 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
numpy
as
np
import
paddle
from
test_collective_api_base_mlu
import
TestDistBase
paddle
.
enable_static
()
class
TestCollectiveAllgatherAPI
(
TestDistBase
):
def
_setup_config
(
self
):
pass
def
test_allgather_cncl_fp16
(
self
):
self
.
check_with_place
(
"collective_allgather_api.py"
,
"allgather"
,
"float16"
)
def
test_allgather_cncl_fp32
(
self
):
self
.
check_with_place
(
"collective_allgather_api.py"
,
"allgather"
,
"float32"
)
def
test_allgather_cncl_int32
(
self
):
self
.
check_with_place
(
"collective_allgather_api.py"
,
"allgather"
,
"int32"
)
if
__name__
==
'__main__'
:
unittest
.
main
()
python/paddle/fluid/tests/unittests/mlu/test_collective_api_base_mlu.py
浏览文件 @
dc773828
...
@@ -219,5 +219,11 @@ class TestDistBase(unittest.TestCase):
...
@@ -219,5 +219,11 @@ class TestDistBase(unittest.TestCase):
self
.
assertTrue
(
self
.
assertTrue
(
np
.
allclose
(
np
.
allclose
(
tr1_out
,
need_result
,
rtol
=
1e-05
,
atol
=
1e-05
))
tr1_out
,
need_result
,
rtol
=
1e-05
,
atol
=
1e-05
))
elif
col_type
==
"allgather"
:
need_result
=
np
.
vstack
((
input1
,
input2
))
tr_out0
=
np
.
vstack
((
tr0_out
[
0
],
tr0_out
[
1
]))
tr_out1
=
np
.
vstack
((
tr1_out
[
0
],
tr1_out
[
1
]))
self
.
assertTrue
(
np
.
allclose
(
tr_out0
,
need_result
))
self
.
assertTrue
(
np
.
allclose
(
tr_out1
,
need_result
))
else
:
else
:
pass
pass
python/paddle/fluid/tests/unittests/mlu/test_collective_base_mlu.py
浏览文件 @
dc773828
...
@@ -270,5 +270,9 @@ class TestDistBase(unittest.TestCase):
...
@@ -270,5 +270,9 @@ class TestDistBase(unittest.TestCase):
self
.
assertTrue
(
self
.
assertTrue
(
np
.
allclose
(
np
.
allclose
(
tr1_out
,
need_result
,
rtol
=
1e-05
,
atol
=
1e-05
))
tr1_out
,
need_result
,
rtol
=
1e-05
,
atol
=
1e-05
))
elif
col_type
==
"allgather"
:
need_result
=
np
.
vstack
((
input1
,
input2
))
self
.
assertTrue
(
np
.
allclose
(
tr0_out
,
need_result
))
self
.
assertTrue
(
np
.
allclose
(
tr1_out
,
need_result
))
else
:
else
:
pass
pass
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录