Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cuda device max connection with event create flag #5

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix cuda device max connection with event create flag #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c612e36
Fix Device Event Creation
eee4017 Sep 21, 2023
a397713
Fix Device Event Test
eee4017 Sep 21, 2023
7b5628e
fix compilation error of device_event_test.cc under ROCM
Sep 22, 2023
9758c33
fix style
Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions paddle/fluid/distributed/collective/process_group_nccl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ProcessGroupNCCL::NCCLTask::NCCLTask(const Place& place,
bool sync_op,
bool use_calc_stream)
: TaskStream(rank, comm_type, sync_op, use_calc_stream),
comm_event_(place),
comm_event_(place, platform::GenerateDeviceEventFlag()),
task_place_(place) {}

ProcessGroupNCCL::NCCLTask::~NCCLTask() = default;
Expand Down Expand Up @@ -506,7 +506,9 @@ void ProcessGroupNCCL::CreateNCCLEnvCache(const Place& place,
auto nccl_comm_ctx = this->GetCommContext();
comm_ctx->set_nccl_comm(nccl_comm_ctx->GetNcclComm());

place_to_calc_event_.emplace(place_key, place);
place_to_calc_event_.emplace(
place_key,
platform::DeviceEvent(place, platform::GenerateDeviceEventFlag()));
place_to_calc_ctx_.emplace(place_key, calc_ctx);
place_to_comm_ctx_.emplace(place_key, std::move(comm_ctx));

Expand Down Expand Up @@ -592,7 +594,7 @@ ProcessGroupNCCL::NCCLTask::NCCLTask(
CommType CommType,
const std::vector<phi::DenseTensor>& inputs)
: TaskStream(rank, inputs, CommType),
comm_event_(places[0]),
comm_event_(places[0], platform::GenerateDeviceEventFlag()),
task_place_(places[0]) {}

// create NCCLManager cache for places_key
Expand Down Expand Up @@ -636,7 +638,9 @@ void ProcessGroupNCCL::CreateNCCLManagerCache(
GroupEnd();

// TODO(sunyilun): for compatibility, will be removed later
place_to_calc_event_.emplace(places_key, places[0]);
place_to_calc_event_.emplace(
places_key,
platform::DeviceEvent(places[0], platform::GenerateDeviceEventFlag()));
place_to_calc_ctx_.emplace(
places_key,
static_cast<phi::GPUContext*>(
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/platform/device_event_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum EventStatus {

class DeviceEvent {
public:
explicit DeviceEvent(const platform::Place& place, unsigned int flag = 0)
explicit DeviceEvent(const platform::Place& place, unsigned int flag)
: event_(), place_(place), flag_(flag) {
type_id_ = DeviceTypeToId(platform::Place2DeviceType(place));
PADDLE_ENFORCE_LT(type_id_,
Expand Down
7 changes: 4 additions & 3 deletions paddle/fluid/platform/device_event_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ TEST(DeviceEvent, CUDA) {

ASSERT_NE(context, nullptr);
// case 1. test for event_creator
DeviceEvent event(place);
DeviceEvent event(place, paddle::platform::GenerateDeviceEventFlag());
ASSERT_NE(event.GetEvent().get(), nullptr);
bool status = event.Query();
ASSERT_EQ(status, true);
Expand Down Expand Up @@ -85,8 +85,9 @@ TEST(DeviceEvent, CUDA) {
auto* context = static_cast<phi::GPUContext*>(pool.Get(place));

ASSERT_NE(context, nullptr);

// case 1. test for event_creator
DeviceEvent event(place);
DeviceEvent event(place, paddle::platform::GenerateDeviceEventFlag());
ASSERT_NE(event.GetEvent().get(), nullptr);
bool status = event.Query();
ASSERT_EQ(status, true);
Expand Down Expand Up @@ -127,7 +128,7 @@ TEST(DeviceEvent, CUDA) {
TEST(DeviceEvent, CPU) {
using paddle::platform::CPUPlace;
auto place = CPUPlace();
DeviceEvent event(place);
DeviceEvent event(place, paddle::platform::GenerateDeviceEventFlag());
auto& pool = DeviceContextPool::Instance();
auto* context = pool.Get(place);

Expand Down