diff --git a/deepspeed/moe/sharded_moe.py b/deepspeed/moe/sharded_moe.py index 727b2baec0a642fec82eed987bc338eb27bdb661..211b2127b026db48cc63092f9bdaf72e50681e20 100644 --- a/deepspeed/moe/sharded_moe.py +++ b/deepspeed/moe/sharded_moe.py @@ -431,7 +431,7 @@ class TopKGate(Module): 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 @@ -535,7 +535,7 @@ class MOELayer(Base): 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, @@ -552,7 +552,7 @@ class MOELayer(Base): 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, @@ -576,6 +576,6 @@ class MOELayer(Base): 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 diff --git a/deepspeed/runtime/engine.py b/deepspeed/runtime/engine.py index 24a171fcac5f0d8892f625c578c0f3b914ef6764..1fd7d7e964e84f2f5bca7313eb797b2c86fe0e3e 100644 --- a/deepspeed/runtime/engine.py +++ b/deepspeed/runtime/engine.py @@ -2058,8 +2058,7 @@ class DeepSpeedEngine(Module): 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) @@ -2103,29 +2102,27 @@ class DeepSpeedEngine(Module): 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, ), ]