code refactor.

jessemelpolio · Jul 27, 2019 · aabc53f · aabc53f
1 parent 524fda5
commit aabc53f
Show file tree

Hide file tree

Showing 210 changed files with 312 additions and 312 deletions.
diff --git a/datasets/cls/data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/cls/loader/default_loader.py b/datasets/cls/loader/default_loader.py
@@ -9,8 +9,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/det/data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/det/loader/default_loader.py b/datasets/det/loader/default_loader.py
@@ -10,9 +10,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.json_helper import JsonHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.json_helper import JsonHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 # torch.multiprocessing.set_sharing_strategy('file_system')
 

diff --git a/datasets/det/loader/fasterrcnn_loader.py b/datasets/det/loader/fasterrcnn_loader.py
@@ -10,9 +10,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.json_helper import JsonHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.json_helper import JsonHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class FasterRCNNLoader(data.Dataset):

diff --git a/datasets/gan/data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/gan/loader/cyclegan_loader.py b/datasets/gan/loader/cyclegan_loader.py
@@ -9,7 +9,7 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
+from util.helpers.image_helper import ImageHelper
 
 
 class CycleGANLoader(data.Dataset):

diff --git a/datasets/gan/loader/default_loader.py b/datasets/gan/loader/default_loader.py
@@ -8,8 +8,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/gan/loader/facegan_loader.py b/datasets/gan/loader/facegan_loader.py
@@ -10,8 +10,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class FaceGANLoader(data.Dataset):

diff --git a/datasets/gan/preprocess/face/face_alignmentor.py b/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 utils.helpers.file_helper import FileHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.file_helper import FileHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class FaceAlignmentor(object):

diff --git a/datasets/ins/data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/ins/loader/default_loader.py b/datasets/ins/loader/default_loader.py
@@ -8,9 +8,9 @@
 from torch.utils import data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.helpers.json_helper import JsonHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.image_helper import ImageHelper
+from util.helpers.json_helper import JsonHelper
+from util.tools.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/pose/data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/pose/loader/default_loader.py b/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 utils.helpers.json_helper import JsonHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.json_helper import JsonHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/pose/loader/openpose_loader.py b/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 utils.helpers.json_helper import JsonHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.json_helper import JsonHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class OpenPoseLoader(data.Dataset):

diff --git a/datasets/pose/utils/heatmap_generator.py b/datasets/pose/utils/heatmap_generator.py
@@ -6,7 +6,7 @@
 import numpy as np
 import torch
 
-from utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class HeatmapGenerator(object):

diff --git a/datasets/seg/data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/seg/loader/default_loader.py b/datasets/seg/loader/default_loader.py
@@ -8,8 +8,8 @@
 from torch.utils import data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/test/loader/default_loader.py b/datasets/test/loader/default_loader.py
@@ -8,9 +8,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.file_helper import FileHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.file_helper import FileHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/test/loader/facegan_loader.py b/datasets/test/loader/facegan_loader.py
@@ -8,9 +8,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.json_helper import JsonHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.json_helper import JsonHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class FaceGANLoader(data.Dataset):

diff --git a/datasets/test/loader/json_loader.py b/datasets/test/loader/json_loader.py
@@ -8,9 +8,9 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.json_helper import JsonHelper
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.json_helper import JsonHelper
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class JsonLoader(data.Dataset):

diff --git a/datasets/test/loader/list_loader.py b/datasets/test/loader/list_loader.py
@@ -8,8 +8,8 @@
 import torch.utils.data as data
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.image_helper import ImageHelper
+from util.tools.logger import Logger as Log
 
 
 class ListLoader(data.Dataset):

diff --git a/datasets/test/test_data_loader.py b/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 utils.tools.logger import Logger as Log
+from util.tools.logger import Logger as Log
 
 
 class TestDataLoader(object):

diff --git a/datasets/tools/collate.py b/datasets/tools/collate.py
@@ -12,8 +12,8 @@
 from torch._six import string_classes, int_classes
 
 from exts.tools.parallel import DataContainer
-from utils.helpers.tensor_helper import TensorHelper
-from utils.tools.logger import Logger as Log
+from util.helpers.tensor_helper import TensorHelper
+from util.tools.logger import Logger as Log
 
 
 def stack(batch, data_key=None, device_ids=None):

diff --git a/datasets/tools/transforms.py b/datasets/tools/transforms.py
@@ -7,7 +7,7 @@
 import torch
 from PIL import Image
 
-from utils.helpers.image_helper import ImageHelper
+from util.helpers.image_helper import ImageHelper
 
 
 class Normalize(object):

diff --git a/demos/README.md → demo/README.md b/demos/README.md → demo/README.md
diff --git a/demos/openpose/__init__.py → demo/openpose/__init__.py b/demos/openpose/__init__.py → demo/openpose/__init__.py
diff --git a/demos/openpose/samples/000000319721.jpg b/demos/openpose/samples/000000319721.jpg
diff --git a/demos/openpose/samples/000000319721_vis.png b/demos/openpose/samples/000000319721_vis.png
diff --git a/demos/openpose/samples/000000475191.jpg b/demos/openpose/samples/000000475191.jpg
diff --git a/demos/openpose/samples/000000475191_vis.png b/demos/openpose/samples/000000475191_vis.png
diff --git a/demos/openpose/samples/ski.jpg b/demos/openpose/samples/ski.jpg
diff --git a/main.py b/main.py
@@ -14,8 +14,8 @@
 
 from runner.method_selector import MethodSelector
 from runner.tools.controller import Controller
-from utils.tools.configer import Configer
-from utils.tools.logger import Logger as Log
+from util.tools.configer import Configer
+from util.tools.logger import Logger as Log
 
 
 def str2bool(v):

diff --git a/metrics/__init__.py → metric/__init__.py b/metrics/__init__.py → metric/__init__.py
diff --git a/metrics/cls/__init__.py → metric/cls/__init__.py b/metrics/cls/__init__.py → metric/cls/__init__.py
diff --git a/metrics/cls/cls_running_score.py → metric/cls/cls_running_score.py b/metrics/cls/cls_running_score.py → metric/cls/cls_running_score.py
@@ -4,7 +4,7 @@
 # Image classification running score.
 
 
-from utils.tools.average_meter import AverageMeter
+from util.tools.average_meter import AverageMeter
 
 
 class ClsRunningScore(object):

diff --git a/metrics/det/__init__.py → metric/det/__init__.py b/metrics/det/__init__.py → metric/det/__init__.py
diff --git a/metrics/det/coco_evaluator.py → metric/det/coco_evaluator.py b/metrics/det/coco_evaluator.py → metric/det/coco_evaluator.py
@@ -10,8 +10,8 @@
 
 from pycocotools.coco import COCO
 from pycocotools.cocoeval import COCOeval
-from utils.tools.configer import Configer
-from utils.tools.logger import Logger as Log
+from util.tools.configer import Configer
+from util.tools.logger import Logger as Log
 
 
 class CocoEvaluator(object):

diff --git a/metrics/det/det_running_score.py → metric/det/det_running_score.py b/metrics/det/det_running_score.py → metric/det/det_running_score.py
diff --git a/metrics/det/voc_evaluator.py → metric/det/voc_evaluator.py b/metrics/det/voc_evaluator.py → metric/det/voc_evaluator.py
@@ -16,8 +16,8 @@
 else:
     import xml.etree.ElementTree as ET
 
-from utils.tools.configer import Configer
-from utils.tools.logger import Logger as Log
+from util.tools.configer import Configer
+from util.tools.logger import Logger as Log
 
 
 class VOCEvaluator(object):

diff --git a/metrics/pose/__init__.py → metric/pose/__init__.py b/metrics/pose/__init__.py → metric/pose/__init__.py
diff --git a/metrics/pose/coco_evaluator.py → metric/pose/coco_evaluator.py b/metrics/pose/coco_evaluator.py → metric/pose/coco_evaluator.py
@@ -10,8 +10,8 @@
 
 from pycocotools.coco import COCO
 from pycocotools.cocoeval import COCOeval
-from utils.tools.configer import Configer
-from utils.tools.logger import Logger as Log
+from util.tools.configer import Configer
+from util.tools.logger import Logger as Log
 
 
 class CocoEvaluator(object):

diff --git a/metrics/pose/pose_running_score.py → metric/pose/pose_running_score.py b/metrics/pose/pose_running_score.py → metric/pose/pose_running_score.py
diff --git a/metrics/seg/__init__.py → metric/seg/__init__.py b/metrics/seg/__init__.py → metric/seg/__init__.py
diff --git a/metrics/seg/ade20k_evaluator.py → metric/seg/ade20k_evaluator.py b/metrics/seg/ade20k_evaluator.py → metric/seg/ade20k_evaluator.py
@@ -7,10 +7,10 @@
 import numpy as np
 import argparse
 
-from metrics.seg.seg_running_score import SegRunningScore
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
-from utils.tools.configer import Configer
+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
 
 
 class ADE20KEvaluator(object):

diff --git a/metrics/seg/cityscapes/__init__.py → metric/seg/cityscapes/__init__.py b/metrics/seg/cityscapes/__init__.py → metric/seg/cityscapes/__init__.py
diff --git a/...ics/seg/cityscapes/evaluation/__init__.py → metric/seg/cityscapes/evaluation/__init__.py b/...ics/seg/cityscapes/evaluation/__init__.py → metric/seg/cityscapes/evaluation/__init__.py
diff --git a/...capes/evaluation/addToConfusionMatrix.pyx → ...capes/evaluation/addToConfusionMatrix.pyx b/...capes/evaluation/addToConfusionMatrix.pyx → ...capes/evaluation/addToConfusionMatrix.pyx
diff --git a/...es/evaluation/addToConfusionMatrix_impl.c → ...es/evaluation/addToConfusionMatrix_impl.c b/...es/evaluation/addToConfusionMatrix_impl.c → ...es/evaluation/addToConfusionMatrix_impl.c
diff --git a/...cs/seg/cityscapes/evaluation/csHelpers.py → ...ic/seg/cityscapes/evaluation/csHelpers.py b/...cs/seg/cityscapes/evaluation/csHelpers.py → ...ic/seg/cityscapes/evaluation/csHelpers.py
@@ -35,8 +35,8 @@
 
 # Cityscapes modules
 try:
-    from metrics.seg.cityscapes.helpers.annotation   import Annotation
-    from metrics.seg.cityscapes.helpers.labels       import labels, name2label, id2label, trainId2label, category2labels
+    from metric.seg.cityscapes.helpers.annotation   import Annotation
+    from metric.seg.cityscapes.helpers.labels       import labels, name2label, id2label, trainId2label, category2labels
 except:
     print("Failed to find all Cityscapes modules")
     sys.exit(-1)

diff --git a/...ics/seg/cityscapes/evaluation/instance.py → metric/seg/cityscapes/evaluation/instance.py b/...ics/seg/cityscapes/evaluation/instance.py → metric/seg/cityscapes/evaluation/instance.py
diff --git a/...g/cityscapes/evaluation/instances2dict.py → ...g/cityscapes/evaluation/instances2dict.py b/...g/cityscapes/evaluation/instances2dict.py → ...g/cityscapes/evaluation/instances2dict.py
diff --git a/metrics/seg/cityscapes/helpers/__init__.py → metric/seg/cityscapes/helpers/__init__.py b/metrics/seg/cityscapes/helpers/__init__.py → metric/seg/cityscapes/helpers/__init__.py
diff --git a/metrics/seg/cityscapes/helpers/annotation.py → metric/seg/cityscapes/helpers/annotation.py b/metrics/seg/cityscapes/helpers/annotation.py → metric/seg/cityscapes/helpers/annotation.py
diff --git a/metrics/seg/cityscapes/helpers/labels.py → metric/seg/cityscapes/helpers/labels.py b/metrics/seg/cityscapes/helpers/labels.py → metric/seg/cityscapes/helpers/labels.py
diff --git a/.../cityscapes/helpers/labels_cityPersons.py → .../cityscapes/helpers/labels_cityPersons.py b/.../cityscapes/helpers/labels_cityPersons.py → .../cityscapes/helpers/labels_cityPersons.py
diff --git a/metrics/seg/cityscapes/make.sh → metric/seg/cityscapes/make.sh b/metrics/seg/cityscapes/make.sh → metric/seg/cityscapes/make.sh
diff --git a/metrics/seg/cityscapes/setup.py → metric/seg/cityscapes/setup.py b/metrics/seg/cityscapes/setup.py → metric/seg/cityscapes/setup.py
@@ -18,5 +18,5 @@
 os.environ["CC"]  = "g++"
 os.environ["CXX"] = "g++"
 
-setup(ext_modules = cythonize("metrics/seg/cityscapes/evaluation/addToConfusionMatrix.pyx"),
+setup(ext_modules = cythonize("metric/seg/cityscapes/evaluation/addToConfusionMatrix.pyx"),
       include_dirs=[numpy.get_include()])
diff --git a/metrics/seg/cityscapes_evaluator.py → metric/seg/cityscapes_evaluator.py b/metrics/seg/cityscapes_evaluator.py → metric/seg/cityscapes_evaluator.py
@@ -14,7 +14,7 @@
     izip = zip
 
 # Cityscapes imports
-from metrics.seg.cityscapes.evaluation.csHelpers import *
+from metric.seg.cityscapes.evaluation.csHelpers import *
 
 # C Support
 # Enable the cython support for faster evaluation, this is necessary for speeding up your model results
@@ -23,7 +23,7 @@
 # Check if C-Support is available for better performance
 if CSUPPORT:
     try:
-        import metrics.seg.cityscapes.evaluation.addToConfusionMatrix as addToConfusionMatrix
+        import metric.seg.cityscapes.evaluation.addToConfusionMatrix as addToConfusionMatrix
     except:
         CSUPPORT = False
 

diff --git a/metrics/seg/coco_evaluator.py → metric/seg/coco_evaluator.py b/metrics/seg/coco_evaluator.py → metric/seg/coco_evaluator.py
@@ -18,9 +18,9 @@
 from pycocotools.cocoeval import COCOeval
 from pycocotools import mask as maskUtils
 
-from utils.tools.configer import Configer
-from utils.helpers.mask_helper import MaskHelper
-from utils.tools.logger import Logger as Log
+from util.tools.configer import Configer
+from util.helpers.mask_helper import MaskHelper
+from util.tools.logger import Logger as Log
 
 
 class CocoEvaluator(object):

diff --git a/metrics/seg/seg_running_score.py → metric/seg/seg_running_score.py b/metrics/seg/seg_running_score.py → metric/seg/seg_running_score.py
diff --git a/models/__init__.py → model/__init__.py b/models/__init__.py → model/__init__.py
diff --git a/models/backbones/__init__.py → model/backbones/__init__.py b/models/backbones/__init__.py → model/backbones/__init__.py