Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions paddle/fluid/distributed/collective/deep_ep/event.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ struct EventHandle {
event->record(stream);
}

explicit EventHandle(const phi::CUDAStream& stream) {
event = std::make_shared<deep_ep::detail::Event>();
event->record(stream.raw_stream());
}

EventHandle(const EventHandle& other) = default;

void current_stream_wait() const {
Expand All @@ -57,6 +62,7 @@ struct EventHandle {

EventHandle GetEventHandleFromCalcStream(int context_ring_id);
EventHandle GetEventHandleFromCommStream(int context_ring_id);
EventHandle GetEventHandleFromCustomStream(const phi::CUDAStream& stream);

inline deep_ep::detail::Event create_event(const cudaStream_t& s) {
auto event = deep_ep::detail::Event();
Expand Down
4 changes: 4 additions & 0 deletions paddle/fluid/distributed/collective/deep_ep/src/event.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@ EventHandle GetEventHandleFromCalcStream(int context_ring_id) {
EventHandle GetEventHandleFromCommStream(int context_ring_id) {
return EventHandle(detail::GetCommStreamFromGroup(context_ring_id));
}

EventHandle GetEventHandleFromCustomStream(const phi::CUDAStream& stream) {
return EventHandle(stream);
}
} // namespace deep_ep
3 changes: 3 additions & 0 deletions paddle/fluid/pybind/deep_ep_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ void BindDeepEPApi(pybind11::module *m) {
m->def("get_event_handle_from_comm_stream",
&deep_ep::GetEventHandleFromCommStream);

m->def("get_event_handle_from_custom_stream",
&deep_ep::GetEventHandleFromCustomStream);

pybind11::class_<deep_ep::Buffer>(*m, "Buffer")
.def(pybind11::init<int, int, int64_t, int64_t, bool, int>())
.def("is_available", &deep_ep::Buffer::is_available)
Expand Down
2 changes: 2 additions & 0 deletions python/paddle/distributed/communication/deep_ep/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
EventOverlap,
get_event_from_calc_stream,
get_event_from_comm_stream,
get_event_from_custom_stream,
)

__all__ = [
Expand All @@ -27,4 +28,5 @@
"Config",
"get_event_from_calc_stream",
"get_event_from_comm_stream",
"get_event_from_custom_stream",
]
6 changes: 6 additions & 0 deletions python/paddle/distributed/communication/deep_ep/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,9 @@ def get_event_from_comm_stream(group_id: int) -> EventOverlap:
return EventOverlap(
event=paddle.base.core.get_event_handle_from_comm_stream(group_id)
)


def get_event_from_custom_stream(stream) -> EventOverlap:
return EventOverlap(
event=paddle.base.core.get_event_handle_from_custom_stream(stream)
)
3 changes: 2 additions & 1 deletion python/paddle/distributed/fleet/meta_parallel/dualpipev.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def _forward_backward_compute(
_, backward_grads = self._get_backward_inputs(
backward_phase, backward_acc_id
)

event_to_wait = paddle.device.current_stream().record_event()
# forward & backward
forward_chunk = self._layers.get_schedule_chunk(chunk_id=forward_phase)
backward_chunk = self.schedule_chunks[backward_phase][backward_acc_id]
Expand All @@ -309,6 +309,7 @@ def _forward_backward_compute(
backward_loss_fn_node,
backward_grads,
self.scaler,
event_to_wait,
)
)
self.schedule_chunks[backward_phase][backward_acc_id] = None
Expand Down