From e7dbeb06b4972995920e9a2c3f563f67544ca5a3 Mon Sep 17 00:00:00 2001
From: Guanghua Yu <742925032@qq.com>
Date: Mon, 18 Jan 2021 19:08:18 +0800
Subject: [PATCH] fix dygraph solov2 configs, test=dygraph (#2086)

---
 dygraph/configs/solov2/solov2_r50_fpn_1x_coco.yml | 4 ++--
 dygraph/configs/solov2/solov2_r50_fpn_3x_coco.yml | 4 ++--
 dygraph/ppdet/modeling/layers.py                  | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dygraph/configs/solov2/solov2_r50_fpn_1x_coco.yml b/dygraph/configs/solov2/solov2_r50_fpn_1x_coco.yml
index f2c15c10b..e5f548d53 100644
--- a/dygraph/configs/solov2/solov2_r50_fpn_1x_coco.yml
+++ b/dygraph/configs/solov2/solov2_r50_fpn_1x_coco.yml
@@ -1,6 +1,6 @@
 _BASE_: [
-  '../_base_/datasets/coco_instance.yml',
-  '../_base_/runtime.yml',
+  '../datasets/coco_instance.yml',
+  '../runtime.yml',
   '_base_/solov2_r50_fpn.yml',
   '_base_/optimizer_1x.yml',
   '_base_/solov2_reader.yml',
diff --git a/dygraph/configs/solov2/solov2_r50_fpn_3x_coco.yml b/dygraph/configs/solov2/solov2_r50_fpn_3x_coco.yml
index f0ac682ac..abda7711c 100644
--- a/dygraph/configs/solov2/solov2_r50_fpn_3x_coco.yml
+++ b/dygraph/configs/solov2/solov2_r50_fpn_3x_coco.yml
@@ -1,6 +1,6 @@
 _BASE_: [
-  '../_base_/datasets/coco_instance.yml',
-  '../_base_/runtime.yml',
+  '../datasets/coco_instance.yml',
+  '../runtime.yml',
   '_base_/solov2_r50_fpn.yml',
   '_base_/optimizer_1x.yml',
   '_base_/solov2_reader.yml',
diff --git a/dygraph/ppdet/modeling/layers.py b/dygraph/ppdet/modeling/layers.py
index 478d7c14e..7537a0a04 100644
--- a/dygraph/ppdet/modeling/layers.py
+++ b/dygraph/ppdet/modeling/layers.py
@@ -900,6 +900,8 @@ class FCOSBox(object):
         return pred_boxes, pred_scores
 
 
+@register
+@serializable
 class MaskMatrixNMS(object):
     """
     Matrix NMS for multi-class masks.
-- 
GitLab