From 22e416cf9d3f1ce32a9380c020425cf7f45892dc Mon Sep 17 00:00:00 2001 From: Wen Sun <35923278+HermitSun@users.noreply.github.com> Date: Mon, 19 Dec 2022 16:02:51 +0800 Subject: [PATCH] refactor: rename process group (#49137) --- paddle/fluid/distributed/collective/CMakeLists.txt | 6 +++--- .../collective/{BKCLTools.cc => bkcl_tools.cc} | 4 ++-- .../distributed/collective/{BKCLTools.h => bkcl_tools.h} | 2 +- .../collective/{CustomCCLTools.cc => custom_ccl_tools.cc} | 4 ++-- .../collective/{CustomCCLTools.h => custom_ccl_tools.h} | 2 +- paddle/fluid/distributed/collective/mpi_tools.cc | 2 +- paddle/fluid/distributed/collective/mpi_tools.h | 2 +- paddle/fluid/distributed/collective/nccl_tools.h | 2 +- .../collective/{ProcessGroup.cc => process_group.cc} | 2 +- .../collective/{ProcessGroup.h => process_group.h} | 2 +- .../{ProcessGroupBKCL.cc => process_group_bkcl.cc} | 4 ++-- .../{ProcessGroupBKCL.h => process_group_bkcl.h} | 2 +- .../{ProcessGroupCustom.cc => process_group_custom.cc} | 4 ++-- .../{ProcessGroupCustom.h => process_group_custom.h} | 4 ++-- paddle/fluid/distributed/collective/process_group_gloo.h | 2 +- paddle/fluid/distributed/collective/process_group_mpi.h | 4 ++-- .../fluid/distributed/collective/process_group_stream.h | 2 +- paddle/fluid/distributed/collective/reducer.h | 2 +- paddle/fluid/distributed/collective/{Types.h => types.h} | 0 paddle/fluid/operators/collective/c_allgather_op.cu.cc | 2 +- paddle/fluid/operators/collective/c_allreduce_op.h | 2 +- paddle/fluid/operators/collective/c_broadcast_op.cu.cc | 2 +- paddle/fluid/operators/collective/c_concat_op.cu.cc | 2 +- .../collective/c_softmax_with_cross_entropy_op.h | 2 +- paddle/fluid/operators/collective/global_gather_op.h | 2 +- paddle/fluid/operators/collective/global_scatter_op.h | 2 +- .../fluid/operators/collective/partial_allgather_op.cu.cc | 2 +- paddle/fluid/operators/collective/partial_recv_op.cu.cc | 2 +- paddle/fluid/operators/collective/partial_send_op.cu.cc | 2 +- paddle/fluid/operators/collective/recv_v2_op.cu.cc | 2 +- paddle/fluid/operators/collective/recv_v2_op_npu.cc | 2 +- paddle/fluid/operators/collective/send_v2_op.cu.cc | 2 +- paddle/fluid/operators/collective/send_v2_op_npu.cc | 2 +- .../fluid/operators/fused/fused_multi_transformer_op.cu.h | 2 +- paddle/fluid/pybind/distributed_py.cc | 8 ++++---- paddle/phi/backends/processgroup_comm_utils.cc | 4 ++-- paddle/phi/kernels/gpu/class_center_sample_kernel.cu | 2 +- .../phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu | 2 +- paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu | 2 +- paddle/phi/kernels/gpu/sync_batch_norm_utils.h | 2 +- 40 files changed, 51 insertions(+), 51 deletions(-) rename paddle/fluid/distributed/collective/{BKCLTools.cc => bkcl_tools.cc} (92%) rename paddle/fluid/distributed/collective/{BKCLTools.h => bkcl_tools.h} (98%) rename paddle/fluid/distributed/collective/{CustomCCLTools.cc => custom_ccl_tools.cc} (92%) rename paddle/fluid/distributed/collective/{CustomCCLTools.h => custom_ccl_tools.h} (99%) rename paddle/fluid/distributed/collective/{ProcessGroup.cc => process_group.cc} (97%) rename paddle/fluid/distributed/collective/{ProcessGroup.h => process_group.h} (99%) rename paddle/fluid/distributed/collective/{ProcessGroupBKCL.cc => process_group_bkcl.cc} (99%) rename paddle/fluid/distributed/collective/{ProcessGroupBKCL.h => process_group_bkcl.h} (99%) rename paddle/fluid/distributed/collective/{ProcessGroupCustom.cc => process_group_custom.cc} (99%) rename paddle/fluid/distributed/collective/{ProcessGroupCustom.h => process_group_custom.h} (97%) rename paddle/fluid/distributed/collective/{Types.h => types.h} (100%) diff --git a/paddle/fluid/distributed/collective/CMakeLists.txt b/paddle/fluid/distributed/collective/CMakeLists.txt index 7bc0d1310bf..3b76733a616 100644 --- a/paddle/fluid/distributed/collective/CMakeLists.txt +++ b/paddle/fluid/distributed/collective/CMakeLists.txt @@ -1,6 +1,6 @@ cc_library( process_group - SRCS ProcessGroup.cc + SRCS process_group.cc DEPS dense_tensor) cc_library( process_group_stream @@ -35,7 +35,7 @@ endif() if(WITH_XPU_BKCL) cc_library( process_group_bkcl - SRCS ProcessGroupBKCL.cc BKCLTools.cc common.cc + SRCS process_group_bkcl.cc bkcl_tools.cc common.cc DEPS process_group place enforce collective_helper device_context dense_tensor) endif() @@ -50,7 +50,7 @@ endif() if(WITH_CUSTOM_DEVICE) cc_library( process_group_custom - SRCS ProcessGroupCustom.cc CustomCCLTools.cc common.cc + SRCS process_group_custom.cc custom_ccl_tools.cc common.cc DEPS process_group phi_backends place enforce collective_helper device_context) endif() diff --git a/paddle/fluid/distributed/collective/BKCLTools.cc b/paddle/fluid/distributed/collective/bkcl_tools.cc similarity index 92% rename from paddle/fluid/distributed/collective/BKCLTools.cc rename to paddle/fluid/distributed/collective/bkcl_tools.cc index 05372a3a758..13795ae67e5 100644 --- a/paddle/fluid/distributed/collective/BKCLTools.cc +++ b/paddle/fluid/distributed/collective/bkcl_tools.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/collective/BKCLTools.h" +#include "paddle/fluid/distributed/collective/bkcl_tools.h" -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/types.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/collective/BKCLTools.h b/paddle/fluid/distributed/collective/bkcl_tools.h similarity index 98% rename from paddle/fluid/distributed/collective/BKCLTools.h rename to paddle/fluid/distributed/collective/bkcl_tools.h index 0572b852f6e..533498cd8e1 100644 --- a/paddle/fluid/distributed/collective/BKCLTools.h +++ b/paddle/fluid/distributed/collective/bkcl_tools.h @@ -14,7 +14,7 @@ #pragma once -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/types.h" #include "paddle/fluid/platform/device_context.h" #include "paddle/phi/backends/xpu/enforce_xpu.h" #include "paddle/phi/backends/xpu/xpu_context.h" diff --git a/paddle/fluid/distributed/collective/CustomCCLTools.cc b/paddle/fluid/distributed/collective/custom_ccl_tools.cc similarity index 92% rename from paddle/fluid/distributed/collective/CustomCCLTools.cc rename to paddle/fluid/distributed/collective/custom_ccl_tools.cc index 40c7c11529d..fe1ba628d3e 100644 --- a/paddle/fluid/distributed/collective/CustomCCLTools.cc +++ b/paddle/fluid/distributed/collective/custom_ccl_tools.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/collective/CustomCCLTools.h" -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/custom_ccl_tools.h" +#include "paddle/fluid/distributed/collective/types.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/collective/CustomCCLTools.h b/paddle/fluid/distributed/collective/custom_ccl_tools.h similarity index 99% rename from paddle/fluid/distributed/collective/CustomCCLTools.h rename to paddle/fluid/distributed/collective/custom_ccl_tools.h index cc8faba5224..9431c8d3e52 100644 --- a/paddle/fluid/distributed/collective/CustomCCLTools.h +++ b/paddle/fluid/distributed/collective/custom_ccl_tools.h @@ -17,7 +17,7 @@ #include #include -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/types.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/variable.h" #include "paddle/fluid/platform/collective_helper.h" diff --git a/paddle/fluid/distributed/collective/mpi_tools.cc b/paddle/fluid/distributed/collective/mpi_tools.cc index 65831cf890c..291f01b044d 100644 --- a/paddle/fluid/distributed/collective/mpi_tools.cc +++ b/paddle/fluid/distributed/collective/mpi_tools.cc @@ -13,8 +13,8 @@ // limitations under the License. #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/types.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/collective/mpi_tools.h b/paddle/fluid/distributed/collective/mpi_tools.h index 34fbb3ca9a5..7f86409c036 100644 --- a/paddle/fluid/distributed/collective/mpi_tools.h +++ b/paddle/fluid/distributed/collective/mpi_tools.h @@ -20,7 +20,7 @@ #include "paddle/fluid/framework/variable.h" #include "paddle/fluid/platform/enforce.h" -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/types.h" #ifdef HOST #undef HOST diff --git a/paddle/fluid/distributed/collective/nccl_tools.h b/paddle/fluid/distributed/collective/nccl_tools.h index 103e56a99d5..2efef5381be 100644 --- a/paddle/fluid/distributed/collective/nccl_tools.h +++ b/paddle/fluid/distributed/collective/nccl_tools.h @@ -23,7 +23,7 @@ #include -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/types.h" #ifdef PADDLE_WITH_RCCL #include "paddle/phi/backends/dynload/rccl.h" diff --git a/paddle/fluid/distributed/collective/ProcessGroup.cc b/paddle/fluid/distributed/collective/process_group.cc similarity index 97% rename from paddle/fluid/distributed/collective/ProcessGroup.cc rename to paddle/fluid/distributed/collective/process_group.cc index 9e6bbd93754..fc050280590 100644 --- a/paddle/fluid/distributed/collective/ProcessGroup.cc +++ b/paddle/fluid/distributed/collective/process_group.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/collective/ProcessGroup.h b/paddle/fluid/distributed/collective/process_group.h similarity index 99% rename from paddle/fluid/distributed/collective/ProcessGroup.h rename to paddle/fluid/distributed/collective/process_group.h index 3792e8bc835..fa02ed22eeb 100644 --- a/paddle/fluid/distributed/collective/ProcessGroup.h +++ b/paddle/fluid/distributed/collective/process_group.h @@ -19,7 +19,7 @@ #include #include -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/types.h" #include "paddle/fluid/eager/api/utils/tensor_utils.h" #include "paddle/fluid/framework/tensor.h" #include "paddle/fluid/framework/variable.h" diff --git a/paddle/fluid/distributed/collective/ProcessGroupBKCL.cc b/paddle/fluid/distributed/collective/process_group_bkcl.cc similarity index 99% rename from paddle/fluid/distributed/collective/ProcessGroupBKCL.cc rename to paddle/fluid/distributed/collective/process_group_bkcl.cc index 25a85f679a3..356b5127bb4 100644 --- a/paddle/fluid/distributed/collective/ProcessGroupBKCL.cc +++ b/paddle/fluid/distributed/collective/process_group_bkcl.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // 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/BKCLTools.h" +#include "paddle/fluid/distributed/collective/bkcl_tools.h" #include "paddle/fluid/distributed/collective/common.h" #include "paddle/fluid/platform/device/xpu/bkcl_helper.h" #include "paddle/fluid/platform/device/xpu/xpu_info.h" diff --git a/paddle/fluid/distributed/collective/ProcessGroupBKCL.h b/paddle/fluid/distributed/collective/process_group_bkcl.h similarity index 99% rename from paddle/fluid/distributed/collective/ProcessGroupBKCL.h rename to paddle/fluid/distributed/collective/process_group_bkcl.h index 822f690cb80..cb7132ac9fc 100644 --- a/paddle/fluid/distributed/collective/ProcessGroupBKCL.h +++ b/paddle/fluid/distributed/collective/process_group_bkcl.h @@ -29,7 +29,7 @@ #include "paddle/phi/core/device_context.h" #if defined(PADDLE_WITH_XPU) -#include "paddle/fluid/distributed/collective/BKCLTools.h" +#include "paddle/fluid/distributed/collective/bkcl_tools.h" #endif constexpr const char* BKCL_BACKEND_NAME = "BKCL"; diff --git a/paddle/fluid/distributed/collective/ProcessGroupCustom.cc b/paddle/fluid/distributed/collective/process_group_custom.cc similarity index 99% rename from paddle/fluid/distributed/collective/ProcessGroupCustom.cc rename to paddle/fluid/distributed/collective/process_group_custom.cc index e4e79d8be62..9f7c2eeb2a3 100644 --- a/paddle/fluid/distributed/collective/ProcessGroupCustom.cc +++ b/paddle/fluid/distributed/collective/process_group_custom.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/collective/ProcessGroupCustom.h" +#include "paddle/fluid/distributed/collective/process_group_custom.h" -#include "paddle/fluid/distributed/collective/CustomCCLTools.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/platform/device_context.h" #include "paddle/fluid/platform/place.h" diff --git a/paddle/fluid/distributed/collective/ProcessGroupCustom.h b/paddle/fluid/distributed/collective/process_group_custom.h similarity index 97% rename from paddle/fluid/distributed/collective/ProcessGroupCustom.h rename to paddle/fluid/distributed/collective/process_group_custom.h index 50e7583731e..3e55d150d34 100644 --- a/paddle/fluid/distributed/collective/ProcessGroupCustom.h +++ b/paddle/fluid/distributed/collective/process_group_custom.h @@ -21,8 +21,8 @@ #include #include -#include "paddle/fluid/distributed/collective/CustomCCLTools.h" -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/custom_ccl_tools.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/distributed/store/store.h" #include "paddle/fluid/platform/device/npu/npu_stream.h" #include "paddle/fluid/platform/device_context.h" diff --git a/paddle/fluid/distributed/collective/process_group_gloo.h b/paddle/fluid/distributed/collective/process_group_gloo.h index cdb5255c8db..97b8338720e 100644 --- a/paddle/fluid/distributed/collective/process_group_gloo.h +++ b/paddle/fluid/distributed/collective/process_group_gloo.h @@ -18,7 +18,7 @@ #include #include -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #ifdef PADDLE_WITH_GLOO #include "paddle/fluid/framework/fleet/gloo_wrapper.h" diff --git a/paddle/fluid/distributed/collective/process_group_mpi.h b/paddle/fluid/distributed/collective/process_group_mpi.h index 635d81d6103..dd6793ed070 100644 --- a/paddle/fluid/distributed/collective/process_group_mpi.h +++ b/paddle/fluid/distributed/collective/process_group_mpi.h @@ -25,8 +25,8 @@ #include #include -#include "paddle/fluid/distributed/collective/ProcessGroup.h" -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/process_group.h" +#include "paddle/fluid/distributed/collective/types.h" #include "paddle/fluid/platform/device_context.h" #if defined(PADDLE_WITH_MPI) diff --git a/paddle/fluid/distributed/collective/process_group_stream.h b/paddle/fluid/distributed/collective/process_group_stream.h index d48ff0f24f8..43827669cdc 100644 --- a/paddle/fluid/distributed/collective/process_group_stream.h +++ b/paddle/fluid/distributed/collective/process_group_stream.h @@ -14,7 +14,7 @@ #pragma once -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" namespace paddle { namespace distributed { diff --git a/paddle/fluid/distributed/collective/reducer.h b/paddle/fluid/distributed/collective/reducer.h index 5be2d60a6a6..0704c5e7294 100644 --- a/paddle/fluid/distributed/collective/reducer.h +++ b/paddle/fluid/distributed/collective/reducer.h @@ -17,7 +17,7 @@ #include #include -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/eager/accumulation/accumulation_node.h" #include "paddle/fluid/eager/api/utils/hook_utils.h" #include "paddle/fluid/eager/api/utils/tensor_utils.h" diff --git a/paddle/fluid/distributed/collective/Types.h b/paddle/fluid/distributed/collective/types.h similarity index 100% rename from paddle/fluid/distributed/collective/Types.h rename to paddle/fluid/distributed/collective/types.h diff --git a/paddle/fluid/operators/collective/c_allgather_op.cu.cc b/paddle/fluid/operators/collective/c_allgather_op.cu.cc index 947475ece48..075abc49a72 100644 --- a/paddle/fluid/operators/collective/c_allgather_op.cu.cc +++ b/paddle/fluid/operators/collective/c_allgather_op.cu.cc @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/framework/convert_utils.h" #include "paddle/phi/api/include/tensor.h" diff --git a/paddle/fluid/operators/collective/c_allreduce_op.h b/paddle/fluid/operators/collective/c_allreduce_op.h index 6920d51eb26..268144f183f 100644 --- a/paddle/fluid/operators/collective/c_allreduce_op.h +++ b/paddle/fluid/operators/collective/c_allreduce_op.h @@ -16,7 +16,7 @@ limitations under the License. */ #include -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/op_registry.h" diff --git a/paddle/fluid/operators/collective/c_broadcast_op.cu.cc b/paddle/fluid/operators/collective/c_broadcast_op.cu.cc index 47e5bfd825d..f2ff11316aa 100644 --- a/paddle/fluid/operators/collective/c_broadcast_op.cu.cc +++ b/paddle/fluid/operators/collective/c_broadcast_op.cu.cc @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/phi/api/include/tensor.h" namespace paddle { diff --git a/paddle/fluid/operators/collective/c_concat_op.cu.cc b/paddle/fluid/operators/collective/c_concat_op.cu.cc index 2d7eaf26ea4..cb52ac0479f 100644 --- a/paddle/fluid/operators/collective/c_concat_op.cu.cc +++ b/paddle/fluid/operators/collective/c_concat_op.cu.cc @@ -20,7 +20,7 @@ limitations under the License. */ #include "paddle/phi/api/include/tensor.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/fluid/operators/collective/c_softmax_with_cross_entropy_op.h b/paddle/fluid/operators/collective/c_softmax_with_cross_entropy_op.h index d7b20224b14..f647f3b680d 100644 --- a/paddle/fluid/operators/collective/c_softmax_with_cross_entropy_op.h +++ b/paddle/fluid/operators/collective/c_softmax_with_cross_entropy_op.h @@ -18,7 +18,7 @@ limitations under the License. */ #include #include -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/op_registry.h" diff --git a/paddle/fluid/operators/collective/global_gather_op.h b/paddle/fluid/operators/collective/global_gather_op.h index 47212b1d155..463c5fb5944 100644 --- a/paddle/fluid/operators/collective/global_gather_op.h +++ b/paddle/fluid/operators/collective/global_gather_op.h @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ #pragma once -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/op_registry.h" diff --git a/paddle/fluid/operators/collective/global_scatter_op.h b/paddle/fluid/operators/collective/global_scatter_op.h index aa567a284a6..9a29808e7db 100644 --- a/paddle/fluid/operators/collective/global_scatter_op.h +++ b/paddle/fluid/operators/collective/global_scatter_op.h @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ #pragma once -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/framework/data_type.h" #include "paddle/fluid/framework/lod_tensor.h" #include "paddle/fluid/framework/op_registry.h" diff --git a/paddle/fluid/operators/collective/partial_allgather_op.cu.cc b/paddle/fluid/operators/collective/partial_allgather_op.cu.cc index c4565a94500..94ad2432e46 100644 --- a/paddle/fluid/operators/collective/partial_allgather_op.cu.cc +++ b/paddle/fluid/operators/collective/partial_allgather_op.cu.cc @@ -15,7 +15,7 @@ limitations under the License. */ #include "paddle/fluid/operators/collective/partial_allgather_op.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/fluid/operators/collective/partial_recv_op.cu.cc b/paddle/fluid/operators/collective/partial_recv_op.cu.cc index c95d1fe4bc6..c944e508b79 100644 --- a/paddle/fluid/operators/collective/partial_recv_op.cu.cc +++ b/paddle/fluid/operators/collective/partial_recv_op.cu.cc @@ -15,7 +15,7 @@ limitations under the License. */ #include "paddle/fluid/operators/collective/partial_recv_op.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/fluid/operators/collective/partial_send_op.cu.cc b/paddle/fluid/operators/collective/partial_send_op.cu.cc index 7b9c154bd44..c9f9b6b4edf 100644 --- a/paddle/fluid/operators/collective/partial_send_op.cu.cc +++ b/paddle/fluid/operators/collective/partial_send_op.cu.cc @@ -15,7 +15,7 @@ limitations under the License. */ #include "paddle/fluid/operators/collective/partial_send_op.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/fluid/operators/collective/recv_v2_op.cu.cc b/paddle/fluid/operators/collective/recv_v2_op.cu.cc index a32376f3e84..eba0c5e3334 100644 --- a/paddle/fluid/operators/collective/recv_v2_op.cu.cc +++ b/paddle/fluid/operators/collective/recv_v2_op.cu.cc @@ -19,7 +19,7 @@ limitations under the License. */ #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/phi/api/include/tensor.h" namespace paddle { diff --git a/paddle/fluid/operators/collective/recv_v2_op_npu.cc b/paddle/fluid/operators/collective/recv_v2_op_npu.cc index e4615e10c73..5df7d89d8e2 100644 --- a/paddle/fluid/operators/collective/recv_v2_op_npu.cc +++ b/paddle/fluid/operators/collective/recv_v2_op_npu.cc @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/npu/hccl_helper.h" #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/phi/api/include/tensor.h" namespace paddle { diff --git a/paddle/fluid/operators/collective/send_v2_op.cu.cc b/paddle/fluid/operators/collective/send_v2_op.cu.cc index 631595ccd08..eb5ac6a8006 100644 --- a/paddle/fluid/operators/collective/send_v2_op.cu.cc +++ b/paddle/fluid/operators/collective/send_v2_op.cu.cc @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/phi/api/include/tensor.h" namespace paddle { diff --git a/paddle/fluid/operators/collective/send_v2_op_npu.cc b/paddle/fluid/operators/collective/send_v2_op_npu.cc index 6c412930a58..7babee643c8 100644 --- a/paddle/fluid/operators/collective/send_v2_op_npu.cc +++ b/paddle/fluid/operators/collective/send_v2_op_npu.cc @@ -18,7 +18,7 @@ limitations under the License. */ #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/npu/hccl_helper.h" #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/phi/api/include/tensor.h" namespace paddle { diff --git a/paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h b/paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h index db83d6cda45..f9454cb45c8 100644 --- a/paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h +++ b/paddle/fluid/operators/fused/fused_multi_transformer_op.cu.h @@ -34,7 +34,7 @@ limitations under the License. */ #include "paddle/phi/kernels/funcs/math_function.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/fluid/pybind/distributed_py.cc b/paddle/fluid/pybind/distributed_py.cc index 913d8c22b9f..94b9b36f50a 100644 --- a/paddle/fluid/pybind/distributed_py.cc +++ b/paddle/fluid/pybind/distributed_py.cc @@ -21,10 +21,10 @@ limitations under the License. */ #undef _XOPEN_SOURCE #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" -#include "paddle/fluid/distributed/collective/Types.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/distributed/collective/process_group_stream.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/tensor.h" #include "paddle/fluid/imperative/layer.h" @@ -42,7 +42,7 @@ limitations under the License. */ #endif #if defined(PADDLE_WITH_CUSTOM_DEVICE) -#include "paddle/fluid/distributed/collective/ProcessGroupCustom.h" +#include "paddle/fluid/distributed/collective/process_group_custom.h" #endif #if defined(PADDLE_WITH_GLOO) @@ -51,7 +51,7 @@ limitations under the License. */ #endif #if defined(PADDLE_WITH_XPU_BKCL) -#include "paddle/fluid/distributed/collective/ProcessGroupBKCL.h" +#include "paddle/fluid/distributed/collective/process_group_bkcl.h" #endif #include "paddle/phi/kernels/sync_batch_norm_kernel.h" diff --git a/paddle/phi/backends/processgroup_comm_utils.cc b/paddle/phi/backends/processgroup_comm_utils.cc index 450c1763871..20f24fa11ec 100644 --- a/paddle/phi/backends/processgroup_comm_utils.cc +++ b/paddle/phi/backends/processgroup_comm_utils.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/phi/backends/c_comm_lib.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/distributed/collective/process_group_nccl.h" #endif #if defined(PADDLE_WITH_CUSTOM_DEVICE) -#include "paddle/fluid/distributed/collective/ProcessGroupCustom.h" +#include "paddle/fluid/distributed/collective/process_group_custom.h" #endif namespace phi { diff --git a/paddle/phi/kernels/gpu/class_center_sample_kernel.cu b/paddle/phi/kernels/gpu/class_center_sample_kernel.cu index 65dace12b01..c6fae6ee9e3 100644 --- a/paddle/phi/kernels/gpu/class_center_sample_kernel.cu +++ b/paddle/phi/kernels/gpu/class_center_sample_kernel.cu @@ -33,7 +33,7 @@ namespace cub = hipcub; #include "paddle/phi/core/enforce.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu b/paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu index 54813422ef5..e3db3ee70c2 100644 --- a/paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu +++ b/paddle/phi/kernels/gpu/margin_cross_entropy_grad_kernel.cu @@ -34,7 +34,7 @@ namespace cub = hipcub; #include "paddle/phi/kernels/funcs/eigen/common.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu b/paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu index a92daab07a1..a0674ae5e79 100644 --- a/paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu +++ b/paddle/phi/kernels/gpu/margin_cross_entropy_kernel.cu @@ -27,7 +27,7 @@ namespace cub = hipcub; #include "paddle/phi/kernels/funcs/reduce_function.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #include "paddle/fluid/platform/collective_helper.h" #include "paddle/fluid/platform/device/gpu/nccl_helper.h" #endif diff --git a/paddle/phi/kernels/gpu/sync_batch_norm_utils.h b/paddle/phi/kernels/gpu/sync_batch_norm_utils.h index f99da25dec9..81717cd445b 100644 --- a/paddle/phi/kernels/gpu/sync_batch_norm_utils.h +++ b/paddle/phi/kernels/gpu/sync_batch_norm_utils.h @@ -26,7 +26,7 @@ limitations under the License. */ #include namespace cub = hipcub; #endif -#include "paddle/fluid/distributed/collective/ProcessGroup.h" +#include "paddle/fluid/distributed/collective/process_group.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/distributed/collective/process_group_nccl.h" #endif -- GitLab