Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
2194ad15
P
Paddle
项目概览
Crayon鑫
/
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看板
未验证
提交
2194ad15
编写于
4月 21, 2021
作者:
L
liuyuhui
提交者:
GitHub
4月 21, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Kunlun]add collective ops for multi XPU cards training and add Kunlun multi XPU cards CI (#32302)
上级
9ff85561
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
426 addition
and
21 deletion
+426
-21
paddle/fluid/operators/collective/c_allreduce_max_op_xpu.cc
paddle/fluid/operators/collective/c_allreduce_max_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_allreduce_min_op_xpu.cc
paddle/fluid/operators/collective/c_allreduce_min_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_allreduce_op.h
paddle/fluid/operators/collective/c_allreduce_op.h
+71
-1
paddle/fluid/operators/collective/c_allreduce_prod_op_xpu.cc
paddle/fluid/operators/collective/c_allreduce_prod_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_allreduce_sum_op_xpu.cc
paddle/fluid/operators/collective/c_allreduce_sum_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_reduce_max_op_xpu.cc
paddle/fluid/operators/collective/c_reduce_max_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_reduce_min_op_xpu.cc
paddle/fluid/operators/collective/c_reduce_min_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_reduce_op.h
paddle/fluid/operators/collective/c_reduce_op.h
+73
-1
paddle/fluid/operators/collective/c_reduce_prod_op_xpu.cc
paddle/fluid/operators/collective/c_reduce_prod_op_xpu.cc
+28
-0
paddle/fluid/operators/collective/c_reduce_sum_op_xpu.cc
paddle/fluid/operators/collective/c_reduce_sum_op_xpu.cc
+28
-0
python/paddle/fluid/tests/unittests/CMakeLists.txt
python/paddle/fluid/tests/unittests/CMakeLists.txt
+6
-0
python/paddle/fluid/tests/unittests/test_collective_allreduce_api.py
...le/fluid/tests/unittests/test_collective_allreduce_api.py
+8
-2
python/paddle/fluid/tests/unittests/test_collective_api_base.py
.../paddle/fluid/tests/unittests/test_collective_api_base.py
+38
-16
python/paddle/fluid/tests/unittests/test_collective_reduce_api.py
...addle/fluid/tests/unittests/test_collective_reduce_api.py
+6
-1
未找到文件。
paddle/fluid/operators/collective/c_allreduce_max_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_allreduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_allreduce_max
,
ops
::
CAllReduceOpXPUKernel
<
ops
::
kRedMax
,
float
>
)
paddle/fluid/operators/collective/c_allreduce_min_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_allreduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_allreduce_min
,
ops
::
CAllReduceOpXPUKernel
<
ops
::
kRedMin
,
float
>
)
paddle/fluid/operators/collective/c_allreduce_op.h
浏览文件 @
2194ad15
...
@@ -20,11 +20,19 @@ limitations under the License. */
...
@@ -20,11 +20,19 @@ limitations under the License. */
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_registry.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) || \
defined(PADDLE_WITH_XPU_BKCL)
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#endif
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/platform/nccl_helper.h"
#include "paddle/fluid/platform/nccl_helper.h"
#endif
#endif
#if defined(PADDLE_WITH_XPU_BKCL)
#include "paddle/fluid/platform/bkcl_helper.h"
#endif
#if defined(PADDLE_WITH_GLOO)
#if defined(PADDLE_WITH_GLOO)
#include <gloo/allreduce.h>
#include <gloo/allreduce.h>
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
...
@@ -105,6 +113,68 @@ class CAllReduceOpCPUKernel : public framework::OpKernel<T> {
...
@@ -105,6 +113,68 @@ class CAllReduceOpCPUKernel : public framework::OpKernel<T> {
}
}
};
};
template
<
ReduceType
red_type
,
typename
T
>
class
CAllReduceOpXPUKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
#if defined(PADDLE_WITH_XPU_BKCL)
auto
in
=
ctx
.
Input
<
framework
::
Tensor
>
(
"X"
);
auto
out
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
place
=
ctx
.
GetPlace
();
BKCLDataType
dtype
=
platform
::
ToBKCLDataType
(
in
->
type
());
int64_t
numel
=
in
->
numel
();
const
void
*
sendbuff
=
in
->
data
<
void
>
();
out
->
Resize
(
in
->
dims
());
void
*
recvbuff
=
out
->
mutable_data
<
T
>
(
place
);
int
rid
=
ctx
.
Attr
<
int
>
(
"ring_id"
);
auto
comm
=
platform
::
BKCLCommContext
::
Instance
().
Get
(
rid
,
place
);
XPUStream
stream
=
nullptr
;
if
(
ctx
.
Attr
<
bool
>
(
"use_calc_stream"
))
{
auto
dev_ctx
=
platform
::
DeviceContextPool
::
Instance
().
Get
(
place
);
stream
=
static_cast
<
platform
::
XPUDeviceContext
*>
(
dev_ctx
)
->
x_context
()
->
xpu_stream
;
}
else
{
stream
=
comm
->
stream
();
}
BKCLOp
bkcl_red_type
=
BKCL_ADD
;
switch
(
red_type
)
{
case
kRedSum
:
bkcl_red_type
=
BKCL_ADD
;
break
;
case
kRedMax
:
bkcl_red_type
=
BKCL_MAX
;
break
;
case
kRedMin
:
bkcl_red_type
=
BKCL_MIN
;
break
;
case
kRedProd
:
bkcl_red_type
=
BKCL_PRODUCT
;
break
;
default:
PADDLE_THROW
(
platform
::
errors
::
InvalidArgument
(
"Invalid reduce type: %d"
,
red_type
));
}
PADDLE_ENFORCE_EQ
(
bkcl_all_reduce
(
comm
->
comm
(),
sendbuff
,
recvbuff
,
numel
,
dtype
,
bkcl_red_type
,
stream
),
BKCL_SUCCESS
,
platform
::
errors
::
PreconditionNotMet
(
"BKCL all reduce failed"
));
#else
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"PaddlePaddle should be compiled with XPU."
));
#endif
}
};
template
<
ReduceType
red_type
,
typename
T
>
template
<
ReduceType
red_type
,
typename
T
>
class
CAllReduceOpCUDAKernel
:
public
framework
::
OpKernel
<
T
>
{
class
CAllReduceOpCUDAKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
public:
...
...
paddle/fluid/operators/collective/c_allreduce_prod_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_allreduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_allreduce_prod
,
ops
::
CAllReduceOpXPUKernel
<
ops
::
kRedProd
,
float
>
)
paddle/fluid/operators/collective/c_allreduce_sum_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_allreduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_allreduce_sum
,
ops
::
CAllReduceOpXPUKernel
<
ops
::
kRedSum
,
float
>
)
paddle/fluid/operators/collective/c_reduce_max_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_reduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_reduce_max
,
ops
::
CReduceOpXPUKernel
<
ops
::
kRedMax
,
float
>
)
paddle/fluid/operators/collective/c_reduce_min_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_reduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_reduce_min
,
ops
::
CReduceOpXPUKernel
<
ops
::
kRedMin
,
float
>
)
paddle/fluid/operators/collective/c_reduce_op.h
浏览文件 @
2194ad15
...
@@ -24,10 +24,19 @@ limitations under the License. */
...
@@ -24,10 +24,19 @@ limitations under the License. */
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_registry.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) || \
defined(PADDLE_WITH_XPU_BKCL)
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#endif
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/platform/nccl_helper.h"
#include "paddle/fluid/platform/nccl_helper.h"
#endif
#endif
#if defined(PADDLE_WITH_XPU_BKCL)
#include "paddle/fluid/platform/bkcl_helper.h"
#endif
#if defined(PADDLE_WITH_GLOO)
#if defined(PADDLE_WITH_GLOO)
#include <gloo/reduce.h>
#include <gloo/reduce.h>
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
...
@@ -110,6 +119,69 @@ class CReduceOpCPUKernel : public framework::OpKernel<T> {
...
@@ -110,6 +119,69 @@ class CReduceOpCPUKernel : public framework::OpKernel<T> {
}
}
};
};
template
<
ReduceType
red_type
,
typename
T
>
class
CReduceOpXPUKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
#if defined(PADDLE_WITH_XPU_BKCL)
auto
in
=
ctx
.
Input
<
framework
::
Tensor
>
(
"X"
);
auto
out
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
place
=
ctx
.
GetPlace
();
BKCLDataType
dtype
=
platform
::
ToBKCLDataType
(
in
->
type
());
int64_t
numel
=
in
->
numel
();
const
void
*
sendbuff
=
in
->
data
<
void
>
();
out
->
Resize
(
in
->
dims
());
void
*
recvbuff
=
out
->
mutable_data
<
T
>
(
place
);
int
rid
=
ctx
.
Attr
<
int
>
(
"ring_id"
);
int
root
=
ctx
.
Attr
<
int
>
(
"root_id"
);
auto
comm
=
platform
::
BKCLCommContext
::
Instance
().
Get
(
rid
,
place
);
XPUStream
stream
=
nullptr
;
if
(
ctx
.
Attr
<
bool
>
(
"use_calc_stream"
))
{
auto
dev_ctx
=
platform
::
DeviceContextPool
::
Instance
().
Get
(
place
);
stream
=
static_cast
<
platform
::
XPUDeviceContext
*>
(
dev_ctx
)
->
x_context
()
->
xpu_stream
;
}
else
{
stream
=
comm
->
stream
();
}
BKCLOp
bkcl_red_type
=
BKCL_ADD
;
switch
(
red_type
)
{
case
kRedSum
:
bkcl_red_type
=
BKCL_ADD
;
break
;
case
kRedMax
:
bkcl_red_type
=
BKCL_MAX
;
break
;
case
kRedMin
:
bkcl_red_type
=
BKCL_MIN
;
break
;
case
kRedProd
:
bkcl_red_type
=
BKCL_PRODUCT
;
break
;
default:
PADDLE_THROW
(
platform
::
errors
::
InvalidArgument
(
"Invalid reduce type: %d"
,
red_type
));
}
PADDLE_ENFORCE_EQ
(
bkcl_reduce
(
comm
->
comm
(),
sendbuff
,
recvbuff
,
numel
,
dtype
,
bkcl_red_type
,
root
,
stream
),
BKCL_SUCCESS
,
platform
::
errors
::
PreconditionNotMet
(
"BKCL all reduce failed"
));
#else
PADDLE_THROW
(
platform
::
errors
::
PreconditionNotMet
(
"PaddlePaddle should be compiled with XPU."
));
#endif
}
};
template
<
ReduceType
red_type
,
typename
T
>
template
<
ReduceType
red_type
,
typename
T
>
class
CReduceOpCUDAKernel
:
public
framework
::
OpKernel
<
T
>
{
class
CReduceOpCUDAKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
public:
...
...
paddle/fluid/operators/collective/c_reduce_prod_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_reduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_reduce_prod
,
ops
::
CReduceOpXPUKernel
<
ops
::
kRedProd
,
float
>
)
paddle/fluid/operators/collective/c_reduce_sum_op_xpu.cc
0 → 100644
浏览文件 @
2194ad15
/* Copyright (c) 2019 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_reduce_op.h"
namespace
paddle
{
namespace
platform
{
struct
XPUPlace
;
struct
float16
;
}
// namespace platform
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
plat
=
paddle
::
platform
;
REGISTER_OP_XPU_KERNEL
(
c_reduce_sum
,
ops
::
CReduceOpXPUKernel
<
ops
::
kRedSum
,
float
>
)
python/paddle/fluid/tests/unittests/CMakeLists.txt
浏览文件 @
2194ad15
...
@@ -627,6 +627,12 @@ if (WITH_XPU)
...
@@ -627,6 +627,12 @@ if (WITH_XPU)
add_subdirectory
(
xpu
)
add_subdirectory
(
xpu
)
endif
()
endif
()
# dist xpu tests:
if
(
WITH_XPU_BKCL
)
py_test
(
test_collective_reduce_api_xpu SRCS
"test_collective_reduce_api.py"
)
py_test
(
test_collective_allreduce_api_xpu SRCS
"test_collective_allreduce_api.py"
)
endif
()
if
(
WITH_ASCEND_CL
)
if
(
WITH_ASCEND_CL
)
add_subdirectory
(
npu
)
add_subdirectory
(
npu
)
endif
()
endif
()
...
...
python/paddle/fluid/tests/unittests/test_collective_allreduce_api.py
浏览文件 @
2194ad15
...
@@ -27,8 +27,14 @@ class TestCollectiveAllreduceAPI(TestDistBase):
...
@@ -27,8 +27,14 @@ class TestCollectiveAllreduceAPI(TestDistBase):
pass
pass
def
test_allreduce_nccl
(
self
):
def
test_allreduce_nccl
(
self
):
self
.
check_with_place
(
"collective_allreduce_api.py"
,
"allreduce"
,
if
paddle
.
fluid
.
core
.
is_compiled_with_cuda
():
"nccl"
)
self
.
check_with_place
(
"collective_allreduce_api.py"
,
"allreduce"
,
"nccl"
)
def
test_allreduce_bkcl
(
self
):
if
paddle
.
fluid
.
core
.
is_compiled_with_xpu
():
self
.
check_with_place
(
"collective_allreduce_api.py"
,
"allreduce"
,
"bkcl"
)
def
test_allreduce_gloo
(
self
):
def
test_allreduce_gloo
(
self
):
self
.
check_with_place
(
"collective_allreduce_api.py"
,
"allreduce"
,
self
.
check_with_place
(
"collective_allreduce_api.py"
,
"allreduce"
,
...
...
python/paddle/fluid/tests/unittests/test_collective_api_base.py
浏览文件 @
2194ad15
...
@@ -50,6 +50,9 @@ class TestCollectiveAPIRunnerBase(object):
...
@@ -50,6 +50,9 @@ class TestCollectiveAPIRunnerBase(object):
device_id
=
int
(
os
.
getenv
(
"FLAGS_selected_gpus"
,
"0"
))
device_id
=
int
(
os
.
getenv
(
"FLAGS_selected_gpus"
,
"0"
))
place
=
fluid
.
CUDAPlace
(
place
=
fluid
.
CUDAPlace
(
device_id
)
#if args.use_gpu else fluid.CPUPlace()
device_id
)
#if args.use_gpu else fluid.CPUPlace()
elif
args
[
'backend'
]
==
'bkcl'
:
device_id
=
int
(
os
.
getenv
(
"FLAGS_selected_xpus"
,
"0"
))
place
=
fluid
.
XPUPlace
(
device_id
)
else
:
else
:
place
=
fluid
.
CPUPlace
()
place
=
fluid
.
CPUPlace
()
exe
=
fluid
.
Executor
(
place
)
exe
=
fluid
.
Executor
(
place
)
...
@@ -71,7 +74,6 @@ class TestCollectiveAPIRunnerBase(object):
...
@@ -71,7 +74,6 @@ class TestCollectiveAPIRunnerBase(object):
def
runtime_main
(
test_class
,
col_type
):
def
runtime_main
(
test_class
,
col_type
):
args
=
{}
args
=
{}
model
=
test_class
()
model
=
test_class
()
args
[
"deviceid"
]
=
os
.
getenv
(
"FLAGS_selected_gpus"
)
args
[
"trainerid"
]
=
int
(
os
.
getenv
(
"PADDLE_TRAINER_ID"
))
args
[
"trainerid"
]
=
int
(
os
.
getenv
(
"PADDLE_TRAINER_ID"
))
args
[
"trainernum"
]
=
int
(
os
.
getenv
(
"PADDLE_TRAINERS_NUM"
))
args
[
"trainernum"
]
=
int
(
os
.
getenv
(
"PADDLE_TRAINERS_NUM"
))
args
[
"endpoints"
]
=
os
.
getenv
(
'PADDLE_TRAINER_ENDPOINTS'
)
args
[
"endpoints"
]
=
os
.
getenv
(
'PADDLE_TRAINER_ENDPOINTS'
)
...
@@ -112,21 +114,38 @@ class TestDistBase(unittest.TestCase):
...
@@ -112,21 +114,38 @@ class TestDistBase(unittest.TestCase):
worker_endpoints
=
self
.
_ps_endpoints
.
split
(
","
)
worker_endpoints
=
self
.
_ps_endpoints
.
split
(
","
)
w0_ep
,
w1_ep
=
worker_endpoints
w0_ep
,
w1_ep
=
worker_endpoints
#print("w0_ep:",w0_ep," w1_ep:",w1_ep)
#print("w0_ep:",w0_ep," w1_ep:",w1_ep)
env0
=
{
if
core
.
is_compiled_with_cuda
():
"FLAGS_selected_gpus"
:
"0"
,
env0
=
{
"PADDLE_TRAINER_ID"
:
"0"
,
"FLAGS_selected_gpus"
:
"0"
,
"PADDLE_TRAINERS_NUM"
:
"2"
,
"PADDLE_TRAINER_ID"
:
"0"
,
"PADDLE_TRAINER_ENDPOINTS"
:
self
.
_ps_endpoints
,
"PADDLE_TRAINERS_NUM"
:
"2"
,
"PADDLE_CURRENT_ENDPOINT"
:
w0_ep
"PADDLE_TRAINER_ENDPOINTS"
:
self
.
_ps_endpoints
,
}
"PADDLE_CURRENT_ENDPOINT"
:
w0_ep
}
env1
=
{
env1
=
{
"FLAGS_selected_gpus"
:
"1"
,
"FLAGS_selected_gpus"
:
"1"
,
"PADDLE_TRAINER_ID"
:
"1"
,
"PADDLE_TRAINER_ID"
:
"1"
,
"PADDLE_TRAINERS_NUM"
:
"2"
,
"PADDLE_TRAINERS_NUM"
:
"2"
,
"PADDLE_TRAINER_ENDPOINTS"
:
self
.
_ps_endpoints
,
"PADDLE_TRAINER_ENDPOINTS"
:
self
.
_ps_endpoints
,
"PADDLE_CURRENT_ENDPOINT"
:
w1_ep
"PADDLE_CURRENT_ENDPOINT"
:
w1_ep
}
}
elif
core
.
is_compiled_with_xpu
():
env0
=
{
"FLAGS_selected_xpus"
:
"0"
,
"PADDLE_TRAINER_ID"
:
"0"
,
"PADDLE_TRAINERS_NUM"
:
"2"
,
"PADDLE_TRAINER_ENDPOINTS"
:
self
.
_ps_endpoints
,
"PADDLE_CURRENT_ENDPOINT"
:
w0_ep
}
env1
=
{
"FLAGS_selected_xpus"
:
"1"
,
"PADDLE_TRAINER_ID"
:
"1"
,
"PADDLE_TRAINERS_NUM"
:
"2"
,
"PADDLE_TRAINER_ENDPOINTS"
:
self
.
_ps_endpoints
,
"PADDLE_CURRENT_ENDPOINT"
:
w1_ep
}
#update environment
#update environment
env0
.
update
(
envs
)
env0
.
update
(
envs
)
env1
.
update
(
envs
)
env1
.
update
(
envs
)
...
@@ -169,7 +188,10 @@ class TestDistBase(unittest.TestCase):
...
@@ -169,7 +188,10 @@ class TestDistBase(unittest.TestCase):
path_id
=
"0"
,
path_id
=
"0"
,
check_error_log
=
False
,
check_error_log
=
False
,
need_envs
=
{}):
need_envs
=
{}):
with_gloo
=
'0'
if
backend
==
"nccl"
else
'1'
if
backend
==
"nccl"
or
backend
==
"bkcl"
:
with_gloo
=
'0'
else
:
with_gloo
=
'1'
required_envs
=
{
required_envs
=
{
"FLAGS_fraction_of_gpu_memory_to_use"
:
"0.15"
,
"FLAGS_fraction_of_gpu_memory_to_use"
:
"0.15"
,
"FLAGS_eager_delete_tensor_gb"
:
"0.0"
,
"FLAGS_eager_delete_tensor_gb"
:
"0.0"
,
...
...
python/paddle/fluid/tests/unittests/test_collective_reduce_api.py
浏览文件 @
2194ad15
...
@@ -27,7 +27,12 @@ class TestCollectiveReduceAPI(TestDistBase):
...
@@ -27,7 +27,12 @@ class TestCollectiveReduceAPI(TestDistBase):
pass
pass
def
test_reduce_nccl
(
self
):
def
test_reduce_nccl
(
self
):
self
.
check_with_place
(
"collective_reduce_api.py"
,
"reduce"
,
"nccl"
)
if
paddle
.
fluid
.
core
.
is_compiled_with_cuda
():
self
.
check_with_place
(
"collective_reduce_api.py"
,
"reduce"
,
"nccl"
)
def
test_reduce_bkcl
(
self
):
if
paddle
.
fluid
.
core
.
is_compiled_with_xpu
():
self
.
check_with_place
(
"collective_reduce_api.py"
,
"reduce"
,
"bkcl"
)
def
test_reduce_gloo
(
self
):
def
test_reduce_gloo
(
self
):
self
.
check_with_place
(
"collective_reduce_api.py"
,
"reduce"
,
"gloo"
,
"1"
)
self
.
check_with_place
(
"collective_reduce_api.py"
,
"reduce"
,
"gloo"
,
"1"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录