diff --git a/configs/solov2/README.md b/configs/solov2/README.md index 7c4e0cf4e2e4d9909953d084185d756bce894235..ee39c58473240c045c932bc1c664b4ce206f31d0 100644 --- a/configs/solov2/README.md +++ b/configs/solov2/README.md @@ -12,17 +12,17 @@ SOLOv2 (Segmenting Objects by Locations) is a fast instance segmentation framewo ## Model Zoo -| Backbone | Multi-scale training | Lr schd | Inf time (V100) | Mask AP | Download | Configs | +| Backbone | Multi-scale training | Lr schd | V100 FP32(FPS) | Mask AP | Download | Configs | | :---------------------: | :-------------------: | :-----: | :------------: | :-----: | :---------: | :------------------------: | -| Mobilenetv3-FPN | True | 3x | 20.0ms | 30.0 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_mobilenetv3_fpn_448_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_mobilenetv3_fpn_448_3x.yml) | -| R50-FPN | False | 1x | 45.7ms | 35.6 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_r50_fpn_1x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_r50_fpn_1x.yml) | -| R50-FPN | True | 3x | 45.7ms | 37.9 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_r50_fpn_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_r50_fpn_3x.yml) | -| R101-VD-FPN | True | 3x | 82.6ms | 42.6 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_r101_vd_fpn_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_r101_vd_fpn_3x.yml) | +| Mobilenetv3-FPN | True | 3x | 50 | 30.0 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_mobilenetv3_fpn_448_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_mobilenetv3_fpn_448_3x.yml) | +| R50-FPN | False | 1x | 21.9 | 35.6 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_r50_fpn_1x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_r50_fpn_1x.yml) | +| R50-FPN | True | 3x | 21.9 | 37.9 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_r50_fpn_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_r50_fpn_3x.yml) | +| R101-VD-FPN | True | 3x | 12.1 | 42.6 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_r101_vd_fpn_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_r101_vd_fpn_3x.yml) | ## Enhanced model -| Backbone | Input size | Lr schd | Inf time (V100) | Mask AP | Download | Configs | +| Backbone | Input size | Lr schd | V100 FP32(FPS) | Mask AP | Download | Configs | | :---------------------: | :-------------------: | :-----: | :------------: | :-----: | :---------: | :------------------------: | -| Light-R50-VD-DCN-FPN | 512 | 3x | 25.9ms | 38.8 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_light_r50_vd_fpn_dcn_512_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_light_r50_vd_fpn_dcn_512_3x.yml) | +| Light-R50-VD-DCN-FPN | 512 | 3x | 38.6 | 38.8 | [model](https://paddlemodels.bj.bcebos.com/object_detection/solov2_light_r50_vd_fpn_dcn_512_3x.pdparams) | [config](https://github.com/PaddlePaddle/PaddleDetection/tree/master/configs/solov2/solov2_light_r50_vd_fpn_dcn_512_3x.yml) | ## Citations ``` diff --git a/deploy/python/infer.py b/deploy/python/infer.py index 7921a6c7d127edd019721c873277b26c70944c25..33f29a7b74bbdbcfb8b3ee0feb5cb59db78ba8f6 100644 --- a/deploy/python/infer.py +++ b/deploy/python/infer.py @@ -41,7 +41,7 @@ SUPPORT_MODELS = { } -class Detector(): +class Detector(object): """ Args: config (object): config of model, defined by `Config(model_dir)` diff --git a/ppdet/utils/export_utils.py b/ppdet/utils/export_utils.py index bca35c6c4d5f65d57095dafa9771ee7b1a5191e0..d98861d4a7f71b109eb0a031cbd3201aca02caab 100644 --- a/ppdet/utils/export_utils.py +++ b/ppdet/utils/export_utils.py @@ -38,7 +38,7 @@ TRT_MIN_SUBGRAPH = { 'Face': 3, 'TTFNet': 3, 'FCOS': 3, - 'SOLOv2': 3, + 'SOLOv2': 60, } RESIZE_SCALE_SET = { 'RCNN',