From dca1b4b1a3c1f43a4d31a4867d571cc77a9122d3 Mon Sep 17 00:00:00 2001
From: will-jl944 <lujiafeng@baidu.com>
Date: Thu, 2 Dec 2021 10:12:16 +0800
Subject: [PATCH] fix assertion bug (#4773)

---
 ppdet/modeling/backbones/lite_hrnet.py | 25 +++++++++----------------
 ppdet/modeling/ops.py                  |  3 +--
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/ppdet/modeling/backbones/lite_hrnet.py b/ppdet/modeling/backbones/lite_hrnet.py
index da98be3a4..f14aae8e2 100644
--- a/ppdet/modeling/backbones/lite_hrnet.py
+++ b/ppdet/modeling/backbones/lite_hrnet.py
@@ -44,10 +44,8 @@ class ConvNormLayer(nn.Layer):
         self.act = act
         norm_lr = 0. if freeze_norm else 1.
         if norm_type is not None:
-            assert (
-                norm_type in ['bn', 'sync_bn', 'gn'],
-                "norm_type should be one of ['bn', 'sync_bn', 'gn'], but got {}".
-                format(norm_type))
+            assert norm_type in ['bn', 'sync_bn', 'gn'],\
+                "norm_type should be one of ['bn', 'sync_bn', 'gn'], but got {}".format(norm_type)
             param_attr = ParamAttr(
                 initializer=Constant(1.0),
                 learning_rate=norm_lr,
@@ -273,10 +271,8 @@ class ShuffleUnit(nn.Layer):
         branch_channel = out_channel // 2
         self.stride = stride
         if self.stride == 1:
-            assert (
-                in_channel == branch_channel * 2,
-                "when stride=1, in_channel {} should equal to branch_channel*2 {}"
-                .format(in_channel, branch_channel * 2))
+            assert in_channel == branch_channel * 2,\
+                "when stride=1, in_channel {} should equal to branch_channel*2 {}".format(in_channel, branch_channel * 2)
         if stride > 1:
             self.branch1 = nn.Sequential(
                 ConvNormLayer(
@@ -496,11 +492,10 @@ class LiteHRNetModule(nn.Layer):
                  freeze_norm=False,
                  norm_decay=0.):
         super(LiteHRNetModule, self).__init__()
-        assert (num_branches == len(in_channels),
-                "num_branches {} should equal to num_in_channels {}"
-                .format(num_branches, len(in_channels)))
-        assert (module_type in ['LITE', 'NAIVE'],
-                "module_type should be one of ['LITE', 'NAIVE']")
+        assert num_branches == len(in_channels),\
+            "num_branches {} should equal to num_in_channels {}".format(num_branches, len(in_channels))
+        assert module_type in ['LITE', 'NAIVE'],\
+            "module_type should be one of ['LITE', 'NAIVE']"
         self.num_branches = num_branches
         self.in_channels = in_channels
         self.multiscale_output = multiscale_output
@@ -695,10 +690,8 @@ class LiteHRNet(nn.Layer):
         super(LiteHRNet, self).__init__()
         if isinstance(return_idx, Integral):
             return_idx = [return_idx]
-        assert (
-            network_type in ["lite_18", "lite_30", "naive", "wider_naive"],
+        assert network_type in ["lite_18", "lite_30", "naive", "wider_naive"],\
             "the network_type should be one of [lite_18, lite_30, naive, wider_naive]"
-        )
         assert len(return_idx) > 0, "need one or more return index"
         self.freeze_at = freeze_at
         self.freeze_norm = freeze_norm
diff --git a/ppdet/modeling/ops.py b/ppdet/modeling/ops.py
index ba4321e6b..593d8dd37 100644
--- a/ppdet/modeling/ops.py
+++ b/ppdet/modeling/ops.py
@@ -1592,8 +1592,7 @@ def smooth_l1(input, label, inside_weight=None, outside_weight=None,
 
 def channel_shuffle(x, groups):
     batch_size, num_channels, height, width = x.shape[0:4]
-    assert (num_channels % groups == 0,
-            'num_channels should be divisible by groups')
+    assert num_channels % groups == 0, 'num_channels should be divisible by groups'
     channels_per_group = num_channels // groups
     x = paddle.reshape(
         x=x, shape=[batch_size, groups, channels_per_group, height, width])
-- 
GitLab