[Bug fix] Fixed ADE20k test (open-mmlab#359)

* [Bug fix] Fixed ADE20k test

* fixed ade cfg

Author: xvjiarui

configs/apcnet/apcnet_r50-d8_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/apcnet/apcnet_r50-d8_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/deeplabv3/deeplabv3_r50-d8_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/deeplabv3/deeplabv3_r50-d8_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/deeplabv3plus/deeplabv3plus_r50-d8_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/deeplabv3plus/deeplabv3plus_r50-d8_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/dmnet/dmnet_r50-d8_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/dmnet/dmnet_r50-d8_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/fcn/fcn_r50-d8_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/fcn/fcn_r50-d8_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/psanet/psanet_r50-d8_512x512_160k_ade20k.py

@@ -5,4 +5,3 @@
 model = dict(
     decode_head=dict(mask_size=(66, 66), num_classes=150),
     auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/psanet/psanet_r50-d8_512x512_80k_ade20k.py

@@ -5,4 +5,3 @@
 model = dict(
     decode_head=dict(mask_size=(66, 66), num_classes=150),
     auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/pspnet/pspnet_r50-d8_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/pspnet/pspnet_r50-d8_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/upernet/upernet_r50_512x512_160k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

configs/upernet/upernet_r50_512x512_80k_ade20k.py

@@ -4,4 +4,3 @@
 ]
 model = dict(
     decode_head=dict(num_classes=150), auxiliary_head=dict(num_classes=150))
-test_cfg = dict(mode='whole')

mmseg/core/evaluation/metrics.py

@@ -34,15 +34,15 @@ def intersect_and_union(pred_label,
 
     if isinstance(label, str):
         label = mmcv.imread(label, flag='unchanged', backend='pillow')
-        # modify if custom classes
-        if label_map is not None:
-            for old_id, new_id in label_map.items():
-                label[label == old_id] = new_id
-        if reduce_zero_label:
-            # avoid using underflow conversion
-            label[label == 0] = 255
-            label = label - 1
-            label[label == 254] = 255
+    # modify if custom classes
+    if label_map is not None:
+        for old_id, new_id in label_map.items():
+            label[label == old_id] = new_id
+    if reduce_zero_label:
+        # avoid using underflow conversion
+        label[label == 0] = 255
+        label = label - 1
+        label[label == 254] = 255
 
     mask = (label != ignore_index)
     pred_label = pred_label[mask]