Skip to content

fix #2240: wrong time unit in flops_profiler #2241

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

Merged
jeffra merged 6 commits into from
Aug 25, 2022
Merged

fix #2240: wrong time unit in flops_profiler #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3875b33
fix #2240: wrong time unit in flops_profiler
yzs981130 Aug 19, 2022
92e8ba8
Merge branch 'master' into fix_profiling_time
tjruwase Aug 19, 2022
535c0b6
fix #2240: make yapf happy
yzs981130 Aug 20, 2022
42c5b2e
Merge branch 'master' into fix_profiling_time
tjruwase Aug 22, 2022
ff6d88b
Merge branch 'master' into fix_profiling_time
tjruwase Aug 23, 2022
71faf49
Merge branch 'master' into fix_profiling_time
jeffra Aug 25, 2022
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
8 changes: 4 additions & 4 deletions deepspeed/moe/sharded_moe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def forward(

if self.wall_clock_breakdown:
self.timers('TopKGate').stop()
self.gate_time = self.timers('TopKGate').elapsed(reset=False) * 1000
self.gate_time = self.timers('TopKGate').elapsed(reset=False)

return gate_output

Expand Down Expand Up @@ -535,7 +535,7 @@ def forward(self, *input: Tensor, **kwargs: Any) -> Tensor:

if self.wall_clock_breakdown:
self.timers('falltoall').stop()
self.time_falltoall = self.timers('falltoall').elapsed(reset=False) * 1000
self.time_falltoall = self.timers('falltoall').elapsed(reset=False)

# Re-shape after all-to-all: ecm -> gecm
dispatched_input = dispatched_input.reshape(self.ep_size,
Expand All @@ -552,7 +552,7 @@ def forward(self, *input: Tensor, **kwargs: Any) -> Tensor:

if self.wall_clock_breakdown:
self.timers('salltoall').stop()
self.time_salltoall = self.timers('salltoall').elapsed(reset=False) * 1000
self.time_salltoall = self.timers('salltoall').elapsed(reset=False)

# Re-shape back: gecm -> ecm
expert_output = expert_output.reshape(self.ep_size * self.num_local_experts,
Expand All @@ -576,6 +576,6 @@ def forward(self, *input: Tensor, **kwargs: Any) -> Tensor:

if self.wall_clock_breakdown:
self.timers('moe').stop()
self.time_moe = self.timers('moe').elapsed(reset=False) * 1000
self.time_moe = self.timers('moe').elapsed(reset=False)

return a
15 changes: 6 additions & 9 deletions deepspeed/runtime/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2058,8 +2058,7 @@ def step(self, lr_kwargs=None):
self._write_monitor()

if self.has_moe_layers:
fwd_time = self.timers(FORWARD_GLOBAL_TIMER).elapsed(
reset=False) * 1000
fwd_time = self.timers(FORWARD_GLOBAL_TIMER).elapsed(reset=False)
self.print_forward_breakdown(fwd_time=fwd_time)

self.timers.log(self.engine_timers.global_timers)
Expand Down Expand Up @@ -2103,29 +2102,27 @@ def _write_monitor(self):
self.summary_events = [
(
f"Train/Samples/elapsed_time_ms_forward",
self.timers(FORWARD_GLOBAL_TIMER).elapsed(reset=False) * 1000.0,
self.timers(FORWARD_GLOBAL_TIMER).elapsed(reset=False),
self.global_samples,
),
(
f"Train/Samples/elapsed_time_ms_backward",
self.timers(BACKWARD_GLOBAL_TIMER).elapsed(reset=False) * 1000.0,
self.timers(BACKWARD_GLOBAL_TIMER).elapsed(reset=False),
self.global_samples,
),
(
f"Train/Samples/elapsed_time_ms_backward_inner",
self.timers(BACKWARD_INNER_GLOBAL_TIMER).elapsed(reset=False) *
1000.0,
self.timers(BACKWARD_INNER_GLOBAL_TIMER).elapsed(reset=False),
self.global_samples,
),
(
f"Train/Samples/elapsed_time_ms_backward_allreduce",
self.timers(BACKWARD_REDUCE_GLOBAL_TIMER).elapsed(reset=False) *
1000.0,
self.timers(BACKWARD_REDUCE_GLOBAL_TIMER).elapsed(reset=False),
self.global_samples,
),
(
f"Train/Samples/elapsed_time_ms_step",
self.timers(STEP_GLOBAL_TIMER).elapsed(reset=False) * 1000.0,
self.timers(STEP_GLOBAL_TIMER).elapsed(reset=False),
self.global_samples,
),
]
Expand Down