Merge pull request CSAILVision#187 from CSAILVision/hang-dev

use official dataloader so that it is compatible with pytorch 1.1

Author: hangzhaomit

dataset.py

@@ -1,14 +1,13 @@
 import os
 import json
 import torch
-import lib.utils.data as torchdata
 import cv2
 from torchvision import transforms
 import numpy as np
 from scipy.misc import imresize
 
 
-class BaseDataset(torchdata.Dataset):
+class BaseDataset(torch.utils.data.Dataset):
     def __init__(self, odgt, opt, **kwargs):
         # parse options
         self.imgSizes = opt.imgSizes

eval.py

@@ -15,7 +15,6 @@
 from utils import AverageMeter, colorEncode, accuracy, intersectionAndUnion, setup_logger
 from lib.nn import user_scattered_collate, async_copy_to
 from lib.utils import as_numpy
-import lib.utils.data as torchdata
 import cv2
 from tqdm import tqdm
 
@@ -133,7 +132,7 @@ def main(cfg, gpu):
         cfg.DATASET.root_dataset,
         cfg.DATASET.list_val,
         cfg.DATASET)
-    loader_val = torchdata.DataLoader(
+    loader_val = torch.utils.data.DataLoader(
         dataset_val,
         batch_size=cfg.VAL.batch_size,
         shuffle=False,

eval_multipro.py

@@ -16,7 +16,6 @@
 from utils import AverageMeter, colorEncode, accuracy, intersectionAndUnion, parse_devices, setup_logger
 from lib.nn import user_scattered_collate, async_copy_to
 from lib.utils import as_numpy
-import lib.utils.data as torchdata
 import cv2
 from tqdm import tqdm
 
@@ -94,7 +93,7 @@ def worker(cfg, gpu_id, start_idx, end_idx, result_queue):
         cfg.DATASET.list_val,
         cfg.DATASET,
         start_idx=start_idx, end_idx=end_idx)
-    loader_val = torchdata.DataLoader(
+    loader_val = torch.utils.data.DataLoader(
         dataset_val,
         batch_size=cfg.VAL.batch_size,
         shuffle=False,

test.py

@@ -14,7 +14,6 @@
 from utils import colorEncode, find_recursive, setup_logger
 from lib.nn import user_scattered_collate, async_copy_to
 from lib.utils import as_numpy
-import lib.utils.data as torchdata
 import cv2
 from tqdm import tqdm
 from config import cfg
@@ -116,7 +115,7 @@ def main(cfg, gpu):
     dataset_test = TestDataset(
         cfg.list_test,
         cfg.DATASET)
-    loader_test = torchdata.DataLoader(
+    loader_test = torch.utils.data.DataLoader(
         dataset_test,
         batch_size=cfg.TEST.batch_size,
         shuffle=False,

train.py

@@ -14,7 +14,6 @@
 from models import ModelBuilder, SegmentationModule
 from utils import AverageMeter, parse_devices, setup_logger
 from lib.nn import UserScatteredDataParallel, user_scattered_collate, patch_replication_callback
-import lib.utils.data as torchdata
 
 
 # train one epoch
@@ -169,7 +168,7 @@ def main(cfg, gpus):
         cfg.DATASET,
         batch_per_gpu=cfg.TRAIN.batch_size_per_gpu)
 
-    loader_train = torchdata.DataLoader(
+    loader_train = torch.utils.data.DataLoader(
         dataset_train,
         batch_size=len(gpus),  # we have modified data_parallel
         shuffle=False,  # we do not use this param