diff --git a/paddle/fluid/distributed/collective/CMakeLists.txt b/paddle/fluid/distributed/collective/CMakeLists.txt index 7bc0d1310bf65402272009cda5cab7b71f1b24bf..3b76733a616099ccf2b8da671f3026a22f827f03 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 05372a3a758fc18cfdb8014b2ac2cea37054512b..13795ae67e5f33be5ccfcba6a1c6c5e071a5986d 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 0572b852f6e90b6e13711bf040eb946da7c0eb13..533498cd8e119c50c0c03ad3d787bc24f4b8dc20 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 40c7c11529d32f17f26768a72b98936fd96bea3e..fe1ba628d3e45cb17ea26d81df50aba52a476cb5 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 cc8faba5224f1f9d2a12efd981a760265cf5f293..9431c8d3e52756da356eb2500818cfa7cdcb0114 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 65831cf890cf68fd4422070d8e9e7977995d81a2..291f01b044d1c4960ac90c8bfd455092ed7a162f 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 34fbb3ca9a5b66916a493a04d56d0b328bc06415..7f86409c036ebbf51907fbcd96cbf3523104c6dc 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 103e56a99d50b1ca9bb511234357589c3dbc98f4..2efef5381be157017ef4dfd22f8c64399bffb925 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 9e6bbd93754fff1b9a1644736010e3b1e8cb11bc..fc05028059072fa4decfbbd1ac7597f2685a109a 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 3792e8bc835466d97add6aafabc22cc1c38f41df..fa02ed22eeb376f20018d7b9f9a86ed36fcecf0e 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 25a85f679a3b8f6f85ebf9c3e127053dc58419c6..356b5127bb4bfe32d75ec7b364298ee1b33df475 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 822f690cb802f8fd2e864c109756f54b09f3fa33..cb7132ac9fc7a2a2e3e5bb8774910b6f0805b8be 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 e4e79d8be623affad6387bf3b91d035637790689..9f7c2eeb2a37d25a4f725e24b02a8d05398c1c86 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 50e7583731e34e3d3e2f16bb9b1ba205748134cd..3e55d150d34b72a73ce34c0ff09b2e4297f9a53a 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 cdb5255c8db5f67121e5f86520d83abfe613bc60..97b8338720e25387b9f74fc81d088120c459d7ee 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 635d81d610309165959d46da3620882fb03088de..dd6793ed0703999a30eeab95a78e91c41b7ae51f 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 d48ff0f24f83bd3b03e9d8965c351af9c8a87f64..43827669cdc1c0d4c737562534f3f12693749ddb 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 5be2d60a6a654fb331146909b5bb073198a0a54d..0704c5e7294e940cbe2f9188b4b488e2c52e974f 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 947475ece482ab2cc4d51f2fd9fce8881672909f..075abc49a72baabc131d3cd43da15938453a617c 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 6920d51eb2637a16eccea20974d16e31df6bf6da..268144f183fba03489e4409f1554ef0ad13fb62f 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 47e5bfd825d650b2958f1119d1df78f68797bd24..f2ff11316aa7ec02bf5d38b6bf1ffe50bf463918 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 2d7eaf26ea420ad5ffb915e720a02b8f13b88081..cb52ac0479f7623bb0399a92791035af0f514880 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 d7b20224b1448ae338beb7420bb647e8735503c4..f647f3b680d4d8958b28dc3500b30443c99cdd6b 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 47212b1d15581c5f0bccfde01a52021c2c485915..463c5fb594401e1fdea1262e5a89063702f4bc63 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 aa567a284a6f7314a76afe574e2c5c6719344342..9a29808e7db10150d63d9d336ad42fdcd03d6d94 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 c4565a94500639b776cff9475c7bc0e669493f91..94ad2432e46ff8d928a5959347d6b11ff13c0127 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 c95d1fe4bc6195e2c2c52bcd5df7956170aa2a1f..c944e508b79e0838499ce7dc2365e5aed20ff83c 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 7b9c154bd44997bc218ab34f8d5d5e43fa353436..c9f9b6b4edf4db9f2a777ee71109e83f5153348c 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 a32376f3e842da4185349c0e75da016416ca6b3d..eba0c5e3334c2bd035902d5c32600c99142e554d 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 e4615e10c7305f8c6621dbecd1d6d0874cf572af..5df7d89d8e226e429821b644f7fb97cd5bf6f490 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 631595ccd08695fab158bda7f469fd3a26a2a794..eb5ac6a8006ebb6a00ba62d13e5db6ddc2b074b2 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 6c412930a58c53ee25f65c4adc43726a5b566580..7babee643c898655c22efe7c49686b90298fa711 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 db83d6cda45e39c8ea8a972bcbd019c0b6392be8..f9454cb45c8c3a704aed50003c82e2eab73cb94f 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 913d8c22b9f694820ff27a24ef1f2ecf1707f110..94b9b36f50adff1598fe3b0ca95ff743f587bb1c 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 450c17638712228ff86f64d2dc65412894fb4206..20f24fa11ece5f07a4e646c23223ba4d5364772b 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 65dace12b01ab6fabac1ee7fcb3d7c5ef7b54dc8..c6fae6ee9e313c31b6e42db692d1f49d9fbfc5bc 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 54813422ef5e8cb092afbed8a62569ae6d2c170d..e3db3ee70c22b5c4b028269710bb4fb020e7d4c9 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 a92daab07a1fe9e8442b813a7ca9fb109e56a19c..a0674ae5e79205910cad22542dbf81c4d5f7831d 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 f99da25dec9600864796c14c5e8e1d84d22caeae..81717cd445bc0a5f576790199335e04568652236 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