resolve conflict

LikeLy-Journey · Mar 28, 2020 · a2108d3 · a2108d3
2 parents 1b403f6 + 7e6fbd2
commit a2108d3
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/segmentron/data/dataloader/pascal_voc.py b/segmentron/data/dataloader/pascal_voc.py
@@ -1,7 +1,6 @@
 """Pascal VOC Semantic Segmentation Dataset."""
 import os
 import torch
-import logging
 import numpy as np
 
 from PIL import Image
@@ -85,7 +84,6 @@ def __getitem__(self, index):
             img, mask = self._val_sync_transform(img, mask)
         else:
             assert self.mode == 'testval'
-            logging.warn("Use mode of testval, you should set batch size=1")
             img, mask = self._img_transform(img), self._mask_transform(mask)
         # general resize, normalize and toTensor
         if self.transform is not None: