Merge pull request #187 from PaddlePaddle/develop

Fix slim import error and some bugs

configs/deeplabv3p_mobilenetv2_cityscapes.yaml

@@ -30,6 +30,8 @@ MODEL:
         BACKBONE: "mobilenetv2"
         ASPP_WITH_SEP_CONV: True
         DECODER_USE_SEP_CONV: True
+        ENCODER_WITH_ASPP: False
+        ENABLE_DECODER: False
 TRAIN:
     PRETRAINED_MODEL_DIR: u"pretrained_model/deeplabv3p_mobilenetv2-1-0_bn_coco"
     MODEL_SAVE_DIR: "saved_model/deeplabv3p_mobilenetv2_cityscapes"

deploy/cpp/docs/windows_vs2019_build.md

@@ -99,4 +99,4 @@ cd /d D:\projects\PaddleSeg\deploy\cpp\out\build\x64-Release
 demo.exe --conf=/path/to/your/conf --input_dir=/path/to/your/input/data/directory
 ```
 
-更详细说明请参考ReadMe文档： [预测和可视化部分](../ReadMe.md)
+更详细说明请参考ReadMe文档： [预测和可视化部分](../README.md)

pdseg/models/model_builder.py

@@ -85,7 +85,7 @@ def seg_model(image, class_num):
         logits = fast_scnn.fast_scnn(image, class_num)
     else:
         raise Exception(
-            "unknow model name, only support unet, deeplabv3p, icnet, pspnet, hrnet"
+            "unknow model name, only support unet, deeplabv3p, icnet, pspnet, hrnet, fast_scnn"
         )
     return logits
 

slim/prune/eval_prune.py

@@ -43,7 +43,7 @@ from models.model_builder import ModelPhase
 from reader import SegDataset
 from metrics import ConfusionMatrix
 
-from paddleslim.prune.io import *
+from paddleslim.prune import load_model
 
 def parse_args():
     parser = argparse.ArgumentParser(description='PaddleSeg model evalution')

slim/prune/train_prune.py

@@ -47,8 +47,7 @@ from eval_prune import evaluate
 from vis import visualize
 from utils import dist_utils
 
-from paddleslim.prune import Pruner
-from paddleslim.prune.io import *
+from paddleslim.prune import Pruner, save_model
 from paddleslim.analysis import flops
 
 def parse_args():