From 5d6bdabb7a4d040e1afdc0d5515ae3e9b0b7f84e Mon Sep 17 00:00:00 2001 From: Qi Li Date: Tue, 28 Jun 2022 11:04:46 +0800 Subject: [PATCH] fix compiling error when WITH_PSCORE=ON on DCU, test=develop (#43833) --- .../fluid/distributed/collective/ProcessGroupHeter.cc | 10 +++++----- .../fluid/distributed/collective/ProcessGroupHeter.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/paddle/fluid/distributed/collective/ProcessGroupHeter.cc b/paddle/fluid/distributed/collective/ProcessGroupHeter.cc index fdce542954a..2963d65f261 100644 --- a/paddle/fluid/distributed/collective/ProcessGroupHeter.cc +++ b/paddle/fluid/distributed/collective/ProcessGroupHeter.cc @@ -73,15 +73,15 @@ ProcessGroupHeter::ProcessGroupHeter(const std::shared_ptr& store, src_rank_(src_rank), dst_rank_(dst_rank) { return; -#if defined(PADDLE_WITH_NCCL) +#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) inner_pg_ = std::make_shared( store, local_rank, local_size, place_, IGNORE_ID); #elif defined(PADDLE_WITH_ASCEND_CL) inner_pg_ = std::make_shared( store, local_rank, local_size, place_, IGNORE_ID); #else - PADDLE_THROW(platform::errors::Fatal( - "ProcessGroupHeter only supports NCCL and HCCL now."); + PADDLE_THROW(platform::errors::Unavailable( + "ProcessGroupHeter only supports NCCL, RCCL and HCCL now.")); #endif if (local_rank_ == 0 && !with_switch_) { auto opts = ProcessGroupGloo::GlooOptions::create(); @@ -104,7 +104,7 @@ std::shared_ptr ProcessGroupHeter::AllReduce( std::vector& in_tensors, std::vector& out_tensors, const AllreduceOptions& opts) { -#if defined(PADDLE_WITH_NCCL) +#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) PADDLE_ENFORCE_EQ( CheckTensorsInCudaPlace(in_tensors), true, @@ -213,7 +213,7 @@ std::shared_ptr ProcessGroupHeter::Broadcast( std::vector& in_tensors, std::vector& out_tensors, const BroadcastOptions& opts) { -#if defined(PADDLE_WITH_NCCL) +#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) PADDLE_ENFORCE_EQ( CheckTensorsInCudaPlace(in_tensors), true, diff --git a/paddle/fluid/distributed/collective/ProcessGroupHeter.h b/paddle/fluid/distributed/collective/ProcessGroupHeter.h index 0385391d364..2b0146e6ec0 100644 --- a/paddle/fluid/distributed/collective/ProcessGroupHeter.h +++ b/paddle/fluid/distributed/collective/ProcessGroupHeter.h @@ -35,11 +35,10 @@ #include "paddle/fluid/platform/place.h" #include "paddle/fluid/platform/stream/cuda_stream.h" -#if defined(PADDLE_WITH_NCCL) +#if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/distributed/collective/NCCLTools.h" #include "paddle/fluid/distributed/collective/ProcessGroupNCCL.h" #include "paddle/fluid/platform/cuda_device_guard.h" -#include "paddle/fluid/platform/dynload/nccl.h" #endif #if defined(PADDLE_WITH_ASCEND_CL) @@ -48,7 +47,8 @@ #endif #if defined(PADDLE_WITH_DISTRIBUTE) && defined(PADDLE_WITH_PSCORE) && \ - (defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_ASCEND_CL)) + (defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) || \ + defined(PADDLE_WITH_ASCEND_CL)) #include "paddle/fluid/distributed/ps/service/heter_client.h" #endif -- GitLab