Rename `LoadAnnotation` to `LoadAnnotations` (#1850)

docs/zh_cn/understand_mmcv/data_transform.md

@@ -74,7 +74,7 @@ dataset = dict(
 | class                         | 功能                                      |
 | :---------------------------: | :---------------------------------------: |
 | [`LoadImageFromFile`](TODO)   | 根据路径加载图像                          |
-| [`LoadAnnotation`](TODO)      | 加载和组织标注信息，如 bbox、语义分割图等 |
+| [`LoadAnnotations`](TODO)      | 加载和组织标注信息，如 bbox、语义分割图等 |
 
 ### 数据预处理及增强
 

mmcv/transforms/__init__.py

 # Copyright (c) OpenMMLab. All rights reserved.
 from .builder import TRANSFORMS
-from .loading import LoadAnnotation, LoadImageFromFile
+from .loading import LoadAnnotations, LoadImageFromFile
 from .processing import (CenterCrop, MultiScaleFlipAug, Normalize, Pad,
                          RandomChoiceResize, RandomFlip, RandomGrayscale,
                          RandomResize, Resize)
@@ -11,7 +11,7 @@ try:
 except ImportError:
     __all__ = [
         'TRANSFORMS', 'TransformBroadcaster', 'Compose', 'RandomChoice',
-        'KeyMapper', 'LoadImageFromFile', 'LoadAnnotation', 'Normalize',
+        'KeyMapper', 'LoadImageFromFile', 'LoadAnnotations', 'Normalize',
         'Resize', 'Pad', 'RandomFlip', 'RandomChoiceResize', 'CenterCrop',
         'RandomGrayscale', 'MultiScaleFlipAug', 'RandomResize'
     ]
@@ -20,7 +20,7 @@ else:
 
     __all__ = [
         'TRANSFORMS', 'TransformBroadcaster', 'Compose', 'RandomChoice',
-        'KeyMapper', 'LoadImageFromFile', 'LoadAnnotation', 'Normalize',
+        'KeyMapper', 'LoadImageFromFile', 'LoadAnnotations', 'Normalize',
         'Resize', 'Pad', 'ToTensor', 'to_tensor', 'ImageToTensor',
         'RandomFlip', 'RandomChoiceResize', 'CenterCrop', 'RandomGrayscale',
         'MultiScaleFlipAug', 'RandomResize'

mmcv/transforms/loading.py

@@ -84,7 +84,7 @@ class LoadImageFromFile(BaseTransform):
         return repr_str
 
 
-class LoadAnnotation(BaseTransform):
+class LoadAnnotations(BaseTransform):
     """Load and process the ``instances`` and ``seg_map`` annotation provided
     by dataset.
 

tests/test_transforms/test_transforms_loading.py

@@ -4,7 +4,7 @@ import os.path as osp
 
 import numpy as np
 
-from mmcv.transforms import LoadAnnotation, LoadImageFromFile
+from mmcv.transforms import LoadAnnotations, LoadImageFromFile
 
 
 class TestLoadImageFromFile:
@@ -44,7 +44,7 @@ class TestLoadImageFromFile:
         assert results['img'].dtype == np.uint8
 
 
-class TestLoadAnnotation:
+class TestLoadAnnotations:
 
     def setup_class(cls):
         data_prefix = osp.join(osp.dirname(__file__), '../data')
@@ -64,7 +64,7 @@ class TestLoadAnnotation:
         }
 
     def test_load_bboxes(self):
-        transform = LoadAnnotation(
+        transform = LoadAnnotations(
             with_bbox=True,
             with_label=False,
             with_seg=False,
@@ -76,7 +76,7 @@ class TestLoadAnnotation:
                                                   [10, 10, 110, 120]])).all()
 
     def test_load_labels(self):
-        transform = LoadAnnotation(
+        transform = LoadAnnotations(
             with_bbox=False,
             with_label=True,
             with_seg=False,
@@ -87,7 +87,7 @@ class TestLoadAnnotation:
         assert (results['gt_bboxes_labels'] == np.array([1, 2])).all()
 
     def test_load_kps(self):
-        transform = LoadAnnotation(
+        transform = LoadAnnotations(
             with_bbox=False,
             with_label=False,
             with_seg=False,
@@ -99,7 +99,7 @@ class TestLoadAnnotation:
                                                      [[4, 5, 6]]])).all()
 
     def test_load_seg_map(self):
-        transform = LoadAnnotation(
+        transform = LoadAnnotations(
             with_bbox=False,
             with_label=False,
             with_seg=True,
@@ -110,14 +110,14 @@ class TestLoadAnnotation:
         assert results['gt_seg_map'].shape[:2] == (300, 400)
 
     def test_repr(self):
-        transform = LoadAnnotation(
+        transform = LoadAnnotations(
             with_bbox=True,
             with_label=False,
             with_seg=False,
             with_keypoints=False,
         )
         assert repr(transform) == (
-            'LoadAnnotation(with_bbox=True, '
+            'LoadAnnotations(with_bbox=True, '
             'with_label=False, with_seg=False, '
             "with_keypoints=False, imdecode_backend='cv2', "
             "file_client_args={'backend': 'disk'})")