diff --git a/ppdet/data/transform/operators.py b/ppdet/data/transform/operators.py index d18b42a5c9a899956efe02fd36afa2fd80adbd27..f1f8b1f709ce2a976514d0ef610686b9f5845299 100644 --- a/ppdet/data/transform/operators.py +++ b/ppdet/data/transform/operators.py @@ -2061,6 +2061,7 @@ class BboxXYXY2XYWH(BaseOperator): return sample +@register_op class Lighting(BaseOperator): """ Lighting the imagen by eigenvalues and eigenvectors diff --git a/ppdet/modeling/architectures/ttfnet.py b/ppdet/modeling/architectures/ttfnet.py index 75ea43ddc57d09abfb1aaffa3a90b98937afec59..39df8cf3d500be7a6c1790314f077600e2d3a877 100644 --- a/ppdet/modeling/architectures/ttfnet.py +++ b/ppdet/modeling/architectures/ttfnet.py @@ -47,7 +47,7 @@ class TTFNet(object): self.ttf_head = ttf_head self.num_classes = num_classes - def build(self, feed_vars, mode='train'): + def build(self, feed_vars, mode='train', exclude_nms=False): im = feed_vars['image'] mixed_precision_enabled = mixed_precision_global_state() is not None @@ -128,5 +128,5 @@ class TTFNet(object): def eval(self, feed_vars): return self.build(feed_vars, mode='test') - def test(self, feed_vars): - return self.build(feed_vars, mode='test') + def test(self, feed_vars, exclude_nms=False): + return self.build(feed_vars, mode='test', exclude_nms=exclude_nms) diff --git a/ppdet/modeling/ops.py b/ppdet/modeling/ops.py index 2f3033359561a6bf2d69ca809f1ea9d6894f0952..a288e5de97321c1fb8f0455b2918a7be660c0be3 100644 --- a/ppdet/modeling/ops.py +++ b/ppdet/modeling/ops.py @@ -125,7 +125,7 @@ def DeformConvNorm(input, initializer=None, bias_attr=False, name=None): - assert norm_type in ['bn', 'sync_bn', 'affine_channel'] + assert norm_type in ['bn', 'sync_bn', 'affine_channel', 'gn'] conv = DeformConv(input, num_filters, filter_size, stride, groups, dilation, lr_scale, initializer, bias_attr, name) diff --git a/tools/export_model.py b/tools/export_model.py index 54113dc8eb20dfded508e12b5be194b600d02bdb..f29e9de0c56ae5972f65ce4ba79c337077b5a99d 100644 --- a/tools/export_model.py +++ b/tools/export_model.py @@ -112,6 +112,8 @@ def dump_infer_config(FLAGS, config): 'RetinaNet': 40, 'Face': 3, 'TTFNet': 3, + 'FCOS': 3, + 'EfficientDet': 40 } infer_arch = config['architecture']