[cherry-pick] fix sync bn in cpu (#2826)

* fix sync_bn in cpu * fix sync_bn in cpu

[cherry-pick] fix sync bn in cpu (#2826)
* fix sync_bn in cpu * fix sync_bn in cpu
6af48997 · Guanghua Yu · GitHub · 34098ae4 · 6af48997 · 6af48997
隐藏空白更改
内联并排

Showing with 9 addition and 0 deletion

tools/eval.py tools/eval.py +3 -0

tools/infer.py tools/infer.py +3 -0

tools/train.py tools/train.py +3 -0

未找到文件。
--- a/tools/eval.py
+++ b/tools/eval.py
@@ -117,6 +117,9 @@ def main():

    place = paddle.set_device('gpu' if cfg.use_gpu else 'cpu')

+    if 'norm_type' in cfg and cfg['norm_type'] == 'sync_bn' and not cfg.use_gpu:
+        cfg['norm_type'] = 'bn'
+
    if FLAGS.slim_config:
        cfg = build_slim_model(cfg, FLAGS.slim_config, mode='eval')


--- a/tools/infer.py
+++ b/tools/infer.py
@@ -141,6 +141,9 @@ def main():

    place = paddle.set_device('gpu' if cfg.use_gpu else 'cpu')

+    if 'norm_type' in cfg and cfg['norm_type'] == 'sync_bn' and not cfg.use_gpu:
+        cfg['norm_type'] = 'bn'
+
    if FLAGS.slim_config:
        cfg = build_slim_model(cfg, FLAGS.slim_config, mode='test')


--- a/tools/train.py
+++ b/tools/train.py
@@ -123,6 +123,9 @@ def main():

    place = paddle.set_device('gpu' if cfg.use_gpu else 'cpu')

+    if 'norm_type' in cfg and cfg['norm_type'] == 'sync_bn' and not cfg.use_gpu:
+        cfg['norm_type'] = 'bn'
+
    if FLAGS.slim_config:
        cfg = build_slim_model(cfg, FLAGS.slim_config)