Merge pull request #18 from fuyi02/master

modify padding value

pdseg/data_aug.py

@@ -410,7 +410,7 @@ def rand_crop(crop_img, crop_seg, mode=ModelPhase.TRAIN):
                 0,
                 pad_width,
                 cv2.BORDER_CONSTANT,
-                value=cfg.MEAN)
+                value=cfg.DATASET.PADDING_VALUE)
             if crop_seg is not None:
                 crop_seg = cv2.copyMakeBorder(
                     crop_seg,

pdseg/reader.py

@@ -246,7 +246,7 @@ class SegDataset(object):
                     img,
                     grt,
                     rich_crop_max_rotation=cfg.AUG.RICH_CROP.MAX_ROTATION,
-                    mean_value=cfg.MEAN)
+                    mean_value=cfg.DATASET.PADDING_VALUE)
 
                 img, grt = aug.rand_scale_aspect(
                     img,

pdseg/train.py

@@ -292,7 +292,7 @@ def train(cfg):
         for var in load_vars:
             print("Parameter[{}] loaded sucessfully!".format(var.name))
         for var in load_fail_vars:
-            print("Parameter[{}] shape does not match current network, skip"
+            print("Parameter[{}] don't exist or shape does not match current network, skip"
                   " to load it.".format(var.name))
         print("{}/{} pretrained parameters loaded successfully!".format(
             len(load_vars),

pdseg/utils/collect.py

@@ -97,6 +97,8 @@ class SegConfig(dict):
             raise KeyError(
                 'DATASET.IMAGE_TYPE config error, only support `rgb`, `gray` and `rgba`'
             )
+        if self.MEAN is not None:
+            self.DATASET.PADDING_VALUE = [x*255.0 for x in self.MEAN]
 
         if not self.TRAIN_CROP_SIZE:
             raise ValueError(

pdseg/utils/config.py

@@ -65,6 +65,8 @@ cfg.DATASET.DATA_DIM = 3
 cfg.DATASET.SEPARATOR = ' '
 # 忽略的像素标签值, 默认为255，一般无需改动
 cfg.DATASET.IGNORE_INDEX = 255
+# 数据增强是图像的padding值 
+cfg.DATASET.PADDING_VALUE = [127.5,127.5,127.5]
 
 ########################### 数据增强配置 ######################################
 # 图像镜像左右翻转