From 39b42238ffd93ff76b91f181b9b03c41f619fbe0 Mon Sep 17 00:00:00 2001 From: caojian05 Date: Fri, 2 Jul 2021 17:18:03 +0800 Subject: [PATCH] fix model zoo fossid check failed --- .../official/cv/FCN8s/src/utils/lr_scheduler.py | 16 +++++++--------- .../official/cv/centerface/src/lr_scheduler.py | 16 +++++++--------- .../cv/densenet/src/lr_scheduler/lr_scheduler.py | 16 +++++++--------- model_zoo/research/nlp/dscnn/src/lr_scheduler.py | 16 +++++++--------- 4 files changed, 28 insertions(+), 36 deletions(-) diff --git a/model_zoo/official/cv/FCN8s/src/utils/lr_scheduler.py b/model_zoo/official/cv/FCN8s/src/utils/lr_scheduler.py index ab919170f59..bf9920f1779 100644 --- a/model_zoo/official/cv/FCN8s/src/utils/lr_scheduler.py +++ b/model_zoo/official/cv/FCN8s/src/utils/lr_scheduler.py @@ -436,15 +436,13 @@ class CyclicLR(_LRScheduler): self.gamma = gamma if scale_fn is None: - if self.mode == 'triangular': - self.scale_fn = self._triangular_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'triangular2': - self.scale_fn = self._triangular2_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'exp_range': - self.scale_fn = self._exp_range_scale_fn - self.scale_mode = 'iterations' + mode_map = { + 'triangular': ['cycle', self._triangular_scale_fn], + 'triangular2': ['cycle', self._triangular2_scale_fn], + 'exp_range': ['iterations', self._exp_range_scale_fn] + } + self.scale_mode = mode_map.get(self.mode)[0] + self.scale_fn = mode_map.get(self.mode)[1] else: self.scale_fn = scale_fn self.scale_mode = scale_mode diff --git a/model_zoo/official/cv/centerface/src/lr_scheduler.py b/model_zoo/official/cv/centerface/src/lr_scheduler.py index 588207afa32..23ada599a9d 100644 --- a/model_zoo/official/cv/centerface/src/lr_scheduler.py +++ b/model_zoo/official/cv/centerface/src/lr_scheduler.py @@ -484,15 +484,13 @@ class CyclicLR(_LRScheduler): self.gamma = gamma if scale_fn is None: - if self.mode == 'triangular': - self.scale_fn = self._triangular_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'triangular2': - self.scale_fn = self._triangular2_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'exp_range': - self.scale_fn = self._exp_range_scale_fn - self.scale_mode = 'iterations' + mode_map = { + 'triangular': ['cycle', self._triangular_scale_fn], + 'triangular2': ['cycle', self._triangular2_scale_fn], + 'exp_range': ['iterations', self._exp_range_scale_fn] + } + self.scale_mode = mode_map.get(self.mode)[0] + self.scale_fn = mode_map.get(self.mode)[1] else: self.scale_fn = scale_fn self.scale_mode = scale_mode diff --git a/model_zoo/official/cv/densenet/src/lr_scheduler/lr_scheduler.py b/model_zoo/official/cv/densenet/src/lr_scheduler/lr_scheduler.py index db75492e5d1..cd7c165c059 100644 --- a/model_zoo/official/cv/densenet/src/lr_scheduler/lr_scheduler.py +++ b/model_zoo/official/cv/densenet/src/lr_scheduler/lr_scheduler.py @@ -436,15 +436,13 @@ class CyclicLR(_LRScheduler): self.gamma = gamma if scale_fn is None: - if self.mode == 'triangular': - self.scale_fn = self._triangular_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'triangular2': - self.scale_fn = self._triangular2_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'exp_range': - self.scale_fn = self._exp_range_scale_fn - self.scale_mode = 'iterations' + mode_map = { + 'triangular': ['cycle', self._triangular_scale_fn], + 'triangular2': ['cycle', self._triangular2_scale_fn], + 'exp_range': ['iterations', self._exp_range_scale_fn] + } + self.scale_mode = mode_map.get(self.mode)[0] + self.scale_fn = mode_map.get(self.mode)[1] else: self.scale_fn = scale_fn self.scale_mode = scale_mode diff --git a/model_zoo/research/nlp/dscnn/src/lr_scheduler.py b/model_zoo/research/nlp/dscnn/src/lr_scheduler.py index 3497cf5e549..f3241555990 100644 --- a/model_zoo/research/nlp/dscnn/src/lr_scheduler.py +++ b/model_zoo/research/nlp/dscnn/src/lr_scheduler.py @@ -485,15 +485,13 @@ class CyclicLR(_LRScheduler): self.gamma = gamma if scale_fn is None: - if self.mode == 'triangular': - self.scale_fn = self._triangular_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'triangular2': - self.scale_fn = self._triangular2_scale_fn - self.scale_mode = 'cycle' - elif self.mode == 'exp_range': - self.scale_fn = self._exp_range_scale_fn - self.scale_mode = 'iterations' + mode_map = { + 'triangular': ['cycle', self._triangular_scale_fn], + 'triangular2': ['cycle', self._triangular2_scale_fn], + 'exp_range': ['iterations', self._exp_range_scale_fn] + } + self.scale_mode = mode_map.get(self.mode)[0] + self.scale_fn = mode_map.get(self.mode)[1] else: self.scale_fn = scale_fn self.scale_mode = scale_mode