From 66bc759d8964e3c4ba0c7821d11f7236f7f8b3b2 Mon Sep 17 00:00:00 2001 From: fields1631 Date: Sat, 25 Jun 2022 13:03:52 +0800 Subject: [PATCH 1/2] fix conflit between tutel and top-2 gate --- deepspeed/moe/sharded_moe.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deepspeed/moe/sharded_moe.py b/deepspeed/moe/sharded_moe.py index e6cd7e55ac25..cf5ca3fe0886 100644 --- a/deepspeed/moe/sharded_moe.py +++ b/deepspeed/moe/sharded_moe.py @@ -474,13 +474,16 @@ def __init__(self, self.timers = SynchronizedWallClockTimer() self.wall_clock_breakdown = False - self.use_tutel = use_tutel and TUTEL_INSTALLED + self.use_tutel = use_tutel and TUTEL_INSTALLED and gate.k == 1 if self.use_tutel: logger.info('Using Tutel optimizations.') elif use_tutel and not TUTEL_INSTALLED: logger.warning("Tutel optimization requested but not installed. " "Proceeding without Tutel.") + elif use_tutel and TUTEL_INSTALLED and gate.k != 1: + logger.warning("To enable Tutel optimization, use top-1 instead of top-2 gate." + "Proceeding without Tutel.") def _set_ep_group(self, ep_group): self.ep_group = ep_group From 81ea83c5321c11a7a3cfa805c814d767689c75a1 Mon Sep 17 00:00:00 2001 From: yetiansh Date: Thu, 30 Jun 2022 08:05:31 +0800 Subject: [PATCH 2/2] lint --- deepspeed/moe/sharded_moe.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deepspeed/moe/sharded_moe.py b/deepspeed/moe/sharded_moe.py index cf5ca3fe0886..99188fb0969c 100644 --- a/deepspeed/moe/sharded_moe.py +++ b/deepspeed/moe/sharded_moe.py @@ -482,8 +482,9 @@ def __init__(self, logger.warning("Tutel optimization requested but not installed. " "Proceeding without Tutel.") elif use_tutel and TUTEL_INSTALLED and gate.k != 1: - logger.warning("To enable Tutel optimization, use top-1 instead of top-2 gate." - "Proceeding without Tutel.") + logger.warning( + "To enable Tutel optimization, use top-1 instead of top-2 gate. " + "Proceeding without Tutel.") def _set_ep_group(self, ep_group): self.ep_group = ep_group