remove all imports in easycv.utils.__init__ (#21)

benchmarks/tools/extract.py

@@ -15,9 +15,9 @@ from mmcv.runner import get_dist_info, init_dist, load_checkpoint
 from easycv.datasets import build_dataloader, build_dataset
 from easycv.file import io
 from easycv.models import build_model
-from easycv.utils import (dist_forward_collect, get_root_logger,
-                          nondist_forward_collect)
+from easycv.utils.collect import dist_forward_collect, nondist_forward_collect
 from easycv.utils.config_tools import mmcv_config_fromfile
+from easycv.utils.logger import get_root_logger
 
 
 def set_random_seed(seed, deterministic=True):

easycv/apis/train.py

@@ -20,7 +20,8 @@ from easycv.hooks import (BestCkptSaverHook, DistEvalHook, EMAHook, EvalHook,
                           ExportHook, OptimizerHook, OSSSyncHook, build_hook)
 from easycv.hooks.optimizer_hook import AMPFP16OptimizerHook
 from easycv.runner import EVRunner
-from easycv.utils import generate_best_metric_name, get_root_logger, print_log
+from easycv.utils.eval_utils import generate_best_metric_name
+from easycv.utils.logger import get_root_logger, print_log
 
 
 def set_random_seed(seed, deterministic=False):

easycv/core/evaluation/base_evaluator.py

@@ -3,7 +3,7 @@ from abc import ABCMeta, abstractmethod
 
 import six
 
-from easycv.utils import generate_best_metric_name
+from easycv.utils.eval_utils import generate_best_metric_name
 
 
 class Evaluator(six.with_metaclass(ABCMeta, object)):

easycv/core/evaluation/builder.py

@@ -1,6 +1,5 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from easycv.utils import build_from_cfg
-from easycv.utils.registry import Registry
+from easycv.utils.registry import Registry, build_from_cfg
 
 EVALUATORS = Registry('hook')
 

easycv/core/evaluation/retrival_topk_eval.py

@@ -7,8 +7,8 @@ import torch
 from sklearn.decomposition import PCA
 from tqdm import tqdm
 
-from easycv.utils import (CosineSimilarity, DotproductSimilarity, LpDistance,
-                          generate_best_metric_name)
+from easycv.utils.metric_distance import (CosineSimilarity,
+                                          DotproductSimilarity, LpDistance)
 from .base_evaluator import Evaluator
 from .builder import EVALUATORS
 from .metric_registry import METRICS

easycv/datasets/builder.py

@@ -3,7 +3,7 @@ import copy
 
 from easycv.datasets.shared.dataset_wrappers import (ConcatDataset,
                                                      RepeatDataset)
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 from .registry import DALIDATASETS, DATASETS, DATASOURCES
 
 

easycv/datasets/detection/data_sources/coco.py

@@ -4,7 +4,7 @@ from xtcocotools.coco import COCO
 
 from easycv.datasets.registry import DATASOURCES, PIPELINES
 from easycv.datasets.shared.pipelines import Compose
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 
 
 @DATASOURCES.register_module

easycv/datasets/detection/mix.py

@@ -9,8 +9,8 @@ import numpy as np
 import torch
 
 from easycv.datasets.registry import DATASETS, PIPELINES
-from easycv.utils import build_from_cfg
 from easycv.utils.bbox_util import xyxy2xywh as xyxy2cxcywh
+from easycv.utils.registry import build_from_cfg
 from .raw import DetDataset
 
 

easycv/datasets/registry.py

@@ -1,5 +1,5 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from easycv.utils import Registry
+from easycv.utils.registry import Registry
 
 DATASOURCES = Registry('datasource')
 DATASETS = Registry('dataset')

easycv/datasets/selfsup/pipelines/transforms.py

@@ -9,7 +9,7 @@ from timm.data import create_transform
 from torchvision import transforms as _transforms
 
 from easycv.datasets.registry import PIPELINES
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 
 
 @PIPELINES.register_module

easycv/datasets/shared/base.py

@@ -3,7 +3,7 @@ from abc import ABCMeta, abstractmethod
 
 from torch.utils.data import Dataset
 
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 from ..builder import build_datasource
 from ..registry import PIPELINES
 from .pipelines.transforms import Compose

easycv/datasets/shared/dali_tfrecord_imagenet.py

@@ -12,7 +12,8 @@ from easycv.datasets.builder import build_datasource
 from easycv.datasets.loader.sampler import DistributedSampler
 from easycv.datasets.registry import DATASETS, PIPELINES
 from easycv.datasets.shared.pipelines.transforms import Compose
-from easycv.utils import build_from_cfg, dist_utils
+from easycv.utils import dist_utils
+from easycv.utils.registry import build_from_cfg
 
 imagenet_feature = {
     'image/encoded': tfrec.FixedLenFeature((), tfrec.string, ''),

easycv/datasets/shared/dali_tfrecord_multi_view.py

@@ -11,7 +11,8 @@ from easycv.datasets.builder import build_datasource
 from easycv.datasets.loader.sampler import DistributedSampler
 from easycv.datasets.registry import DATASETS, PIPELINES
 from easycv.datasets.shared.pipelines.transforms import Compose
-from easycv.utils import build_from_cfg, dist_utils
+from easycv.utils import dist_utils
+from easycv.utils.registry import build_from_cfg
 
 imagenet_feature = {
     'image/encoded': tfrec.FixedLenFeature((), tfrec.string, ''),

easycv/datasets/shared/multi_view.py

@@ -9,7 +9,7 @@ from easycv.datasets.builder import build_datasource
 from easycv.datasets.registry import DATASETS, PIPELINES
 from easycv.datasets.shared.base import BaseDataset
 from easycv.datasets.shared.pipelines.transforms import Compose
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 
 
 @DATASETS.register_module

easycv/datasets/shared/pipelines/transforms.py

@@ -3,7 +3,7 @@ import time
 from collections.abc import Sequence
 
 from easycv.datasets.registry import PIPELINES
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 
 
 @PIPELINES.register_module()

easycv/hooks/best_ckpt_saver_hook.py

@@ -2,7 +2,7 @@
 from mmcv.runner import Hook
 from mmcv.runner.dist_utils import master_only
 
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from .registry import HOOKS
 
 

easycv/hooks/builder.py

@@ -1,5 +1,5 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 from .registry import HOOKS
 
 

easycv/hooks/extractor.py

@@ -2,7 +2,7 @@
 import torch.nn as nn
 from torch.utils.data import Dataset
 
-from easycv.utils import dist_forward_collect, nondist_forward_collect
+from easycv.utils.collect import dist_forward_collect, nondist_forward_collect
 
 
 class Extractor(object):

easycv/hooks/registry.py

@@ -1,4 +1,4 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from easycv.utils import Registry
+from easycv.utils.registry import Registry
 
 HOOKS = Registry('hook')

easycv/models/backbones/bninception.py

@@ -9,7 +9,8 @@ from mmcv.cnn import constant_init, kaiming_init
 from torch import nn
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import bninception as model_urls
 from ..registry import BACKBONES
 

easycv/models/backbones/genet.py

@@ -8,7 +8,8 @@ from mmcv.cnn import constant_init, kaiming_init
 from torch import nn
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import genet as model_urls
 from ..registry import BACKBONES
 

easycv/models/backbones/hrnet.py

@@ -8,8 +8,8 @@ from mmcv.cnn import (build_conv_layer, build_norm_layer, constant_init,
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from easycv.models.registry import BACKBONES
-from easycv.utils import get_root_logger
 from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from .resnet import BasicBlock
 
 

easycv/models/backbones/inceptionv3.py

@@ -11,7 +11,8 @@ import torch.nn.functional as F
 from mmcv.cnn import constant_init, kaiming_init
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import inceptionv3 as model_urls
 from ..registry import BACKBONES
 

easycv/models/backbones/lighthrnet.py

@@ -12,8 +12,8 @@ from mmcv.cnn import (ConvModule, DepthwiseSeparableConvModule,
 from torch.nn.modules.batchnorm import _BatchNorm
 
 from easycv.models.registry import BACKBONES
-from easycv.utils import get_root_logger
 from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 
 
 def channel_shuffle(x, groups):

easycv/models/backbones/mnasnet.py

@@ -6,7 +6,8 @@ r""" This model is taken from the official PyTorch model zoo.
 import torch
 from torch import nn
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import mnasnet as model_urls
 from ..registry import BACKBONES
 

easycv/models/backbones/mobilenetv2.py

@@ -5,7 +5,8 @@ r""" This model is taken from the official PyTorch model zoo.
 
 from torch import nn
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import mobilenetv2 as model_urls
 from ..registry import BACKBONES
 

easycv/models/backbones/pytorch_image_models_wrapper.py

@@ -5,7 +5,8 @@ import timm
 import torch
 import torch.nn as nn
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import timm_models as model_urls
 from ..registry import BACKBONES
 from .shuffle_transformer import (shuffletrans_base_p4_w7_224,

easycv/models/backbones/resnest.py

@@ -14,7 +14,8 @@ import torch.nn.functional as F
 from torch.nn import Conv2d, Module, ReLU
 from torch.nn.modules.utils import _pair
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..registry import BACKBONES
 
 

easycv/models/backbones/resnet.py

@@ -4,7 +4,8 @@ import torch.utils.checkpoint as cp
 from mmcv.cnn import constant_init, kaiming_init
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..modelzoo import resnet as model_urls
 from ..registry import BACKBONES
 from ..utils import FReLU, build_conv_layer, build_norm_layer

easycv/models/backbones/resnet_jit.py

@@ -7,7 +7,8 @@ from mmcv.cnn import constant_init, kaiming_init
 # from mmcv.runner import load_checkpoint
 from torch.nn.modules.batchnorm import _BatchNorm
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..registry import BACKBONES
 from ..utils import build_conv_layer, build_norm_layer
 

easycv/models/backbones/shuffle_transformer.py

@@ -7,7 +7,8 @@ from einops import rearrange
 from timm.models.layers import DropPath, trunc_normal_
 from torch import nn
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..registry import BACKBONES
 
 

easycv/models/backbones/swin_transformer_dynamic.py

@@ -16,7 +16,8 @@ import torch.nn as nn
 import torch.nn.functional as F
 from timm.models.layers import DropPath, to_2tuple, trunc_normal_
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..registry import BACKBONES
 
 

easycv/models/backbones/vit_transfomer_dynamic.py

@@ -15,7 +15,8 @@ import torch.nn as nn
 # from utils import trunc_normal_
 from timm.models.layers import trunc_normal_
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 
 
 def drop_path(x, drop_prob: float = 0., training: bool = False):

easycv/models/backbones/xcit_transformer.py

@@ -19,7 +19,8 @@ import torch.nn as nn
 from timm.models.layers import DropPath, to_2tuple, trunc_normal_
 from timm.models.vision_transformer import Mlp, _cfg
 
-from easycv.utils import get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
 from ..registry import BACKBONES
 
 

easycv/models/builder.py

@@ -1,7 +1,7 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 from torch import nn
 
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 from .registry import BACKBONES, HEADS, LOSSES, MEMORIES, MODELS, NECKS
 
 

easycv/models/classification/classification.py

@@ -7,8 +7,9 @@ import torch.nn as nn
 from mmcv.runner import get_dist_info
 from timm.data.mixup import Mixup
 
-from easycv.utils import (bninceptionPre, gaussianBlur, mixUpCls, print_log,
-                          randomErasing)
+from easycv.utils.logger import print_log
+from easycv.utils.preprocess_function import (bninceptionPre, gaussianBlur,
+                                              mixUpCls, randomErasing)
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/models/heads/cls_head.py

@@ -7,7 +7,9 @@ import torch.nn.functional as F
 from mmcv.cnn import kaiming_init, normal_init
 from torch.autograd import Variable
 
-from easycv.utils import build_from_cfg, get_root_logger, load_checkpoint
+from easycv.utils.checkpoint import load_checkpoint
+from easycv.utils.logger import get_root_logger
+from easycv.utils.registry import build_from_cfg
 from ..registry import HEADS, LOSSES
 from ..utils import accuracy
 

easycv/models/heads/mp_metric_head.py

@@ -12,8 +12,8 @@ from torch import Tensor
 
 from easycv.models.loss import CrossEntropyLossWithLabelSmooth
 from easycv.models.utils import DistributedLossWrapper, DistributedMinerWrapper
-from easycv.utils import (CosineSimilarity, build_from_cfg, get_root_logger,
-                          load_checkpoint)
+from easycv.utils.logger import get_root_logger
+from easycv.utils.registry import build_from_cfg
 from ..registry import HEADS, LOSSES
 from ..utils import accuracy
 

easycv/models/loss/pytorch_metric_learning.py

@@ -7,7 +7,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.runner import get_dist_info
 
-from easycv.utils import build_from_cfg
+from easycv.utils.registry import build_from_cfg
 from ..registry import LOSSES
 
 # register all existing transforms in torchvision

easycv/models/registry.py

@@ -1,5 +1,5 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from easycv.utils import Registry
+from easycv.utils.registry import Registry
 
 MODELS = Registry('model')
 BACKBONES = Registry('backbone')

easycv/models/selfsup/byol.py

@@ -2,7 +2,7 @@
 import torch
 import torch.nn as nn
 
-from easycv.utils import print_log
+from easycv.utils.logger import print_log
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/models/selfsup/dino.py

@@ -9,8 +9,8 @@ import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.runner import get_dist_info
 
-from easycv.utils import (gaussianBlurDynamic, print_log, randomGrayScale,
-                          solarize)
+from easycv.utils.preprocess_function import (gaussianBlurDynamic,
+                                              randomGrayScale, solarize)
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/models/selfsup/mixco.py

@@ -4,7 +4,7 @@ import torch
 import torch.nn as nn
 from mmcv.runner import get_dist_info
 
-from easycv.utils import mixUp
+from easycv.utils.preprocess_function import mixUp
 from .. import builder
 from ..registry import MODELS
 from .moco import MOCO

easycv/models/selfsup/moby.py

@@ -3,7 +3,8 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from easycv.utils import gaussianBlur, print_log, randomGrayScale
+from easycv.utils.logger import print_log
+from easycv.utils.preprocess_function import gaussianBlur, randomGrayScale
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/models/selfsup/moco.py

@@ -2,7 +2,8 @@
 import torch
 import torch.nn as nn
 
-from easycv.utils import gaussianBlur, print_log, randomGrayScale
+from easycv.utils.logger import print_log
+from easycv.utils.preprocess_function import gaussianBlur, randomGrayScale
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/models/selfsup/simclr.py

@@ -1,7 +1,8 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
 import torch
 
-from easycv.utils import gaussianBlur, print_log, randomGrayScale
+from easycv.utils.logger import print_log
+from easycv.utils.preprocess_function import gaussianBlur, randomGrayScale
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/models/selfsup/swav.py

@@ -5,7 +5,8 @@ import torch.distributed as dist
 import torch.nn as nn
 from mmcv.runner import get_dist_info
 
-from easycv.utils import gaussianBlur, print_log, randomGrayScale
+from easycv.utils.logger import print_log
+from easycv.utils.preprocess_function import gaussianBlur, randomGrayScale
 from .. import builder
 from ..base import BaseModel
 from ..registry import MODELS

easycv/predictors/base.py

@@ -9,11 +9,11 @@ from torchvision.transforms import Compose
 from easycv.datasets.registry import PIPELINES
 from easycv.file import io
 from easycv.models import build_model
-from easycv.utils import build_from_cfg
 from easycv.utils.checkpoint import load_checkpoint
 # from mmcv import Config
 from easycv.utils.config_tools import mmcv_config_fromfile
 from easycv.utils.constant import CACHE_DIR
+from easycv.utils.registry import build_from_cfg
 
 
 class NumpyToPIL(object):

easycv/predictors/builder.py

@@ -1,5 +1,5 @@
 # Copyright (c) Alibaba, Inc. and its affiliates.
-from easycv.utils import Registry, build_from_cfg
+from easycv.utils.registry import Registry, build_from_cfg
 
 PREDICTORS = Registry('predictor')
 

easycv/predictors/detector.py

@@ -11,11 +11,11 @@ from torchvision.transforms import Compose
 from easycv.datasets.registry import PIPELINES
 from easycv.file import io
 from easycv.models import build_model
-from easycv.utils import build_from_cfg
 from easycv.utils.checkpoint import load_checkpoint
 # from mmcv import Config
 from easycv.utils.config_tools import mmcv_config_fromfile
 from easycv.utils.constant import CACHE_DIR
+from easycv.utils.registry import build_from_cfg
 from .builder import PREDICTORS
 from .classifier import TorchClassifier
 

easycv/predictors/pose_predictor.py

@@ -15,10 +15,10 @@ from easycv.file import io
 from easycv.models import build_model
 from easycv.predictors.builder import PREDICTORS
 from easycv.predictors.detector import TorchYoloXPredictor
-from easycv.utils import build_from_cfg
 from easycv.utils.bbox_util import xywh2xyxy_coco, xyxy2xywh_coco
 from easycv.utils.checkpoint import load_checkpoint
 from easycv.utils.config_tools import mmcv_config_fromfile
+from easycv.utils.registry import build_from_cfg
 
 try:
     from easy_vision.python.inference.predictor import PredictorInterface

easycv/utils/__init__.py

@@ -1,18 +0,0 @@
-# Copyright (c) Alibaba, Inc. and its affiliates.
-"""
-isort:skip_file
-"""
-from .alias_multinomial import AliasMethod
-from .checkpoint import load_checkpoint
-from .collect import dist_forward_collect, nondist_forward_collect
-from .collect_env import collect_env
-from .config_tools import mmcv_config_fromfile, traverse_replace
-from .eval_utils import generate_best_metric_name
-from .flops_counter import get_model_complexity_info, get_model_info
-from .logger import get_root_logger, print_log
-from .metric_distance import CosineSimilarity, DotproductSimilarity, LpDistance
-from .preprocess_function import (bninceptionPre, gaussianBlur,
-                                  gaussianBlurDynamic, mixUp, mixUpCls,
-                                  randomErasing, randomGrayScale, solarize)
-from .registry import Registry, build_from_cfg
-from .user_config_params_utils import check_value_type

tests/hooks/test_best_ckpt_saver_hook.py

@@ -15,7 +15,7 @@ from easycv.file import io
 from easycv.hooks import EvalHook
 from easycv.hooks.best_ckpt_saver_hook import BestCkptSaverHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 
 
 class DummyDataset(object):

tests/hooks/test_byol_hook.py

@@ -14,7 +14,7 @@ from easycv.datasets import build_dataloader
 from easycv.file import io
 from easycv.hooks.byol_hook import BYOLHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 
 
 class DummyDataset(object):

tests/hooks/test_dino_hook.py

@@ -14,7 +14,7 @@ from easycv.datasets import build_dataloader
 from easycv.file import io
 from easycv.hooks.dino_hook import DINOHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 
 
 class DummyDataset(object):

tests/hooks/test_ema_hook.py

@@ -14,7 +14,7 @@ from easycv.file import io
 from easycv.hooks.ema_hook import EMAHook
 from easycv.hooks.optimizer_hook import OptimizerHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.utils.test_util import get_tmp_dir
 
 

tests/hooks/test_export_hook.py

@@ -14,7 +14,7 @@ from easycv.file import io
 from easycv.hooks.export_hook import ExportHook
 from easycv.models.registry import MODELS
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.utils.test_util import get_tmp_dir
 
 

tests/hooks/test_swav_hook.py

@@ -15,7 +15,7 @@ from easycv.datasets import build_dataloader
 from easycv.file import io
 from easycv.hooks.swav_hook import SWAVHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.utils.test_util import pseudo_dist_init
 
 

tests/hooks/test_sync_norm_hook.py

@@ -18,7 +18,7 @@ from easycv.file import io
 from easycv.hooks.optimizer_hook import OptimizerHook
 from easycv.hooks.sync_norm_hook import SyncNormHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.utils.test_util import dist_exec_wrapper
 
 

tests/hooks/test_sync_random_size_hook.py

@@ -19,7 +19,7 @@ from easycv.datasets.builder import build_dataset
 from easycv.file import io
 from easycv.hooks.sync_random_size_hook import SyncRandomSizeHook
 from easycv.runner import EVRunner
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.utils.test_util import dist_exec_wrapper
 
 

tools/export.py

@@ -19,7 +19,7 @@ import requests
 from easycv import __version__
 from easycv.apis.export import export
 from easycv.file import io
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 # from mmcv import Config
 from easycv.utils.config_tools import (CONFIG_TEMPLATE_ZOO,
                                        mmcv_config_fromfile, rebuild_config)

tools/prune.py

@@ -21,7 +21,7 @@ from easycv.models import build_model
 from easycv.apis import set_random_seed, train_model, build_optimizer
 from easycv.apis.train_misc import build_yolo_optimizer
 from easycv.datasets import build_dataloader, build_dataset
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.file import io
 from easycv.utils.checkpoint import load_checkpoint
 from easycv.utils.config_tools import (CONFIG_TEMPLATE_ZOO,

tools/quantize.py

@@ -26,7 +26,7 @@ from easycv.models import build_model
 from easycv.apis import single_cpu_test, single_gpu_test
 from easycv.core.evaluation.builder import build_evaluator
 from easycv.datasets import build_dataloader, build_dataset
-from easycv.utils import get_root_logger
+from easycv.utils.logger import get_root_logger
 from easycv.file import io
 from easycv.toolkit.quantize.quantize_utils import calib, quantize_config
 from easycv.utils.checkpoint import load_checkpoint

tools/test.py

@@ -14,10 +14,10 @@ from mmcv.runner import get_dist_info, init_dist, load_checkpoint
 from easycv.core.evaluation.builder import build_evaluator
 from easycv.datasets import build_dataloader, build_dataset
 from easycv.models import build_model
-from easycv.utils import (dist_forward_collect, get_root_logger,
-                          nondist_forward_collect, traverse_replace)
+from easycv.utils.collect import dist_forward_collect, nondist_forward_collect
 # from mmcv import Config
-from easycv.utils.config_tools import mmcv_config_fromfile
+from easycv.utils.config_tools import mmcv_config_fromfile, traverse_replace
+from easycv.utils.logger import get_root_logger
 
 sys.path.append(os.path.abspath(os.path.dirname(os.path.dirname(__file__))))
 sys.path.append(

tools/train.py

@@ -26,9 +26,10 @@ from easycv.datasets import build_dataloader, build_dataset
 from easycv.datasets.utils import is_dali_dataset_type
 from easycv.file import io
 from easycv.models import build_model
-from easycv.utils import (collect_env, get_model_info, get_root_logger,
-                          traverse_replace)
-# from mmcv import Config
+from easycv.utils.collect_env import collect_env
+from easycv.utils.flops_counter import get_model_info
+from easycv.utils.logger import get_root_logger
+from easycv.utils.config_tools import traverse_replace
 from easycv.utils.config_tools import (CONFIG_TEMPLATE_ZOO,
                                        mmcv_config_fromfile, rebuild_config)