Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
22e416cf
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
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看板
未验证
提交
22e416cf
编写于
12月 19, 2022
作者:
W
Wen Sun
提交者:
GitHub
12月 19, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: rename process group (#49137)
上级
ffc39605
变更
40
隐藏空白更改
内联
并排
Showing
40 changed file
with
51 addition
and
51 deletion
+51
-51
paddle/fluid/distributed/collective/CMakeLists.txt
paddle/fluid/distributed/collective/CMakeLists.txt
+3
-3
paddle/fluid/distributed/collective/bkcl_tools.cc
paddle/fluid/distributed/collective/bkcl_tools.cc
+2
-2
paddle/fluid/distributed/collective/bkcl_tools.h
paddle/fluid/distributed/collective/bkcl_tools.h
+1
-1
paddle/fluid/distributed/collective/custom_ccl_tools.cc
paddle/fluid/distributed/collective/custom_ccl_tools.cc
+2
-2
paddle/fluid/distributed/collective/custom_ccl_tools.h
paddle/fluid/distributed/collective/custom_ccl_tools.h
+1
-1
paddle/fluid/distributed/collective/mpi_tools.cc
paddle/fluid/distributed/collective/mpi_tools.cc
+1
-1
paddle/fluid/distributed/collective/mpi_tools.h
paddle/fluid/distributed/collective/mpi_tools.h
+1
-1
paddle/fluid/distributed/collective/nccl_tools.h
paddle/fluid/distributed/collective/nccl_tools.h
+1
-1
paddle/fluid/distributed/collective/process_group.cc
paddle/fluid/distributed/collective/process_group.cc
+1
-1
paddle/fluid/distributed/collective/process_group.h
paddle/fluid/distributed/collective/process_group.h
+1
-1
paddle/fluid/distributed/collective/process_group_bkcl.cc
paddle/fluid/distributed/collective/process_group_bkcl.cc
+2
-2
paddle/fluid/distributed/collective/process_group_bkcl.h
paddle/fluid/distributed/collective/process_group_bkcl.h
+1
-1
paddle/fluid/distributed/collective/process_group_custom.cc
paddle/fluid/distributed/collective/process_group_custom.cc
+2
-2
paddle/fluid/distributed/collective/process_group_custom.h
paddle/fluid/distributed/collective/process_group_custom.h
+2
-2
paddle/fluid/distributed/collective/process_group_gloo.h
paddle/fluid/distributed/collective/process_group_gloo.h
+1
-1
paddle/fluid/distributed/collective/process_group_mpi.h
paddle/fluid/distributed/collective/process_group_mpi.h
+2
-2
paddle/fluid/distributed/collective/process_group_stream.h
paddle/fluid/distributed/collective/process_group_stream.h
+1
-1
paddle/fluid/distributed/collective/reducer.h
paddle/fluid/distributed/collective/reducer.h
+1
-1
paddle/fluid/distributed/collective/types.h
paddle/fluid/distributed/collective/types.h
+0
-0
paddle/fluid/operators/collective/c_allgather_op.cu.cc
paddle/fluid/operators/collective/c_allgather_op.cu.cc
+1
-1
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.cu.cc
paddle/fluid/operators/collective/c_broadcast_op.cu.cc
+1
-1
paddle/fluid/operators/collective/c_concat_op.cu.cc
paddle/fluid/operators/collective/c_concat_op.cu.cc
+1
-1
paddle/fluid/operators/collective/c_softmax_with_cross_entropy_op.h
...id/operators/collective/c_softmax_with_cross_entropy_op.h
+1
-1
paddle/fluid/operators/collective/global_gather_op.h
paddle/fluid/operators/collective/global_gather_op.h
+1
-1
paddle/fluid/operators/collective/global_scatter_op.h
paddle/fluid/operators/collective/global_scatter_op.h
+1
-1
paddle/fluid/operators/collective/partial_allgather_op.cu.cc
paddle/fluid/operators/collective/partial_allgather_op.cu.cc
+1
-1
paddle/fluid/operators/collective/partial_recv_op.cu.cc
paddle/fluid/operators/collective/partial_recv_op.cu.cc
+1
-1
paddle/fluid/operators/collective/partial_send_op.cu.cc
paddle/fluid/operators/collective/partial_send_op.cu.cc
+1
-1
paddle/fluid/operators/collective/recv_v2_op.cu.cc
paddle/fluid/operators/collective/recv_v2_op.cu.cc
+1
-1
paddle/fluid/operators/collective/recv_v2_op_npu.cc
paddle/fluid/operators/collective/recv_v2_op_npu.cc
+1
-1
paddle/fluid/operators/collective/send_v2_op.cu.cc
paddle/fluid/operators/collective/send_v2_op.cu.cc
+1
-1
paddle/fluid/operators/collective/send_v2_op_npu.cc
paddle/fluid/operators/collective/send_v2_op_npu.cc
+1
-1
paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h
paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h
+1
-1
paddle/fluid/pybind/distributed_py.cc
paddle/fluid/pybind/distributed_py.cc
+4
-4
paddle/phi/backends/processgroup_comm_utils.cc
paddle/phi/backends/processgroup_comm_utils.cc
+2
-2
paddle/phi/kernels/gpu/class_center_sample_kernel.cu
paddle/phi/kernels/gpu/class_center_sample_kernel.cu
+1
-1
paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu
paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu
+1
-1
paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu
paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu
+1
-1
paddle/phi/kernels/gpu/sync_batch_norm_utils.h
paddle/phi/kernels/gpu/sync_batch_norm_utils.h
+1
-1
未找到文件。
paddle/fluid/distributed/collective/CMakeLists.txt
浏览文件 @
22e416cf
cc_library
(
cc_library
(
process_group
process_group
SRCS
ProcessG
roup.cc
SRCS
process_g
roup.cc
DEPS dense_tensor
)
DEPS dense_tensor
)
cc_library
(
cc_library
(
process_group_stream
process_group_stream
...
@@ -35,7 +35,7 @@ endif()
...
@@ -35,7 +35,7 @@ endif()
if
(
WITH_XPU_BKCL
)
if
(
WITH_XPU_BKCL
)
cc_library
(
cc_library
(
process_group_bkcl
process_group_bkcl
SRCS
ProcessGroupBKCL.cc BKCLT
ools.cc common.cc
SRCS
process_group_bkcl.cc bkcl_t
ools.cc common.cc
DEPS process_group place enforce collective_helper device_context
DEPS process_group place enforce collective_helper device_context
dense_tensor
)
dense_tensor
)
endif
()
endif
()
...
@@ -50,7 +50,7 @@ endif()
...
@@ -50,7 +50,7 @@ endif()
if
(
WITH_CUSTOM_DEVICE
)
if
(
WITH_CUSTOM_DEVICE
)
cc_library
(
cc_library
(
process_group_custom
process_group_custom
SRCS
ProcessGroupCustom.cc CustomCCLT
ools.cc common.cc
SRCS
process_group_custom.cc custom_ccl_t
ools.cc common.cc
DEPS process_group phi_backends place enforce collective_helper
DEPS process_group phi_backends place enforce collective_helper
device_context
)
device_context
)
endif
()
endif
()
paddle/fluid/distributed/collective/
BKCLT
ools.cc
→
paddle/fluid/distributed/collective/
bkcl_t
ools.cc
浏览文件 @
22e416cf
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/
BKCLT
ools.h"
#include "paddle/fluid/distributed/collective/
bkcl_t
ools.h"
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
namespace
paddle
{
namespace
paddle
{
namespace
distributed
{
namespace
distributed
{
...
...
paddle/fluid/distributed/collective/
BKCLT
ools.h
→
paddle/fluid/distributed/collective/
bkcl_t
ools.h
浏览文件 @
22e416cf
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#pragma once
#pragma once
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/phi/backends/xpu/enforce_xpu.h"
#include "paddle/phi/backends/xpu/enforce_xpu.h"
#include "paddle/phi/backends/xpu/xpu_context.h"
#include "paddle/phi/backends/xpu/xpu_context.h"
...
...
paddle/fluid/distributed/collective/
CustomCCLT
ools.cc
→
paddle/fluid/distributed/collective/
custom_ccl_t
ools.cc
浏览文件 @
22e416cf
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/
CustomCCLT
ools.h"
#include "paddle/fluid/distributed/collective/
custom_ccl_t
ools.h"
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
namespace
paddle
{
namespace
paddle
{
namespace
distributed
{
namespace
distributed
{
...
...
paddle/fluid/distributed/collective/
CustomCCLT
ools.h
→
paddle/fluid/distributed/collective/
custom_ccl_t
ools.h
浏览文件 @
22e416cf
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <error.h>
#include <error.h>
#include <string>
#include <string>
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/variable.h"
#include "paddle/fluid/framework/variable.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
...
...
paddle/fluid/distributed/collective/mpi_tools.cc
浏览文件 @
22e416cf
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/mpi_tools.h"
#include "paddle/fluid/distributed/collective/mpi_tools.h"
#include "paddle/fluid/distributed/collective/Types.h"
#include "paddle/fluid/distributed/collective/common.h"
#include "paddle/fluid/distributed/collective/common.h"
#include "paddle/fluid/distributed/collective/types.h"
namespace
paddle
{
namespace
paddle
{
namespace
distributed
{
namespace
distributed
{
...
...
paddle/fluid/distributed/collective/mpi_tools.h
浏览文件 @
22e416cf
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#include "paddle/fluid/framework/variable.h"
#include "paddle/fluid/framework/variable.h"
#include "paddle/fluid/platform/enforce.h"
#include "paddle/fluid/platform/enforce.h"
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
#ifdef HOST
#ifdef HOST
#undef HOST
#undef HOST
...
...
paddle/fluid/distributed/collective/nccl_tools.h
浏览文件 @
22e416cf
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
#include <string>
#include <string>
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
#ifdef PADDLE_WITH_RCCL
#ifdef PADDLE_WITH_RCCL
#include "paddle/phi/backends/dynload/rccl.h"
#include "paddle/phi/backends/dynload/rccl.h"
...
...
paddle/fluid/distributed/collective/
ProcessG
roup.cc
→
paddle/fluid/distributed/collective/
process_g
roup.cc
浏览文件 @
22e416cf
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
namespace
paddle
{
namespace
paddle
{
namespace
distributed
{
namespace
distributed
{
...
...
paddle/fluid/distributed/collective/
ProcessG
roup.h
→
paddle/fluid/distributed/collective/
process_g
roup.h
浏览文件 @
22e416cf
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
#include <string>
#include <string>
#include <vector>
#include <vector>
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
#include "paddle/fluid/eager/api/utils/tensor_utils.h"
#include "paddle/fluid/eager/api/utils/tensor_utils.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/framework/variable.h"
#include "paddle/fluid/framework/variable.h"
...
...
paddle/fluid/distributed/collective/
ProcessGroupBKCL
.cc
→
paddle/fluid/distributed/collective/
process_group_bkcl
.cc
浏览文件 @
22e416cf
...
@@ -12,9 +12,9 @@
...
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/
ProcessGroupBKCL
.h"
#include "paddle/fluid/distributed/collective/
process_group_bkcl
.h"
#include "paddle/fluid/distributed/collective/
BKCLT
ools.h"
#include "paddle/fluid/distributed/collective/
bkcl_t
ools.h"
#include "paddle/fluid/distributed/collective/common.h"
#include "paddle/fluid/distributed/collective/common.h"
#include "paddle/fluid/platform/device/xpu/bkcl_helper.h"
#include "paddle/fluid/platform/device/xpu/bkcl_helper.h"
#include "paddle/fluid/platform/device/xpu/xpu_info.h"
#include "paddle/fluid/platform/device/xpu/xpu_info.h"
...
...
paddle/fluid/distributed/collective/
ProcessGroupBKCL
.h
→
paddle/fluid/distributed/collective/
process_group_bkcl
.h
浏览文件 @
22e416cf
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
#include "paddle/phi/core/device_context.h"
#include "paddle/phi/core/device_context.h"
#if defined(PADDLE_WITH_XPU)
#if defined(PADDLE_WITH_XPU)
#include "paddle/fluid/distributed/collective/
BKCLT
ools.h"
#include "paddle/fluid/distributed/collective/
bkcl_t
ools.h"
#endif
#endif
constexpr
const
char
*
BKCL_BACKEND_NAME
=
"BKCL"
;
constexpr
const
char
*
BKCL_BACKEND_NAME
=
"BKCL"
;
...
...
paddle/fluid/distributed/collective/
ProcessGroupC
ustom.cc
→
paddle/fluid/distributed/collective/
process_group_c
ustom.cc
浏览文件 @
22e416cf
...
@@ -12,10 +12,10 @@
...
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/
ProcessGroupC
ustom.h"
#include "paddle/fluid/distributed/collective/
process_group_c
ustom.h"
#include "paddle/fluid/distributed/collective/CustomCCLTools.h"
#include "paddle/fluid/distributed/collective/common.h"
#include "paddle/fluid/distributed/collective/common.h"
#include "paddle/fluid/distributed/collective/custom_ccl_tools.h"
#include "paddle/fluid/memory/malloc.h"
#include "paddle/fluid/memory/malloc.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/fluid/platform/place.h"
#include "paddle/fluid/platform/place.h"
...
...
paddle/fluid/distributed/collective/
ProcessGroupC
ustom.h
→
paddle/fluid/distributed/collective/
process_group_c
ustom.h
浏览文件 @
22e416cf
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
#include <unordered_map>
#include <unordered_map>
#include <vector>
#include <vector>
#include "paddle/fluid/distributed/collective/
CustomCCLT
ools.h"
#include "paddle/fluid/distributed/collective/
custom_ccl_t
ools.h"
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/distributed/store/store.h"
#include "paddle/fluid/distributed/store/store.h"
#include "paddle/fluid/platform/device/npu/npu_stream.h"
#include "paddle/fluid/platform/device/npu/npu_stream.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/fluid/platform/device_context.h"
...
...
paddle/fluid/distributed/collective/process_group_gloo.h
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#include <memory>
#include <memory>
#include <mutex>
#include <mutex>
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#ifdef PADDLE_WITH_GLOO
#ifdef PADDLE_WITH_GLOO
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
#include "paddle/fluid/framework/fleet/gloo_wrapper.h"
...
...
paddle/fluid/distributed/collective/process_group_mpi.h
浏览文件 @
22e416cf
...
@@ -25,8 +25,8 @@
...
@@ -25,8 +25,8 @@
#include <exception>
#include <exception>
#include <mutex>
#include <mutex>
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/distributed/collective/
T
ypes.h"
#include "paddle/fluid/distributed/collective/
t
ypes.h"
#include "paddle/fluid/platform/device_context.h"
#include "paddle/fluid/platform/device_context.h"
#if defined(PADDLE_WITH_MPI)
#if defined(PADDLE_WITH_MPI)
...
...
paddle/fluid/distributed/collective/process_group_stream.h
浏览文件 @
22e416cf
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#pragma once
#pragma once
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
namespace
paddle
{
namespace
paddle
{
namespace
distributed
{
namespace
distributed
{
...
...
paddle/fluid/distributed/collective/reducer.h
浏览文件 @
22e416cf
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include <map>
#include <map>
#include <vector>
#include <vector>
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/eager/accumulation/accumulation_node.h"
#include "paddle/fluid/eager/accumulation/accumulation_node.h"
#include "paddle/fluid/eager/api/utils/hook_utils.h"
#include "paddle/fluid/eager/api/utils/hook_utils.h"
#include "paddle/fluid/eager/api/utils/tensor_utils.h"
#include "paddle/fluid/eager/api/utils/tensor_utils.h"
...
...
paddle/fluid/distributed/collective/
T
ypes.h
→
paddle/fluid/distributed/collective/
t
ypes.h
浏览文件 @
22e416cf
文件已移动
paddle/fluid/operators/collective/c_allgather_op.cu.cc
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@ limitations under the License. */
...
@@ -18,7 +18,7 @@ limitations under the License. */
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/framework/convert_utils.h"
#include "paddle/fluid/framework/convert_utils.h"
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
...
...
paddle/fluid/operators/collective/c_allreduce_op.h
浏览文件 @
22e416cf
...
@@ -16,7 +16,7 @@ limitations under the License. */
...
@@ -16,7 +16,7 @@ limitations under the License. */
#include <string>
#include <string>
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/data_type.h"
#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"
...
...
paddle/fluid/operators/collective/c_broadcast_op.cu.cc
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@ limitations under the License. */
...
@@ -18,7 +18,7 @@ limitations under the License. */
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
namespace
paddle
{
namespace
paddle
{
...
...
paddle/fluid/operators/collective/c_concat_op.cu.cc
浏览文件 @
22e416cf
...
@@ -20,7 +20,7 @@ limitations under the License. */
...
@@ -20,7 +20,7 @@ limitations under the License. */
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/fluid/operators/collective/c_softmax_with_cross_entropy_op.h
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@ limitations under the License. */
...
@@ -18,7 +18,7 @@ limitations under the License. */
#include <utility>
#include <utility>
#include <vector>
#include <vector>
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/data_type.h"
#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"
...
...
paddle/fluid/operators/collective/global_gather_op.h
浏览文件 @
22e416cf
...
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
...
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#pragma once
#pragma once
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/data_type.h"
#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"
...
...
paddle/fluid/operators/collective/global_scatter_op.h
浏览文件 @
22e416cf
...
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
...
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#pragma once
#pragma once
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/fluid/framework/data_type.h"
#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"
...
...
paddle/fluid/operators/collective/partial_allgather_op.cu.cc
浏览文件 @
22e416cf
...
@@ -15,7 +15,7 @@ limitations under the License. */
...
@@ -15,7 +15,7 @@ limitations under the License. */
#include "paddle/fluid/operators/collective/partial_allgather_op.h"
#include "paddle/fluid/operators/collective/partial_allgather_op.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/fluid/operators/collective/partial_recv_op.cu.cc
浏览文件 @
22e416cf
...
@@ -15,7 +15,7 @@ limitations under the License. */
...
@@ -15,7 +15,7 @@ limitations under the License. */
#include "paddle/fluid/operators/collective/partial_recv_op.h"
#include "paddle/fluid/operators/collective/partial_recv_op.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/fluid/operators/collective/partial_send_op.cu.cc
浏览文件 @
22e416cf
...
@@ -15,7 +15,7 @@ limitations under the License. */
...
@@ -15,7 +15,7 @@ limitations under the License. */
#include "paddle/fluid/operators/collective/partial_send_op.h"
#include "paddle/fluid/operators/collective/partial_send_op.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/fluid/operators/collective/recv_v2_op.cu.cc
浏览文件 @
22e416cf
...
@@ -19,7 +19,7 @@ limitations under the License. */
...
@@ -19,7 +19,7 @@ limitations under the License. */
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
namespace
paddle
{
namespace
paddle
{
...
...
paddle/fluid/operators/collective/recv_v2_op_npu.cc
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@ limitations under the License. */
...
@@ -18,7 +18,7 @@ limitations under the License. */
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/npu/hccl_helper.h"
#include "paddle/fluid/platform/device/npu/hccl_helper.h"
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
namespace
paddle
{
namespace
paddle
{
...
...
paddle/fluid/operators/collective/send_v2_op.cu.cc
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@ limitations under the License. */
...
@@ -18,7 +18,7 @@ limitations under the License. */
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
namespace
paddle
{
namespace
paddle
{
...
...
paddle/fluid/operators/collective/send_v2_op_npu.cc
浏览文件 @
22e416cf
...
@@ -18,7 +18,7 @@ limitations under the License. */
...
@@ -18,7 +18,7 @@ limitations under the License. */
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/npu/hccl_helper.h"
#include "paddle/fluid/platform/device/npu/hccl_helper.h"
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/phi/api/include/tensor.h"
#include "paddle/phi/api/include/tensor.h"
namespace
paddle
{
namespace
paddle
{
...
...
paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h
浏览文件 @
22e416cf
...
@@ -34,7 +34,7 @@ limitations under the License. */
...
@@ -34,7 +34,7 @@ limitations under the License. */
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/fluid/pybind/distributed_py.cc
浏览文件 @
22e416cf
...
@@ -21,10 +21,10 @@ limitations under the License. */
...
@@ -21,10 +21,10 @@ limitations under the License. */
#undef _XOPEN_SOURCE
#undef _XOPEN_SOURCE
#endif
#endif
#include "paddle/fluid/distributed/collective/ProcessGroup.h"
#include "paddle/fluid/distributed/collective/process_group.h"
#include "paddle/fluid/distributed/collective/Types.h"
#include "paddle/fluid/distributed/collective/process_group_stream.h"
#include "paddle/fluid/distributed/collective/process_group_stream.h"
#include "paddle/fluid/distributed/collective/reducer.h"
#include "paddle/fluid/distributed/collective/reducer.h"
#include "paddle/fluid/distributed/collective/types.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/lod_tensor.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/framework/tensor.h"
#include "paddle/fluid/imperative/layer.h"
#include "paddle/fluid/imperative/layer.h"
...
@@ -42,7 +42,7 @@ limitations under the License. */
...
@@ -42,7 +42,7 @@ limitations under the License. */
#endif
#endif
#if defined(PADDLE_WITH_CUSTOM_DEVICE)
#if defined(PADDLE_WITH_CUSTOM_DEVICE)
#include "paddle/fluid/distributed/collective/
ProcessGroupC
ustom.h"
#include "paddle/fluid/distributed/collective/
process_group_c
ustom.h"
#endif
#endif
#if defined(PADDLE_WITH_GLOO)
#if defined(PADDLE_WITH_GLOO)
...
@@ -51,7 +51,7 @@ limitations under the License. */
...
@@ -51,7 +51,7 @@ limitations under the License. */
#endif
#endif
#if defined(PADDLE_WITH_XPU_BKCL)
#if defined(PADDLE_WITH_XPU_BKCL)
#include "paddle/fluid/distributed/collective/
ProcessGroupBKCL
.h"
#include "paddle/fluid/distributed/collective/
process_group_bkcl
.h"
#endif
#endif
#include "paddle/phi/kernels/sync_batch_norm_kernel.h"
#include "paddle/phi/kernels/sync_batch_norm_kernel.h"
...
...
paddle/phi/backends/processgroup_comm_utils.cc
浏览文件 @
22e416cf
...
@@ -12,13 +12,13 @@
...
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/phi/backends/c_comm_lib.h"
#include "paddle/phi/backends/c_comm_lib.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/process_group_nccl.h"
#include "paddle/fluid/distributed/collective/process_group_nccl.h"
#endif
#endif
#if defined(PADDLE_WITH_CUSTOM_DEVICE)
#if defined(PADDLE_WITH_CUSTOM_DEVICE)
#include "paddle/fluid/distributed/collective/
ProcessGroupC
ustom.h"
#include "paddle/fluid/distributed/collective/
process_group_c
ustom.h"
#endif
#endif
namespace
phi
{
namespace
phi
{
...
...
paddle/phi/kernels/gpu/class_center_sample_kernel.cu
浏览文件 @
22e416cf
...
@@ -33,7 +33,7 @@ namespace cub = hipcub;
...
@@ -33,7 +33,7 @@ namespace cub = hipcub;
#include "paddle/phi/core/enforce.h"
#include "paddle/phi/core/enforce.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu
浏览文件 @
22e416cf
...
@@ -34,7 +34,7 @@ namespace cub = hipcub;
...
@@ -34,7 +34,7 @@ namespace cub = hipcub;
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu
浏览文件 @
22e416cf
...
@@ -27,7 +27,7 @@ namespace cub = hipcub;
...
@@ -27,7 +27,7 @@ namespace cub = hipcub;
#include "paddle/phi/kernels/funcs/reduce_function.h"
#include "paddle/phi/kernels/funcs/reduce_function.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/collective_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#include "paddle/fluid/platform/device/gpu/nccl_helper.h"
#endif
#endif
...
...
paddle/phi/kernels/gpu/sync_batch_norm_utils.h
浏览文件 @
22e416cf
...
@@ -26,7 +26,7 @@ limitations under the License. */
...
@@ -26,7 +26,7 @@ limitations under the License. */
#include <hipcub/hipcub.hpp>
#include <hipcub/hipcub.hpp>
namespace
cub
=
hipcub
;
namespace
cub
=
hipcub
;
#endif
#endif
#include "paddle/fluid/distributed/collective/
ProcessG
roup.h"
#include "paddle/fluid/distributed/collective/
process_g
roup.h"
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
#include "paddle/fluid/distributed/collective/process_group_nccl.h"
#include "paddle/fluid/distributed/collective/process_group_nccl.h"
#endif
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录