Merge pull request donnyyou#68 from donnyyou/dev

Dev
jessemelpolio · Jul 29, 2019 · 9fd8d4e · 9fd8d4e
2 parents 36bdd3f + b5b08ce
commit 9fd8d4e
Show file tree

Hide file tree

Showing 385 changed files with 1,429 additions and 2,999 deletions.
diff --git a/README.md b/README.md
@@ -151,11 +151,11 @@ bash run_fs_pspnet_cityscapes_seg.sh test tag
 
 <div align="center">
 
-<img src="demos/openpose/samples/000000319721_vis.png" width="500px"/>
+<img src="demo/openpose/samples/000000319721_vis.png" width="500px"/>
 
 <p> Example output of <b>VGG19-OpenPose</b></p>
 
-<img src="demos/openpose/samples/000000475191_vis.png" width="500px"/>
+<img src="demo/openpose/samples/000000475191_vis.png" width="500px"/>
 
 <p> Example output of <b>VGG19-OpenPose</b></p>
 

diff --git a/hypes/cls/cifar/ic_vgg19_cifar10_cls.json → configs/cls/cifar/ic_vgg19_cifar10_cls.conf b/hypes/cls/cifar/ic_vgg19_cifar10_cls.json → configs/cls/cifar/ic_vgg19_cifar10_cls.conf
diff --git a/...enet/ic_shufflenetv2-50_imagenet_cls.json → ...enet/ic_shufflenetv2-50_imagenet_cls.conf b/...enet/ic_shufflenetv2-50_imagenet_cls.json → ...enet/ic_shufflenetv2-50_imagenet_cls.conf
diff --git a/...magenet/ic_shufflenetv2_imagenet_cls.json → ...magenet/ic_shufflenetv2_imagenet_cls.conf b/...magenet/ic_shufflenetv2_imagenet_cls.json → ...magenet/ic_shufflenetv2_imagenet_cls.conf
diff --git a/...s/det/coco/fasterrcnn_vgg16_coco_det.json → ...s/det/coco/fasterrcnn_vgg16_coco_det.conf b/...s/det/coco/fasterrcnn_vgg16_coco_det.json → ...s/det/coco/fasterrcnn_vgg16_coco_det.conf
diff --git a/hypes/det/coco/fpn_resnet50_coco_det.json → configs/det/coco/fpn_resnet50_coco_det.conf b/hypes/det/coco/fpn_resnet50_coco_det.json → configs/det/coco/fpn_resnet50_coco_det.conf
diff --git a/hypes/det/coco/ssd300_vgg16_coco_det.json → configs/det/coco/ssd300_vgg16_coco_det.conf b/hypes/det/coco/ssd300_vgg16_coco_det.json → configs/det/coco/ssd300_vgg16_coco_det.conf
diff --git a/hypes/det/coco/ssd512_vgg16_coco_det.json → configs/det/coco/ssd512_vgg16_coco_det.conf b/hypes/det/coco/ssd512_vgg16_coco_det.json → configs/det/coco/ssd512_vgg16_coco_det.conf
diff --git a/hypes/det/coco/yolov3_darknet_coco_det.json → ...igs/det/coco/yolov3_darknet_coco_det.conf b/hypes/det/coco/yolov3_darknet_coco_det.json → ...igs/det/coco/yolov3_darknet_coco_det.conf
diff --git a/hypes/det/voc/fasterrcnn_vgg16_voc_det.json → ...igs/det/voc/fasterrcnn_vgg16_voc_det.conf b/hypes/det/voc/fasterrcnn_vgg16_voc_det.json → ...igs/det/voc/fasterrcnn_vgg16_voc_det.conf
diff --git a/hypes/det/voc/ssd300_vgg16_voc_det.json → configs/det/voc/ssd300_vgg16_voc_det.conf b/hypes/det/voc/ssd300_vgg16_voc_det.json → configs/det/voc/ssd300_vgg16_voc_det.conf
diff --git a/hypes/det/voc/ssd512_vgg16_voc_det.json → configs/det/voc/ssd512_vgg16_voc_det.conf b/hypes/det/voc/ssd512_vgg16_voc_det.json → configs/det/voc/ssd512_vgg16_voc_det.conf
@@ -117,7 +117,6 @@
       "log_format": "%(asctime)s %(levelname)-7s %(message)s",
       "rewrite": true
     },
-
     "solver": {
       "lr": {
         "metric": "epoch",

diff --git a/hypes/det/voc/yolov3_darknet_voc_det.json → configs/det/voc/yolov3_darknet_voc_det.conf b/hypes/det/voc/yolov3_darknet_voc_det.json → configs/det/voc/yolov3_darknet_voc_det.conf
diff --git a/hypes/gan/face/fg_lightcnn_nir2vis_gan.json → ...igs/gan/face/fg_lightcnn_nir2vis_gan.conf b/hypes/gan/face/fg_lightcnn_nir2vis_gan.json → ...igs/gan/face/fg_lightcnn_nir2vis_gan.conf
diff --git a/hypes/gan/face/it_cyclegan_nir2vis_gan.json → ...igs/gan/face/it_cyclegan_nir2vis_gan.conf b/hypes/gan/face/it_cyclegan_nir2vis_gan.json → ...igs/gan/face/it_cyclegan_nir2vis_gan.conf
diff --git a/hypes/gan/face/it_pix2pix_3d2vis_gan.json → configs/gan/face/it_pix2pix_3d2vis_gan.conf b/hypes/gan/face/it_pix2pix_3d2vis_gan.json → configs/gan/face/it_pix2pix_3d2vis_gan.conf
diff --git a/...s/gan/face/it_pix2pix_sketch2vis_gan.json → ...s/gan/face/it_pix2pix_sketch2vis_gan.conf b/...s/gan/face/it_pix2pix_sketch2vis_gan.json → ...s/gan/face/it_pix2pix_sketch2vis_gan.conf
diff --git a/hypes/ins/coco/mr_fpn_coco_seg.json → configs/ins/coco/mr_fpn_coco_seg.conf b/hypes/ins/coco/mr_fpn_coco_seg.json → configs/ins/coco/mr_fpn_coco_seg.conf
diff --git a/...s/pose/coco/openpose_vgg19_coco_pose.json → ...s/pose/coco/openpose_vgg19_coco_pose.conf b/...s/pose/coco/openpose_vgg19_coco_pose.json → ...s/pose/coco/openpose_vgg19_coco_pose.conf
diff --git a/...s/seg/ade20k/fs_deeplabv3_ade20k_seg.json → ...s/seg/ade20k/fs_deeplabv3_ade20k_seg.conf b/...s/seg/ade20k/fs_deeplabv3_ade20k_seg.json → ...s/seg/ade20k/fs_deeplabv3_ade20k_seg.conf
diff --git a/hypes/seg/ade20k/fs_pspnet_ade20k_seg.json → configs/seg/ade20k/fs_pspnet_ade20k_seg.conf b/hypes/seg/ade20k/fs_pspnet_ade20k_seg.json → configs/seg/ade20k/fs_pspnet_ade20k_seg.conf
diff --git a/...tyscapes/fs_deeplabv3_cityscapes_seg.json → ...tyscapes/fs_deeplabv3_cityscapes_seg.conf b/...tyscapes/fs_deeplabv3_cityscapes_seg.json → ...tyscapes/fs_deeplabv3_cityscapes_seg.conf
@@ -75,7 +75,7 @@
       "ms_test":{
         "scale_search": [0.75, 1.0, 1.25]
       },
-      "mode": "mscrop_test"
+      "mode": "ss_test"
     },
     "details": {
       "color_list": [[128, 64, 128], [244, 35, 232], [70, 70, 70], [102, 102, 156], [190, 153, 153],
@@ -87,7 +87,7 @@
       "backbone": "deepbase_resnet101_dilated8",
       "multi_grid": [1, 1, 1],
       "model_name": "deeplabv3",
-      "norm_type": "sync_batchnorm",
+      "norm_type": "batchnorm",
       "stride": 8,
       "checkpoints_name": "fs_deeplabv3_cityscapes_seg",
       "checkpoints_dir": "./checkpoints/seg/cityscapes"
@@ -122,17 +122,26 @@
       "max_iters": 40000
     },
     "loss": {
-      "loss_type": "seg_auxce_loss",
+      "loss_type": "dsnce_loss",
       "loss_weights": {
-        "aux_loss": 0.4,
-        "seg_loss": 1.0
+        "ce_loss": {
+            "ce_loss": 1.0
+        },
+        "dsnce_loss": {
+            "ce_loss": 1.0, "dsn_ce_loss": 0.4
+        },
+        "dsnohemce_loss": {
+            "ohem_ce_loss": 1.0, "dsn_ce_loss": 0.4
+        },
       },
       "params": {
-        "ce_weight": [0.8373, 0.9180, 0.8660, 1.0345, 1.0166, 0.9969, 0.9754,
-                      1.0489, 0.8786, 1.0023, 0.9539, 0.9843, 1.1116, 0.9037,
-                      1.0865, 1.0955, 1.0865, 1.1529, 1.0507],
-        "ce_reduction": "mean",
-        "ce_ignore_index": -1
+        "ce_loss": {
+            "weight": [0.8373, 0.9180, 0.8660, 1.0345, 1.0166, 0.9969, 0.9754,
+                       1.0489, 0.8786, 1.0023, 0.9539, 0.9843, 1.1116, 0.9037,
+                       1.0865, 1.0955, 1.0865, 1.1529, 1.0507],
+            "reduction": "mean",
+            "ignore_index": -1
+        }
       }
     }
 }
diff --git a/...tyscapes/fs_denseaspp_cityscapes_seg.json → ...tyscapes/fs_denseaspp_cityscapes_seg.conf b/...tyscapes/fs_denseaspp_cityscapes_seg.json → ...tyscapes/fs_denseaspp_cityscapes_seg.conf
@@ -122,10 +122,14 @@
       "max_iters": 40000
     },
     "loss": {
-      "loss_type": "seg_ce_loss",
+      "loss_type": "ce_loss",
       "loss_weights": {
-        "aux_loss": 0.4,
-        "seg_loss": 1.0
+        "ce_loss": {
+            "ce_loss": 1.0
+        },
+        "ohemce_loss": {
+            "ohem_ce_loss": 1.0
+        },
       },
       "params": {
         "ce_weight": [0.8373, 0.9180, 0.8660, 1.0345, 1.0166, 0.9969, 0.9754,

diff --git a/.../cityscapes/fs_pspnet_cityscapes_seg.json → .../cityscapes/fs_pspnet_cityscapes_seg.conf b/.../cityscapes/fs_pspnet_cityscapes_seg.json → .../cityscapes/fs_pspnet_cityscapes_seg.conf
@@ -87,7 +87,7 @@
       "backbone": "deepbase_resnet101_dilated8",
       "multi_grid": [1, 1, 1],
       "model_name": "pspnet",
-      "norm_type": "sync_batchnorm",
+      "norm_type": "batchnorm",
       "stride": 8,
       "checkpoints_name": "fs_pspnet_cityscapes_seg",
       "checkpoints_dir": "./checkpoints/seg/cityscapes"
@@ -122,17 +122,26 @@
       "max_iters": 40000
     },
     "loss": {
-      "loss_type": "seg_auxce_loss",
+      "loss_type": "dsnce_loss",
       "loss_weights": {
-        "aux_loss": 0.4,
-        "seg_loss": 1.0
+        "ce_loss": {
+            "ce_loss": 1.0
+        },
+        "dsnce_loss": {
+            "ce_loss": 1.0, "dsn_ce_loss": 0.4
+        },
+        "dsnohemce_loss": {
+            "ohem_ce_loss": 1.0, "dsn_ce_loss": 0.4
+        },
       },
       "params": {
-        "ce_weight": [0.8373, 0.9180, 0.8660, 1.0345, 1.0166, 0.9969, 0.9754,
-                      1.0489, 0.8786, 1.0023, 0.9539, 0.9843, 1.1116, 0.9037,
-                      1.0865, 1.0955, 1.0865, 1.1529, 1.0507],
-        "ce_reduction": "mean",
-        "ce_ignore_index": -1
+        "ce_loss": {
+            "weight": [0.8373, 0.9180, 0.8660, 1.0345, 1.0166, 0.9969, 0.9754,
+                       1.0489, 0.8786, 1.0023, 0.9539, 0.9843, 1.1116, 0.9037,
+                       1.0865, 1.0955, 1.0865, 1.1529, 1.0507],
+            "reduction": "mean",
+            "ignore_index": -1
+        }
       }
     }
 }
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 tools.util.logger import Logger as Log
 
 
 class DataLoader(object):
@@ -44,7 +44,7 @@ def __init__(self, configer):
             trans.Normalize(**self.configer.get('data', 'normalize')), ])
 
     def get_trainloader(self):
-        if not self.configer.exists('train', 'loader') or self.configer.get('train', 'loader') == 'default':
+        if self.configer.get('train.loader', default=None) in [None, 'default']:
             trainloader = data.DataLoader(
                 DefaultLoader(root_dir=self.configer.get('data', 'data_dir'), dataset='train',
                               aug_transform=self.aug_train_transform,
@@ -65,7 +65,7 @@ def get_trainloader(self):
 
     def get_valloader(self, dataset=None):
         dataset = 'val' if dataset is None else dataset
-        if not self.configer.exists('val', 'loader') or self.configer.get('val', 'loader') == 'default':
+        if self.configer.get('val.loader', default=None) in [None, 'default']:
             valloader = data.DataLoader(
                 DefaultLoader(root_dir=self.configer.get('data', 'data_dir'), dataset=dataset,
                               aug_transform=self.aug_val_transform,

diff --git a/datasets/cls/loader/default_loader.py b/datasets/cls/loader/default_loader.py
@@ -8,9 +8,9 @@
 import os
 import torch.utils.data as data
 
-from extensions.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from exts.tools.parallel.data_container import DataContainer
+from tools.helper.image_helper import ImageHelper
+from tools.util.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 tools.util.logger import Logger as Log
 
 
 class DataLoader(object):
@@ -40,7 +40,7 @@ def __init__(self, configer):
             trans.Normalize(**self.configer.get('data', 'normalize')), ])
 
     def get_trainloader(self):
-        if not self.configer.exists('train', 'loader') or self.configer.get('train', 'loader') == 'default':
+        if self.configer.get('train.loader', default=None) in [None, 'default']:
             trainloader = data.DataLoader(
                 DefaultLoader(root_dir=self.configer.get('data', 'data_dir'), dataset='train',
                               aug_transform=self.aug_train_transform,
@@ -77,7 +77,7 @@ def get_trainloader(self):
 
     def get_valloader(self, dataset=None):
         dataset = 'val' if dataset is None else dataset
-        if not self.configer.exists('val', 'loader') or self.configer.get('val', 'loader') == 'default':
+        if self.configer.get('val.loader', default=None) in [None, 'default']:
             valloader = data.DataLoader(
                 DefaultLoader(root_dir=self.configer.get('data', 'data_dir'), dataset=dataset,
                               aug_transform=self.aug_val_transform,

diff --git a/datasets/det/loader/default_loader.py b/datasets/det/loader/default_loader.py
@@ -9,12 +9,12 @@
 import numpy as np
 import torch.utils.data as data
 
-from extensions.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 exts.tools.parallel.data_container import DataContainer
+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')
+# torch.multiprocessing.set_sharing_strategy('file_system')
 
 
 class DefaultLoader(data.Dataset):

diff --git a/datasets/det/loader/fasterrcnn_loader.py b/datasets/det/loader/fasterrcnn_loader.py
@@ -9,10 +9,10 @@
 import numpy as np
 import torch.utils.data as data
 
-from extensions.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 exts.tools.parallel.data_container import DataContainer
+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):

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 tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

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

diff --git a/datasets/gan/loader/default_loader.py b/datasets/gan/loader/default_loader.py
@@ -7,9 +7,9 @@
 import os
 import torch.utils.data as data
 
-from extensions.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from exts.tools.parallel.data_container import DataContainer
+from tools.helper.image_helper import ImageHelper
+from tools.util.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
@@ -9,9 +9,9 @@
 import random
 import torch.utils.data as data
 
-from extensions.tools.parallel import DataContainer
-from utils.helpers.image_helper import ImageHelper
-from utils.tools.logger import Logger as Log
+from exts.tools.parallel.data_container import DataContainer
+from tools.helper.image_helper import ImageHelper
+from tools.util.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 tools.helper.file_helper import FileHelper
+from tools.helper.image_helper import ImageHelper
+from tools.util.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 tools.util.logger import Logger as Log
 
 
 class DataLoader(object):

diff --git a/datasets/ins/loader/default_loader.py b/datasets/ins/loader/default_loader.py
@@ -7,10 +7,10 @@
 import numpy as np
 from torch.utils import data
 
-from extensions.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 exts.tools.parallel import DataContainer
+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):

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 tools.util.logger import Logger as Log
 
 
 class DataLoader(object):
@@ -41,7 +41,7 @@ def __init__(self, configer):
             trans.Normalize(**self.configer.get('data', 'normalize')), ])
 
     def get_trainloader(self):
-        if not self.configer.exists('train', 'loader') or self.configer.get('train', 'loader') == 'default':
+        if self.configer.get('train.loader', default=None) in [None, 'default']:
             trainloader = data.DataLoader(
                 DefaultLoader(root_dir=self.configer.get('data', 'data_dir'), dataset='train',
                               aug_transform=self.aug_train_transform,
@@ -79,7 +79,7 @@ def get_trainloader(self):
 
     def get_valloader(self, dataset=None):
         dataset = 'val' if dataset is None else dataset
-        if not self.configer.exists('val', 'loader') or self.configer.get('val', 'loader') == 'default':
+        if self.configer.get('val.loader', default=None) in [None, 'default']:
             valloader = data.DataLoader(
                 DefaultLoader(root_dir=self.configer.get('data', 'data_dir'), dataset=dataset,
                               aug_transform=self.aug_val_transform,

diff --git a/datasets/pose/loader/default_loader.py b/datasets/pose/loader/default_loader.py
@@ -9,11 +9,11 @@
 import torch
 import torch.utils.data as data
 
-from extensions.tools.parallel import DataContainer
+from exts.tools.parallel.data_container 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 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):

diff --git a/datasets/pose/loader/openpose_loader.py b/datasets/pose/loader/openpose_loader.py
@@ -9,12 +9,12 @@
 import numpy as np
 import torch.utils.data as data
 
-from extensions.tools.parallel import DataContainer
+from exts.tools.parallel.data_container 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 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):

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 tools.util.logger import Logger as Log
 
 
 class HeatmapGenerator(object):