diff --git a/configs/solov2/README.md b/configs/solov2/README.md index ee39c58473240c045c932bc1c664b4ce206f31d0..d33a5a3a3e53be6e1532e7ed7b2f6115fdf421e0 100644 --- a/configs/solov2/README.md +++ b/configs/solov2/README.md @@ -9,10 +9,14 @@ SOLOv2 (Segmenting Objects by Locations) is a fast instance segmentation framewo - Performance: `Light-R50-VD-DCN-FPN` model reached 38.6 FPS on single Tesla V100, and mask ap on the COCO-val dataset reached 38.8, which increased inference speed by 24%, mAP increased by 2.4 percentage points. - Training Time: The training time of the model of `solov2_r50_fpn_1x` on Tesla v100 with 8 GPU is only 10 hours. +
+ +
+ ## Model Zoo -| Backbone | Multi-scale training | Lr schd | V100 FP32(FPS) | Mask AP | Download | Configs | +| Backbone | Multi-scale training | Lr schd | V100 FP32(FPS) | Mask APval | Download | Configs | | :---------------------: | :-------------------: | :-----: | :------------: | :-----: | :---------: | :------------------------: | | 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) | @@ -20,10 +24,14 @@ SOLOv2 (Segmenting Objects by Locations) is a fast instance segmentation framewo | 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 | V100 FP32(FPS) | Mask AP | Download | Configs | +| Backbone | Input size | Lr schd | V100 FP32(FPS) | Mask APval | Download | Configs | | :---------------------: | :-------------------: | :-----: | :------------: | :-----: | :---------: | :------------------------: | | 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) | +**Notes:** + +- SOLOv2 is trained on COCO train2017 dataset and evaluated on val2017 results of `mAP(IoU=0.5:0.95)`. + ## Citations ``` @article{wang2020solov2, diff --git a/configs/solov2/solov2_light_r50_vd_fpn_dcn_512_3x.yml b/configs/solov2/solov2_light_r50_vd_fpn_dcn_512_3x.yml index af71b074ac46bd34c6156b53820a96a922bbb691..b45581bdd04c7c3687f062097381c014e7fa7b29 100644 --- a/configs/solov2/solov2_light_r50_vd_fpn_dcn_512_3x.yml +++ b/configs/solov2/solov2_light_r50_vd_fpn_dcn_512_3x.yml @@ -20,8 +20,9 @@ SOLOv2: ResNet: depth: 50 feature_maps: [2, 3, 4, 5] - freeze_at: 2 - norm_type: bn + freeze_at: 0 + freeze_norm: false + norm_type: sync_bn dcn_v2_stages: [3, 4, 5] variant: d lr_mult_list: [0.05, 0.05, 0.1, 0.15] diff --git a/deploy/python/infer.py b/deploy/python/infer.py index ec2ab48dad3306ef649cbea85a934603c81fb8a7..0ab948904b90ad1a38cf957d1f34bbffe7fd96e6 100644 --- a/deploy/python/infer.py +++ b/deploy/python/infer.py @@ -35,6 +35,7 @@ import paddle import paddle.fluid as fluid from preprocess import preprocess, Resize, Normalize, Permute, PadStride from visualize import visualize_box_mask +from ppdet.utils.check import enable_static_mode # Global dictionary SUPPORT_MODELS = { @@ -521,7 +522,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( "--model_dir", diff --git a/docs/images/instance_segmentation.png b/docs/images/instance_segmentation.png new file mode 100644 index 0000000000000000000000000000000000000000..6091cda6918308497c68b003775a976520642a9d Binary files /dev/null and b/docs/images/instance_segmentation.png differ diff --git a/ppdet/data/tests/test_dataset.py b/ppdet/data/tests/test_dataset.py index 70c9573cd16e6b2385c699bf68c6867b28b145ef..0ab84314f626f415a0cca7c9712e7b5761875852 100644 --- a/ppdet/data/tests/test_dataset.py +++ b/ppdet/data/tests/test_dataset.py @@ -24,6 +24,7 @@ if parent_path not in sys.path: sys.path.append(parent_path) from ppdet.data.parallel_map import ParallelMap +from ppdet.utils.check import enable_static_mode class MemorySource(object): @@ -146,7 +147,6 @@ class TestDataset(unittest.TestCase): if __name__ == '__main__': - import paddle - paddle.enable_static() + enable_static_mode() logging.basicConfig() unittest.main() diff --git a/ppdet/data/tests/test_loader.py b/ppdet/data/tests/test_loader.py index 0b4a611146207c037a929a556854608805517fd7..020c5d0e2be64fd601797c068cf7d71064adb574 100644 --- a/ppdet/data/tests/test_loader.py +++ b/ppdet/data/tests/test_loader.py @@ -27,6 +27,7 @@ from ppdet.utils.download import DATASET_HOME from ppdet.data.transform.operators import DecodeImage, ResizeImage, Permute from ppdet.data.transform.batch_operators import PadBatch +from ppdet.utils.check import enable_static_mode COCO_VAL_URL = 'http://images.cocodataset.org/zips/val2017.zip' COCO_VAL_MD5SUM = '442b8da7639aecaf257c1dceb8ba8c80' @@ -168,6 +169,5 @@ class TestReader(unittest.TestCase): if __name__ == '__main__': - import paddle - paddle.enable_static() + enable_static_mode() unittest.main() diff --git a/ppdet/data/tests/test_loader_yaml.py b/ppdet/data/tests/test_loader_yaml.py index fc2192248a1d4124327cd964d4e0aa0a5d2bb6d1..a7c38dcd2f848f2640cc8100dc4b465a0c990aa1 100644 --- a/ppdet/data/tests/test_loader_yaml.py +++ b/ppdet/data/tests/test_loader_yaml.py @@ -27,6 +27,7 @@ from ppdet.utils.download import DATASET_HOME from ppdet.core.workspace import load_config, merge_config from ppdet.data.reader import create_reader +from ppdet.utils.check import enable_static_mode COCO_VAL_URL = 'http://images.cocodataset.org/zips/val2017.zip' COCO_VAL_MD5SUM = '442b8da7639aecaf257c1dceb8ba8c80' @@ -112,6 +113,5 @@ class TestReaderYAML(unittest.TestCase): if __name__ == '__main__': - import paddle - paddle.enable_static() + enable_static_mode() unittest.main() diff --git a/ppdet/ext_op/test/test_corner_pool.py b/ppdet/ext_op/test/test_corner_pool.py index 76905b3604d35097c59e6d36c3bb2b527cd2b073..adb5d3c74c9fa1e3fe772210b3c9e4725cd397eb 100755 --- a/ppdet/ext_op/test/test_corner_pool.py +++ b/ppdet/ext_op/test/test_corner_pool.py @@ -25,6 +25,7 @@ if parent_path not in sys.path: sys.path.append(parent_path) from ppdet.ext_op import cornerpool_lib +from ppdet.utils.check import enable_static_mode def bottom_pool_np(x): @@ -120,6 +121,5 @@ class TestLeftPoolOp(TestRightPoolOp): if __name__ == "__main__": - import paddle - paddle.enable_static() + enable_static_mode() unittest.main() diff --git a/ppdet/modeling/anchor_heads/solov2_head.py b/ppdet/modeling/anchor_heads/solov2_head.py index 3d92e4b6c6298535611098edf820f0b57a069fff..18546593a4a7dd3cdf987d4cf2de3d9b06c08019 100644 --- a/ppdet/modeling/anchor_heads/solov2_head.py +++ b/ppdet/modeling/anchor_heads/solov2_head.py @@ -71,7 +71,7 @@ class SOLOv2Head(object): kernel='gaussian', sigma=2.0).__dict__, drop_block=False): - check_version('2.0.0') + check_version('2.0.0-rc0') self.num_classes = num_classes self.seg_num_grids = num_grids self.cate_out_channels = self.num_classes - 1 diff --git a/ppdet/modeling/tests/test_architectures.py b/ppdet/modeling/tests/test_architectures.py index 6d51ee0b3d43fc1ef2d7791fc831b834df305591..23c91fbc5a5a77b4a33e1afae3ae0d857ff52b00 100644 --- a/ppdet/modeling/tests/test_architectures.py +++ b/ppdet/modeling/tests/test_architectures.py @@ -30,6 +30,7 @@ if parent_path not in sys.path: from ppdet.modeling.tests.decorator_helper import prog_scope from ppdet.core.workspace import load_config, merge_config, create +from ppdet.utils.check import enable_static_mode class TestFasterRCNN(unittest.TestCase): @@ -91,5 +92,5 @@ class TestSSD(TestFasterRCNN): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() unittest.main() diff --git a/ppdet/utils/check.py b/ppdet/utils/check.py index 50639b45a582f77c1c4da5111ee6e21fc46d402c..960a03903c126b661f0681414dc10b305ed10c3b 100644 --- a/ppdet/utils/check.py +++ b/ppdet/utils/check.py @@ -18,6 +18,7 @@ from __future__ import print_function import sys +import paddle import paddle.fluid as fluid import logging @@ -126,3 +127,10 @@ def check_py_func(program): "if you use MultiClassSoftNMS, better to replace it by "\ "MultiClassNMS.".format(input_arg, output_arg) raise Exception(err) + + +def enable_static_mode(): + try: + paddle.enable_static() + except: + pass diff --git a/slim/distillation/distill.py b/slim/distillation/distill.py index 87cea5b636059180561dd4313dfc540b065eeca6..5e186fffaa8d9633f757dc35cbe5bea9886a322a 100644 --- a/slim/distillation/distill.py +++ b/slim/distillation/distill.py @@ -33,7 +33,7 @@ from ppdet.data.reader import create_reader from ppdet.utils.eval_utils import parse_fetches, eval_results, eval_run from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint import logging @@ -372,7 +372,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-r", diff --git a/slim/extensions/distill_pruned_model/distill_pruned_model.py b/slim/extensions/distill_pruned_model/distill_pruned_model.py index b8b535a8ed638dca7b04528bdb98a503980c5d94..19516ce93d97d25a6246729a1c1263a5129d8729 100644 --- a/slim/extensions/distill_pruned_model/distill_pruned_model.py +++ b/slim/extensions/distill_pruned_model/distill_pruned_model.py @@ -36,7 +36,7 @@ from ppdet.data.reader import create_reader from ppdet.utils.eval_utils import parse_fetches, eval_results, eval_run from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint import logging @@ -360,7 +360,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-t", diff --git a/slim/nas/train_nas.py b/slim/nas/train_nas.py index 853808a1554fb51336e3f3c6bc0ef7c90f33cfd7..df9198a611488fcf3226c20828f19e80dcfd0047 100644 --- a/slim/nas/train_nas.py +++ b/slim/nas/train_nas.py @@ -38,7 +38,7 @@ from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint from paddleslim.analysis import flops, TableLatencyEvaluator from paddleslim.nas import SANAS @@ -379,7 +379,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-r", diff --git a/slim/prune/eval.py b/slim/prune/eval.py index a746e23862066ffa29e7287676169210440b10b1..6dae100b17591512c1f4eab346140e0168c73ce2 100644 --- a/slim/prune/eval.py +++ b/slim/prune/eval.py @@ -30,7 +30,7 @@ from paddleslim.analysis import flops from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results, json_eval_results import ppdet.utils.checkpoint as checkpoint -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.data.reader import create_reader @@ -200,7 +200,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--json_eval", diff --git a/slim/prune/export_model.py b/slim/prune/export_model.py index 6144b00cb597c51c7e0a93f0b572486d970d5e45..dd3c0ae463ba57da159d75be82776db7f06731dc 100644 --- a/slim/prune/export_model.py +++ b/slim/prune/export_model.py @@ -29,7 +29,7 @@ from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.cli import ArgsParser import ppdet.utils.checkpoint as checkpoint from ppdet.utils.export_utils import save_infer_model, dump_infer_config -from ppdet.utils.check import check_config, check_version +from ppdet.utils.check import check_config, check_version, enable_static_mode from paddleslim.prune import Pruner from paddleslim.analysis import flops @@ -98,7 +98,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--output_dir", diff --git a/slim/prune/infer.py b/slim/prune/infer.py index ea2452e2449c63bb66420da91603a59525a28bb1..176cd22a1dd8a6adf46e4aee1d4eb2b8684a5935 100644 --- a/slim/prune/infer.py +++ b/slim/prune/infer.py @@ -35,7 +35,7 @@ from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.eval_utils import parse_fetches from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.utils.visualizer import visualize_results import ppdet.utils.checkpoint as checkpoint @@ -224,7 +224,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--infer_dir", diff --git a/slim/prune/prune.py b/slim/prune/prune.py index e9127e6c0653c7ae38961650179a6dfa40661d06..bb260fcafd90f3a13b560900b0288702ddc13835 100644 --- a/slim/prune/prune.py +++ b/slim/prune/prune.py @@ -39,7 +39,7 @@ from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint import logging @@ -348,7 +348,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-r", diff --git a/slim/quantization/eval.py b/slim/quantization/eval.py index deb0f0b567096c11946d42624f80a3618305bd4e..04142c98250ef0fac58c41dcb2f3078b9baa4825 100644 --- a/slim/quantization/eval.py +++ b/slim/quantization/eval.py @@ -28,7 +28,7 @@ import paddle.fluid as fluid from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results, json_eval_results import ppdet.utils.checkpoint as checkpoint -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.data.reader import create_reader @@ -157,7 +157,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--json_eval", diff --git a/slim/quantization/export_model.py b/slim/quantization/export_model.py index 91fad04e98bd779d5f106c2766bfafab975ec989..41585c883712ca82607e552bb7235c55121d7084 100644 --- a/slim/quantization/export_model.py +++ b/slim/quantization/export_model.py @@ -29,7 +29,7 @@ from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.cli import ArgsParser import ppdet.utils.checkpoint as checkpoint from ppdet.utils.export_utils import save_infer_model, dump_infer_config -from ppdet.utils.check import check_config, check_version +from ppdet.utils.check import check_config, check_version, enable_static_mode import logging FORMAT = '%(asctime)s-%(levelname)s: %(message)s' @@ -88,7 +88,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--output_dir", diff --git a/slim/quantization/infer.py b/slim/quantization/infer.py index 11d2e4d01961d5e6497815d3b1005c84c94f4611..1051043e48c4555fb442a139ba9e4df6f9c5f771 100644 --- a/slim/quantization/infer.py +++ b/slim/quantization/infer.py @@ -32,7 +32,7 @@ from paddle import fluid from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.eval_utils import parse_fetches from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.utils.visualizer import visualize_results import ppdet.utils.checkpoint as checkpoint @@ -169,7 +169,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--infer_dir", diff --git a/slim/quantization/train.py b/slim/quantization/train.py index 2b4a648668195b79a804adebab84e8136d6e5d73..b9fe275809f7bc44c3d2e28d6b89ee33bb073bf8 100644 --- a/slim/quantization/train.py +++ b/slim/quantization/train.py @@ -37,7 +37,7 @@ from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint from paddleslim.quant import quant_aware, convert from pact import pact, get_optimizer @@ -303,7 +303,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--loss_scale", diff --git a/slim/sensitive/sensitive.py b/slim/sensitive/sensitive.py index 15185a73f73b99a0b147f1a8ee84ee59e97174da..022c7b454524d2168b27dd89cabeaf880bdfebdc 100644 --- a/slim/sensitive/sensitive.py +++ b/slim/sensitive/sensitive.py @@ -38,7 +38,7 @@ from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint from paddleslim.prune import sensitivity import logging @@ -168,7 +168,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--output_eval", diff --git a/tools/eval.py b/tools/eval.py index 3c8926a2f549a6881f207f13a632d4b5c3435d71..2d64c7e4a4bc7b9d0f83370c651ef6ab4d253deb 100644 --- a/tools/eval.py +++ b/tools/eval.py @@ -27,7 +27,7 @@ import paddle.fluid as fluid from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results, json_eval_results import ppdet.utils.checkpoint as checkpoint -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.data.reader import create_reader @@ -162,7 +162,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--json_eval", diff --git a/tools/export_model.py b/tools/export_model.py index 8a8df876b37c21dc26604e03de7c8cb5688e7a80..6827b6fe1eebff6a25265caccbed5948eaad7c64 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -30,7 +30,7 @@ from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.cli import ArgsParser import ppdet.utils.checkpoint as checkpoint from ppdet.utils.export_utils import save_infer_model, dump_infer_config -from ppdet.utils.check import check_config, check_version, check_py_func +from ppdet.utils.check import check_config, check_version, check_py_func, enable_static_mode import logging FORMAT = '%(asctime)s-%(levelname)s: %(message)s' logging.basicConfig(level=logging.INFO, format=FORMAT) @@ -72,7 +72,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--output_dir", diff --git a/tools/export_serving_model.py b/tools/export_serving_model.py index b6e9600967b1d01e0ea8a783574299db45d18b55..8c2310eb75706298a3b5742552c88b58082d98de 100644 --- a/tools/export_serving_model.py +++ b/tools/export_serving_model.py @@ -27,7 +27,7 @@ from paddle import fluid from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_config, check_version +from ppdet.utils.check import check_config, check_version, enable_static_mode import ppdet.utils.checkpoint as checkpoint import yaml import logging @@ -95,7 +95,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--output_dir", diff --git a/tools/face_eval.py b/tools/face_eval.py index 38099d1f05a2b1ca63d3d1ccb62894b9d5dd7f59..3ee0e3041629289e79e972d33ede634ef4481360 100644 --- a/tools/face_eval.py +++ b/tools/face_eval.py @@ -31,7 +31,7 @@ from collections import OrderedDict import ppdet.utils.checkpoint as checkpoint from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.utils.widerface_eval_utils import get_shrink, bbox_vote, \ save_widerface_bboxes, save_fddb_bboxes, to_chw_bgr from ppdet.core.workspace import load_config, merge_config, create @@ -271,7 +271,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-f", diff --git a/tools/infer.py b/tools/infer.py index a573e0d67d96d589af8eddcb7339c5d0e293e09b..99a45b09ef43a62f71ee3b4bf1b145bb877ecb99 100644 --- a/tools/infer.py +++ b/tools/infer.py @@ -34,7 +34,7 @@ from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.eval_utils import parse_fetches from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode from ppdet.utils.visualizer import visualize_results import ppdet.utils.checkpoint as checkpoint @@ -234,7 +234,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "--infer_dir", diff --git a/tools/train.py b/tools/train.py index d3264d9790a9f475493466b6feb3419de5a686b6..cf0c93fc6b2d35078a6a307b0d56aa7d16694a18 100644 --- a/tools/train.py +++ b/tools/train.py @@ -43,7 +43,7 @@ from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint import logging @@ -317,7 +317,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-r", diff --git a/tools/train_multi_machine.py b/tools/train_multi_machine.py index 78d5da28ec15175a025be7f491b2263905ab239e..1ac4901a6de23b0766baaed9d3bed8de0e5576f0 100644 --- a/tools/train_multi_machine.py +++ b/tools/train_multi_machine.py @@ -43,7 +43,7 @@ from ppdet.utils import dist_utils from ppdet.utils.eval_utils import parse_fetches, eval_run, eval_results from ppdet.utils.stats import TrainingStats from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu, check_version, check_config +from ppdet.utils.check import check_gpu, check_version, check_config, enable_static_mode import ppdet.utils.checkpoint as checkpoint from paddle.fluid.incubate.fleet.collective import fleet, DistributedStrategy # new line 1 @@ -310,7 +310,7 @@ def main(): if __name__ == '__main__': - paddle.enable_static() + enable_static_mode() parser = ArgsParser() parser.add_argument( "-r",