diff --git a/official/vision/segmentation/README.md b/official/vision/segmentation/README.md index 1e4b8f38..c109f0d9 100644 --- a/official/vision/segmentation/README.md +++ b/official/vision/segmentation/README.md @@ -18,7 +18,7 @@ ## 安装和环境配置 -本目录下代码基于MegEngine v1.1,在开始运行本目录下的代码之前,请确保按照[README](../../../README.md)进行了正确的环境配置。 +本目录下代码基于MegEngine v1.2,在开始运行本目录下的代码之前,请确保按照[README](../../../README.md)进行了正确的环境配置。 ## 如何使用 @@ -102,4 +102,4 @@ python3 tools/test.py -f configs/deeplabv3plus_res101_voc_512size.py -n 8 \ ## 参考文献 -- [Encoder-Decoder with Atrous Separable Convolution for Semantic Image Segmentation](https://arxiv.org/abs/1802.02611) Liang-Chieh Chen, Yukun Zhu, George Papandreou, Florian Schroff, and Hartwig Adam. European Conference on Computer Vision (ECCV), 2018. \ No newline at end of file +- [Encoder-Decoder with Atrous Separable Convolution for Semantic Image Segmentation](https://arxiv.org/abs/1802.02611) Liang-Chieh Chen, Yukun Zhu, George Papandreou, Florian Schroff, and Hartwig Adam. European Conference on Computer Vision (ECCV), 2018. diff --git a/official/vision/segmentation/configs/deeplabv3plus_res101_cityscapes_768size.py b/official/vision/segmentation/configs/deeplabv3plus_res101_cityscapes_768size.py index 76d6a530..6641e0d0 100644 --- a/official/vision/segmentation/configs/deeplabv3plus_res101_cityscapes_768size.py +++ b/official/vision/segmentation/configs/deeplabv3plus_res101_cityscapes_768size.py @@ -50,7 +50,9 @@ def deeplabv3plus_res101_cityscapes_768size(**kwargs): `"Encoder-Decoder with Atrous Separable Convolution for Semantic Image Segmentation" `_ """ - return models.DeepLabV3Plus(**kwargs) + cfg = CityscapesConfig() + cfg.backbone_pretrained = False + return models.DeepLabV3Plus(cfg, **kwargs) Net = models.DeepLabV3Plus diff --git a/official/vision/segmentation/configs/deeplabv3plus_res101_voc_512size.py b/official/vision/segmentation/configs/deeplabv3plus_res101_voc_512size.py index 29cd5aea..ba1d2829 100644 --- a/official/vision/segmentation/configs/deeplabv3plus_res101_voc_512size.py +++ b/official/vision/segmentation/configs/deeplabv3plus_res101_voc_512size.py @@ -51,7 +51,9 @@ def deeplabv3plus_res101_voc_512size(**kwargs): `"Encoder-Decoder with Atrous Separable Convolution for Semantic Image Segmentation" `_ """ - return models.DeepLabV3Plus(**kwargs) + cfg = VOCConfig() + cfg.backbone_pretrained = False + return models.DeepLabV3Plus(cfg, **kwargs) Net = models.DeepLabV3Plus diff --git a/official/vision/segmentation/tools/train.py b/official/vision/segmentation/tools/train.py index 95390ae2..b6c9b2be 100644 --- a/official/vision/segmentation/tools/train.py +++ b/official/vision/segmentation/tools/train.py @@ -25,7 +25,6 @@ logger = mge.get_logger(__name__) logger.setLevel("INFO") -# mge.device.set_prealloc_config(1024, 1024, 512 * 1024 * 1024, 2.0) def main(): diff --git a/official/vision/segmentation/tools/utils.py b/official/vision/segmentation/tools/utils.py index 680e83bf..47168481 100644 --- a/official/vision/segmentation/tools/utils.py +++ b/official/vision/segmentation/tools/utils.py @@ -13,7 +13,7 @@ import numpy as np -from megengine.data import Sampler +from megengine.data import MapSampler class AverageMeter: @@ -57,7 +57,7 @@ def get_config_info(config): return config_table -class InferenceSampler(Sampler): +class InferenceSampler(MapSampler): def __init__(self, dataset, batch_size=1, world_size=None, rank=None): super().__init__(dataset, batch_size, False, None, world_size, rank) begin = self.num_samples * self.rank