rename utils.

datasets/cls/data_loader.py

@@ -15,7 +15,7 @@
 import datasets.tools.transforms as trans
 from datasets.cls.loader.default_loader import DefaultLoader
 from datasets.tools.collate import collate
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

datasets/cls/loader/default_loader.py

@@ -9,8 +9,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

datasets/det/data_loader.py

@@ -11,7 +11,7 @@
 from datasets.det.loader.fasterrcnn_loader import FasterRCNNLoader
 from datasets.det.loader.default_loader import DefaultLoader
 from datasets.tools.collate import collate
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

datasets/det/loader/default_loader.py

@@ -10,9 +10,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.json_helper import JsonHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.json_helper import JsonHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 # torch.multiprocessing.set_sharing_strategy('file_system')
 

datasets/det/loader/fasterrcnn_loader.py

@@ -10,9 +10,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.json_helper import JsonHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.json_helper import JsonHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class FasterRCNNLoader(data.Dataset):

datasets/gan/data_loader.py

@@ -12,7 +12,7 @@
 import datasets.tools.cv2_aug_transforms as cv2_aug_trans
 import datasets.tools.transforms as trans
 from datasets.tools.collate import collate
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

datasets/gan/loader/cyclegan_loader.py

@@ -9,7 +9,7 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
+from tools.helper.image_helper import ImageHelper
 
 
 class CycleGANLoader(data.Dataset):

datasets/gan/loader/default_loader.py

@@ -8,8 +8,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

datasets/gan/loader/facegan_loader.py

@@ -10,8 +10,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class FaceGANLoader(data.Dataset):

datasets/gan/preprocess/face/face_alignmentor.py

@@ -8,9 +8,9 @@
 # https://github.com/1adrianb/face-alignment pip install face_alignment
 import face_alignment as fa
 
-from util.helpers.file_helper import FileHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.file_helper import FileHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class FaceAlignmentor(object):

datasets/ins/data_loader.py

@@ -10,7 +10,7 @@
 import datasets.tools.cv2_aug_transforms as cv2_aug_trans
 import datasets.tools.transforms as trans
 from datasets.tools.collate import collate
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

datasets/ins/loader/default_loader.py

@@ -8,9 +8,9 @@
 from torch.utils import data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
-from util.helpers.json_helper import JsonHelper
-from util.tools.logger import Logger as Log
+from tools.helper.image_helper import ImageHelper
+from tools.helper.json_helper import JsonHelper
+from tools.util.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

datasets/pose/data_loader.py

@@ -12,7 +12,7 @@
 import datasets.tools.cv2_aug_transforms as cv2_aug_trans
 import datasets.tools.transforms as trans
 from datasets.tools.collate import collate
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

datasets/pose/loader/default_loader.py

@@ -11,9 +11,9 @@
 
 from exts.tools.parallel import DataContainer
 from datasets.pose.utils.heatmap_generator import HeatmapGenerator
-from util.helpers.json_helper import JsonHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.json_helper import JsonHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

datasets/pose/loader/openpose_loader.py

@@ -12,9 +12,9 @@
 from exts.tools.parallel import DataContainer
 from datasets.pose.utils.heatmap_generator import HeatmapGenerator
 from datasets.pose.utils.paf_generator import PafGenerator
-from util.helpers.json_helper import JsonHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.json_helper import JsonHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class OpenPoseLoader(data.Dataset):

datasets/pose/utils/heatmap_generator.py

@@ -6,7 +6,7 @@
 import numpy as np
 import torch
 
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class HeatmapGenerator(object):

datasets/seg/data_loader.py

@@ -11,7 +11,7 @@
 import datasets.tools.cv2_aug_transforms as cv2_aug_trans
 import datasets.tools.transforms as trans
 from datasets.tools.collate import collate
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

datasets/seg/loader/default_loader.py

@@ -8,8 +8,8 @@
 from torch.utils import data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

datasets/test/loader/default_loader.py

@@ -8,9 +8,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.file_helper import FileHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.file_helper import FileHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

datasets/test/loader/facegan_loader.py

@@ -8,9 +8,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.json_helper import JsonHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.json_helper import JsonHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class FaceGANLoader(data.Dataset):

datasets/test/loader/json_loader.py

@@ -8,9 +8,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.json_helper import JsonHelper
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.json_helper import JsonHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class JsonLoader(data.Dataset):

datasets/test/loader/list_loader.py

@@ -8,8 +8,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
 
 
 class ListLoader(data.Dataset):

datasets/test/test_data_loader.py

@@ -13,7 +13,7 @@
 from datasets.tools.transforms import ToTensor, Normalize, Compose
 import datasets.tools.pil_aug_transforms as pil_aug_trans
 import datasets.tools.cv2_aug_transforms as cv2_aug_trans
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class TestDataLoader(object):

datasets/tools/collate.py

@@ -12,8 +12,8 @@
 from torch._six import string_classes, int_classes
 
 from exts.tools.parallel import DataContainer
-from util.helpers.tensor_helper import TensorHelper
-from util.tools.logger import Logger as Log
+from tools.helper.tensor_helper import TensorHelper
+from tools.util.logger import Logger as Log
 
 
 def stack(batch, data_key=None, device_ids=None):

datasets/tools/transforms.py

@@ -7,7 +7,7 @@
 import torch
 from PIL import Image
 
-from util.helpers.image_helper import ImageHelper
+from tools.helper.image_helper import ImageHelper
 
 
 class Normalize(object):

main.py

@@ -14,8 +14,8 @@
 
 from runner.method_selector import MethodSelector
 from runner.tools.controller import Controller
-from util.tools.configer import Configer
-from util.tools.logger import Logger as Log
+from tools.util.configer import Configer
+from tools.util.logger import Logger as Log
 
 
 def str2bool(v):

metric/cls/cls_running_score.py

@@ -4,7 +4,7 @@
 # Image classification running score.
 
 
-from util.tools.average_meter import AverageMeter
+from tools.util.average_meter import AverageMeter
 
 
 class ClsRunningScore(object):

metric/det/coco_evaluator.py

@@ -10,8 +10,8 @@
 
 from pycocotools.coco import COCO
 from pycocotools.cocoeval import COCOeval
-from util.tools.configer import Configer
-from util.tools.logger import Logger as Log
+from tools.util.configer import Configer
+from tools.util.logger import Logger as Log
 
 
 class CocoEvaluator(object):

metric/det/voc_evaluator.py

@@ -16,8 +16,8 @@
 else:
     import xml.etree.ElementTree as ET
 
-from util.tools.configer import Configer
-from util.tools.logger import Logger as Log
+from tools.util.configer import Configer
+from tools.util.logger import Logger as Log
 
 
 class VOCEvaluator(object):

metric/pose/coco_evaluator.py

@@ -10,8 +10,8 @@
 
 from pycocotools.coco import COCO
 from pycocotools.cocoeval import COCOeval
-from util.tools.configer import Configer
-from util.tools.logger import Logger as Log
+from tools.util.configer import Configer
+from tools.util.logger import Logger as Log
 
 
 class CocoEvaluator(object):

metric/seg/ade20k_evaluator.py

@@ -8,9 +8,9 @@
 import argparse
 
 from metric.seg.seg_running_score import SegRunningScore
-from util.helpers.image_helper import ImageHelper
-from util.tools.logger import Logger as Log
-from util.tools.configer import Configer
+from tools.helper.image_helper import ImageHelper
+from tools.util.logger import Logger as Log
+from tools.util.configer import Configer
 
 
 class ADE20KEvaluator(object):

metric/seg/coco_evaluator.py

@@ -18,9 +18,9 @@
 from pycocotools.cocoeval import COCOeval
 from pycocotools import mask as maskUtils
 
-from util.tools.configer import Configer
-from util.helpers.mask_helper import MaskHelper
-from util.tools.logger import Logger as Log
+from tools.util.configer import Configer
+from tools.helper.mask_helper import MaskHelper
+from tools.util.logger import Logger as Log
 
 
 class CocoEvaluator(object):

model/backbones/backbone_selector.py

@@ -9,7 +9,7 @@
 from model.backbones.mobilenet.mobilenet_backbone import MobileNetBackbone
 from model.backbones.densenet.densenet_backbone import DenseNetBackbone
 from model.backbones.squeezenet.squeezenet_backbone import SqueezeNetBackbone
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class BackboneSelector(object):

model/cls/model_manager.py

@@ -10,7 +10,7 @@
 from model.cls.nets.vgg import VGG
 from model.cls.nets.shufflenetv2 import ShuffleNetV2, ShuffleResNetV2
 from model.cls.loss.cls_modules import ICCELoss, ICCenterLoss
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 CLS_MODEL_DICT = {
     'vgg11': VGG,

model/cls/nets/densenet.py

@@ -11,7 +11,7 @@
 import torch.nn.functional as F
 from torch.autograd import Variable
 
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class Bottleneck(nn.Module):

model/cls/nets/dpn.py

@@ -9,7 +9,7 @@
 import torch.nn.functional as F
 from torch.autograd import Variable
 
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class Bottleneck(nn.Module):

model/cls/nets/resnet.py

@@ -9,7 +9,7 @@
 import torch.nn.functional as F
 from torch.autograd import Variable
 
-from util.tools.logger import Logger as Log
+from tools.util.logger import Logger as Log
 
 
 class BasicBlock(nn.Module):