Replace platform::ToNCCLDataType [fluid_ops] (#67899)

co63oc · web-flow · commit 119703dcf9e6 · 2024-09-03T10:52:48.000+08:00
* Fix

* Fix

* Fix
diff --git a/paddle/fluid/framework/compiled_program.cc b/paddle/fluid/framework/compiled_program.cc
@@ -608,7 +608,7 @@ void CompiledProgram::BCastParamsToDevices(const std::vector<std::string> &vars,
       buffers.reserve(member_->places_.size());
       size_t numel = main_tensor.numel();
       auto dtype = framework::TransToProtoVarType(main_tensor.dtype());
-      ncclDataType_t data_type = platform::ToNCCLDataType(dtype);
+      ncclDataType_t data_type = phi::ToNCCLDataType(main_tensor.dtype());
       for (size_t i = 0; i < member_->places_.size(); ++i) {
         auto place = member_->places_[i];
         void *buffer;
@@ -671,8 +671,7 @@ void CompiledProgram::BCastParamsToDevices(const std::vector<std::string> &vars,
       std::vector<void *> buffers;
       buffers.reserve(member_->places_.size());
       size_t numel = main_tensor.numel();
-      auto dtype = framework::TransToProtoVarType(main_tensor.dtype());
-      BKCLDataType data_type = platform::ToBKCLDataType(dtype);
+      BKCLDataType data_type = phi::ToBKCLDataType(main_tensor.dtype());
       for (size_t i = 0; i < member_->places_.size(); ++i) {
         auto place = member_->places_[i];
         void *buffer;
diff --git a/paddle/fluid/imperative/all_reduce.cc b/paddle/fluid/imperative/all_reduce.cc
@@ -67,8 +67,7 @@ static void AllReduce(const phi::DenseTensor &src,
   const void *src_ptr = src.data();
   dst->Resize(src.dims());
   auto *dst_ptr = dst->mutable_data(src.place(), src.dtype());
-  auto nccl_dtype =
-      platform::ToNCCLDataType(framework::TransToProtoVarType(src.dtype()));
+  auto nccl_dtype = phi::ToNCCLDataType(src.dtype());
   PADDLE_ENFORCE_GPU_SUCCESS(phi::dynload::ncclAllReduce(src_ptr,
                                                          dst_ptr,
                                                          src.numel(),
@@ -94,7 +93,7 @@ static void AllReduce(const phi::SelectedRows &src,
           "Imperative mode does not support multi-CPU training yet."));
 
   auto dtype = framework::TransToProtoVarType(src_tensor.dtype());
-  auto nccl_dtype = platform::ToNCCLDataType(dtype);
+  auto nccl_dtype = phi::ToNCCLDataType(src_tensor.dtype());
   auto *dev_ctx = static_cast<phi::GPUContext *>(
       phi::DeviceContextPool::Instance().Get(place));
 
diff --git a/paddle/fluid/imperative/bkcl_context.cc b/paddle/fluid/imperative/bkcl_context.cc
@@ -47,8 +47,7 @@ static void AllReduce(const phi::DenseTensor &src,
   const void *src_ptr = src.data();
   dst->Resize(src.dims());
   auto *dst_ptr = dst->mutable_data(src.place(), src.dtype());
-  auto bkcl_dtype =
-      platform::ToBKCLDataType(framework::TransToProtoVarType(src.dtype()));
+  auto bkcl_dtype = phi::ToBKCLDataType(src.dtype());
 
   PADDLE_ENFORCE_EQ(
       bkcl_all_reduce(comm->comm(),
diff --git a/paddle/fluid/imperative/nccl_context.cc b/paddle/fluid/imperative/nccl_context.cc
@@ -147,8 +147,7 @@ void NCCLParallelContext::Broadcast(framework::Variable *src, int ring_id) {
   gpuStream_t stream = comm->stream();
 
   void *src_ptr = src_tensor->data();
-  auto nccl_dtype = platform::ToNCCLDataType(
-      framework::TransToProtoVarType(src_tensor->dtype()));
+  auto nccl_dtype = phi::ToNCCLDataType(src_tensor->dtype());
   PADDLE_ENFORCE_GPU_SUCCESS(phi::dynload::ncclBcast(
       src_ptr, src_tensor->numel(), nccl_dtype, 0, comm->comm(), stream));
 }

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,7 @@ void NCCLParallelContext::Broadcast(framework::Variable *src, int ring_id) {`
`147`	`147`	`gpuStream_t stream = comm->stream();`
`148`	`148`
`149`	`149`	`void *src_ptr = src_tensor->data();`
`150`		`- auto nccl_dtype = platform::ToNCCLDataType(`
`151`		`- framework::TransToProtoVarType(src_tensor->dtype()));`
	`150`	`+ auto nccl_dtype = phi::ToNCCLDataType(src_tensor->dtype());`
`152`	`151`	`PADDLE_ENFORCE_GPU_SUCCESS(phi::dynload::ncclBcast(`
`153`	`152`	`src_ptr, src_tensor->numel(), nccl_dtype, 0, comm->comm(), stream));`
`154`	`153`	`}`