diff --git a/configs/deeplabv3p_mobilenetv2_cityscapes.yaml b/configs/deeplabv3p_mobilenetv2_cityscapes.yaml index afb973fda3d5d413fb342d0315d0d062de9d525f..6b6835d11eed2bf87d332a4ada44785f78a959ec 100644 --- a/configs/deeplabv3p_mobilenetv2_cityscapes.yaml +++ b/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" diff --git a/deploy/cpp/docs/windows_vs2019_build.md b/deploy/cpp/docs/windows_vs2019_build.md index 5862740b19c4d146ce38b458cd8cbe76f7a84747..0b52f1ec778751c588bc6682891a6a1a9dfd5590 100644 --- a/deploy/cpp/docs/windows_vs2019_build.md +++ b/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) diff --git a/pdseg/models/model_builder.py b/pdseg/models/model_builder.py index 3ff7e1eacad3f649820d11b16f793d80e94b806b..668d69e44aeb91cc7705a79f092730ae6a1fdb09 100644 --- a/pdseg/models/model_builder.py +++ b/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 diff --git a/slim/prune/eval_prune.py b/slim/prune/eval_prune.py index 940adce015b9e703535755cec06f57d75acbb051..b8275d03475b8fea67d73682b54a38172fbc25e2 100644 --- a/slim/prune/eval_prune.py +++ b/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') diff --git a/slim/prune/train_prune.py b/slim/prune/train_prune.py index 364130f7ad2ea2e2ef733cd6391deb8e77fdf893..06e1658f1a3f721842fbe780820103aceac87a16 100644 --- a/slim/prune/train_prune.py +++ b/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():