[Refactor] Rename mmselfsup.data to mmselfsup.structures (#385)

mmselfsup/datasets/transforms/formatting.py

@@ -7,8 +7,8 @@ from mmcv.transforms import to_tensor
 from mmcv.transforms.base import BaseTransform
 from mmengine.data import InstanceData, LabelData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import TRANSFORMS
+from mmselfsup.structures import SelfSupDataSample
 
 
 @TRANSFORMS.register_module()

mmselfsup/models/algorithms/barlowtwins.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Tuple
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/base.py

@@ -5,8 +5,8 @@ import torch
 from mmengine.model import BaseModel as _BaseModel
 from torch import nn
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 
 
 class BaseModel(_BaseModel):

mmselfsup/models/algorithms/byol.py

@@ -4,8 +4,8 @@ from typing import Dict, List, Optional, Tuple, Union
 import torch
 import torch.nn as nn
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from ..utils import CosineEMA
 from .base import BaseModel
 

mmselfsup/models/algorithms/cae.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Optional, Union
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/deepcluster.py

@@ -5,8 +5,8 @@ import torch
 import torch.nn as nn
 from mmengine.data import LabelData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/densecl.py

@@ -6,8 +6,8 @@ import torch.nn as nn
 from mmengine.data import BaseDataElement
 from mmengine.model import ExponentialMovingAverage
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from mmselfsup.utils import (batch_shuffle_ddp, batch_unshuffle_ddp,
                              concat_all_gather)
 from .base import BaseModel

mmselfsup/models/algorithms/mae.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Tuple
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/moco.py

@@ -5,8 +5,8 @@ import torch
 import torch.nn as nn
 from mmengine.model import ExponentialMovingAverage
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from mmselfsup.utils import (batch_shuffle_ddp, batch_unshuffle_ddp,
                              concat_all_gather)
 from .base import BaseModel

mmselfsup/models/algorithms/mocov3.py

@@ -4,8 +4,8 @@ from typing import Dict, List, Optional, Tuple, Union
 import torch
 import torch.nn as nn
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from ..utils import CosineEMA
 from .base import BaseModel
 

mmselfsup/models/algorithms/npid.py

@@ -4,8 +4,8 @@ from typing import Dict, List, Optional, Tuple, Union
 import torch
 import torch.nn as nn
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/odc.py

@@ -5,8 +5,8 @@ import torch
 import torch.nn as nn
 from mmengine.data import LabelData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/relative_loc.py

@@ -4,8 +4,8 @@ from typing import Dict, List, Tuple
 import torch
 from mmengine.data import LabelData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/rotation_pred.py

@@ -4,8 +4,8 @@ from typing import Dict, List, Tuple
 import torch
 from mmengine.data import LabelData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/simclr.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Tuple
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from ..utils import GatherLayer
 from .base import BaseModel
 

mmselfsup/models/algorithms/simmim.py

@@ -3,8 +3,8 @@ from typing import Dict, List
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/simsiam.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Tuple
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/algorithms/swav.py

@@ -3,8 +3,8 @@ from typing import Dict, List, Tuple
 
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 from .base import BaseModel
 
 

mmselfsup/models/heads/multi_cls_head.py

@@ -3,9 +3,9 @@ from typing import List, Sequence, Tuple, Union
 
 import torch
 import torch.nn as nn
-from mmcls.data import ClsDataSample
 from mmcls.evaluation.metrics import Accuracy
 from mmcls.models import ClsHead
+from mmcls.structures import ClsDataSample
 from mmcv.cnn import build_norm_layer
 from mmengine.data import LabelData
 

mmselfsup/utils/setup_env.py

@@ -17,11 +17,11 @@ def register_all_modules(init_default_scope: bool = True) -> None:
             https://github.com/open-mmlab/mmengine/blob/main/docs/en/tutorials/registry.md
             Defaults to True.
     """  # noqa
-    import mmselfsup.data  # noqa: F401,F403
     import mmselfsup.datasets  # noqa: F401,F403
     import mmselfsup.engine  # noqa: F401,F403
     import mmselfsup.evaluation  # noqa: F401,F403
     import mmselfsup.models  # noqa: F401,F403
+    import mmselfsup.structures  # noqa: F401,F403
     import mmselfsup.visualization  # noqa: F401,F403
 
     if init_default_scope:

mmselfsup/visualization/local_visualizer.py

@@ -7,8 +7,8 @@ from mmengine import Visualizer
 from mmengine.data import InstanceData
 from mmengine.dist import master_only
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.registry import VISUALIZERS
+from mmselfsup.structures import SelfSupDataSample
 
 
 @VISUALIZERS.register_module()

tests/test_engine/test_hooks/test_deepcluster_hook.py

@@ -6,8 +6,8 @@ import torch
 from mmengine.data import LabelData
 from torch.utils.data import Dataset
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.engine.hooks import DeepClusterHook
+from mmselfsup.structures import SelfSupDataSample
 
 num_classes = 5
 with_sobel = True,

tests/test_engine/test_hooks/test_densecl_hook.py

@@ -11,10 +11,10 @@ from mmengine.model import BaseModule
 from mmengine.optim import OptimWrapper
 from torch.utils.data import Dataset
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.engine import DenseCLHook
 from mmselfsup.models.algorithms import BaseModel
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 
 
 class DummyDataset(Dataset):

tests/test_engine/test_hooks/test_simsiam_hook.py

@@ -10,10 +10,10 @@ from mmengine.model import BaseModel as EngineBaseModel
 from mmengine.model import BaseModule
 from torch.utils.data import Dataset
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.engine import SimSiamHook
 from mmselfsup.models.algorithms import BaseModel
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 
 
 class DummyDataset(Dataset):

tests/test_engine/test_hooks/test_swav_hook.py

@@ -11,11 +11,11 @@ from mmengine.model import BaseModule
 from mmengine.optim import OptimWrapper
 from torch.utils.data import Dataset
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.engine import SwAVHook
 from mmselfsup.models.algorithms import BaseModel
 from mmselfsup.models.heads import SwAVHead
 from mmselfsup.registry import MODELS
+from mmselfsup.structures import SelfSupDataSample
 
 
 class DummyDataset(Dataset):

tests/test_models/test_algorithms/test_barlowtwins.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.barlowtwins import BarlowTwins
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_byol.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.byol import BYOL
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_cae.py

@@ -5,8 +5,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import CAE
+from mmselfsup.structures import SelfSupDataSample
 
 # model settings
 backbone = dict(type='CAEViT', arch='b', patch_size=16, init_values=0.1)

tests/test_models/test_algorithms/test_deepcluster.py

@@ -6,8 +6,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import DeepCluster
+from mmselfsup.structures import SelfSupDataSample
 
 num_classes = 5
 with_sobel = True,

tests/test_models/test_algorithms/test_densecl.py

@@ -7,8 +7,8 @@ import pytest
 import torch
 
 import mmselfsup
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.densecl import DenseCL
+from mmselfsup.structures import SelfSupDataSample
 
 queue_len = 32
 feat_dim = 2

tests/test_models/test_algorithms/test_mae.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.mae import MAE
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(type='MAEViT', arch='b', patch_size=16, mask_ratio=0.75)
 neck = dict(

tests/test_models/test_algorithms/test_moco.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import MoCo
+from mmselfsup.structures import SelfSupDataSample
 
 queue_len = 32
 feat_dim = 2

tests/test_models/test_algorithms/test_mocov3.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models import MoCoV3
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='MoCoV3ViT',

tests/test_models/test_algorithms/test_npid.py

@@ -6,8 +6,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import NPID
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_odc.py

@@ -6,8 +6,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import ODC
+from mmselfsup.structures import SelfSupDataSample
 
 num_classes = 5
 backbone = dict(

tests/test_models/test_algorithms/test_relative_loc.py

@@ -5,8 +5,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.relative_loc import RelativeLoc
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_rotation_pred.py

@@ -6,8 +6,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.rotation_pred import RotationPred
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_simclr.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.simclr import SimCLR
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_simmim.py

@@ -5,8 +5,8 @@ import pytest
 import torch
 from mmengine.data import InstanceData
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import SimMIM
+from mmselfsup.structures import SelfSupDataSample
 
 
 @pytest.mark.skipif(platform.system() == 'Windows', reason='Windows mem limit')

tests/test_models/test_algorithms/test_simsiam.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms import SimSiam
+from mmselfsup.structures import SelfSupDataSample
 
 backbone = dict(
     type='ResNet',

tests/test_models/test_algorithms/test_swav.py

@@ -5,8 +5,8 @@ import platform
 import pytest
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.algorithms.swav import SwAV
+from mmselfsup.structures import SelfSupDataSample
 
 nmb_crops = [2, 6]
 backbone = dict(

tests/test_models/test_heads/test_multi_cls_head.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmcls.data import ClsDataSample
+from mmcls.structures import ClsDataSample
 
 from mmselfsup.models.heads import MultiClsHead
 

tests/test_models/test_utils/test_data_preprocessor.py

@@ -1,8 +1,8 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import torch
 
-from mmselfsup.data import SelfSupDataSample
 from mmselfsup.models.utils import SelfSupDataPreprocessor
+from mmselfsup.structures import SelfSupDataSample
 
 
 def test_selfsup_data_preprocessor():

tests/test_structures/test_selfsup_data_sample.py

@@ -6,7 +6,7 @@ import torch
 # TODO: will use real PixelData once it is added in mmengine
 from mmengine.data import InstanceData, LabelData
 
-from mmselfsup.data import SelfSupDataSample
+from mmselfsup.structures import SelfSupDataSample
 
 
 def _equal(a, b):

tests/test_visualization/test_local_visualizer.py

@@ -8,7 +8,7 @@ import torch
 from mmengine.data import InstanceData
 from mmengine.utils import digit_version
 
-from mmselfsup.data import SelfSupDataSample
+from mmselfsup.structures import SelfSupDataSample
 from mmselfsup.visualization import SelfSupLocalVisualizer