From d31693afec7c036a7530d18d1826e95a71d78dac Mon Sep 17 00:00:00 2001 From: dengkaipeng Date: Tue, 12 Mar 2019 08:05:49 +0000 Subject: [PATCH] no use _gt_score. test=develop --- paddle/fluid/API.spec | 2 +- .../operators/detection/yolov3_loss_op.h | 20 +++++++++---------- python/paddle/fluid/layers/detection.py | 10 +++++----- python/paddle/fluid/tests/test_detection.py | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/paddle/fluid/API.spec b/paddle/fluid/API.spec index aa373efda..7d342c047 100644 --- a/paddle/fluid/API.spec +++ b/paddle/fluid/API.spec @@ -327,7 +327,7 @@ paddle.fluid.layers.generate_mask_labels (ArgSpec(args=['im_info', 'gt_classes', paddle.fluid.layers.iou_similarity (ArgSpec(args=['x', 'y', 'name'], varargs=None, keywords=None, defaults=(None,)), ('document', '587845f60c5d97ffdf2dfd21da52eca1')) paddle.fluid.layers.box_coder (ArgSpec(args=['prior_box', 'prior_box_var', 'target_box', 'code_type', 'box_normalized', 'name', 'axis'], varargs=None, keywords=None, defaults=('encode_center_size', True, None, 0)), ('document', '032d0f4b7d8f6235ee5d91e473344f0e')) paddle.fluid.layers.polygon_box_transform (ArgSpec(args=['input', 'name'], varargs=None, keywords=None, defaults=(None,)), ('document', '0e5ac2507723a0b5adec473f9556799b')) -paddle.fluid.layers.yolov3_loss (ArgSpec(args=['x', 'gtbox', 'gtlabel', 'anchors', 'anchor_mask', 'class_num', 'ignore_thresh', 'downsample_ratio', 'name', 'gtscore', 'use_label_smooth'], varargs=None, keywords=None, defaults=(None, None, True)), ('document', '3da31ac0f0c102b15f613bdaa2c2f7ac')) +paddle.fluid.layers.yolov3_loss (ArgSpec(args=['x', 'gtbox', 'gtlabel', 'anchors', 'anchor_mask', 'class_num', 'ignore_thresh', 'downsample_ratio', 'gtscore', 'use_label_smooth', 'name'], varargs=None, keywords=None, defaults=(None, True, None)), ('document', '57fa96922e42db8f064c3fb77f2255e8')) paddle.fluid.layers.box_clip (ArgSpec(args=['input', 'im_info', 'name'], varargs=None, keywords=None, defaults=(None,)), ('document', '397e9e02b451d99c56e20f268fa03f2e')) paddle.fluid.layers.multiclass_nms (ArgSpec(args=['bboxes', 'scores', 'score_threshold', 'nms_top_k', 'keep_top_k', 'nms_threshold', 'normalized', 'nms_eta', 'background_label', 'name'], varargs=None, keywords=None, defaults=(0.3, True, 1.0, 0, None)), ('document', 'ca7d1107b6c5d2d6d8221039a220fde0')) paddle.fluid.layers.distribute_fpn_proposals (ArgSpec(args=['fpn_rois', 'min_level', 'max_level', 'refer_level', 'refer_scale', 'name'], varargs=None, keywords=None, defaults=(None,)), ('document', '7bb011ec26bace2bc23235aa4a17647d')) diff --git a/paddle/fluid/operators/detection/yolov3_loss_op.h b/paddle/fluid/operators/detection/yolov3_loss_op.h index df6f28d41..a004b022b 100644 --- a/paddle/fluid/operators/detection/yolov3_loss_op.h +++ b/paddle/fluid/operators/detection/yolov3_loss_op.h @@ -299,13 +299,13 @@ class Yolov3LossKernel : public framework::OpKernel { const T* gt_score_data; if (!gt_score) { - Tensor _gt_score; - _gt_score.mutable_data({n, b}, ctx.GetPlace()); + Tensor gtscore; + gtscore.mutable_data({n, b}, ctx.GetPlace()); math::SetConstant()( - ctx.template device_context(), &_gt_score, + ctx.template device_context(), >score, static_cast(1.0)); - gt_score = &_gt_score; - gt_score_data = _gt_score.data(); + gt_score = >score; + gt_score_data = gtscore.data(); } else { gt_score_data = gt_score->data(); } @@ -453,13 +453,13 @@ class Yolov3LossGradKernel : public framework::OpKernel { const T* gt_score_data; if (!gt_score) { - Tensor _gt_score; - _gt_score.mutable_data({n, b}, ctx.GetPlace()); + Tensor gtscore; + gtscore.mutable_data({n, b}, ctx.GetPlace()); math::SetConstant()( - ctx.template device_context(), &_gt_score, + ctx.template device_context(), >score, static_cast(1.0)); - gt_score = &_gt_score; - gt_score_data = _gt_score.data(); + gt_score = >score; + gt_score_data = gtscore.data(); } else { gt_score_data = gt_score->data(); } diff --git a/python/paddle/fluid/layers/detection.py b/python/paddle/fluid/layers/detection.py index 4cc10182e..8225b7067 100644 --- a/python/paddle/fluid/layers/detection.py +++ b/python/paddle/fluid/layers/detection.py @@ -515,9 +515,9 @@ def yolov3_loss(x, class_num, ignore_thresh, downsample_ratio, - name=None, gtscore=None, - use_label_smooth=True): + use_label_smooth=True, + name=None): """ ${comment} @@ -547,7 +547,7 @@ def yolov3_loss(x, TypeError: Input x of yolov3_loss must be Variable TypeError: Input gtbox of yolov3_loss must be Variable TypeError: Input gtlabel of yolov3_loss must be Variable - TypeError: Input gtscore of yolov3_loss must be Variable + TypeError: Input gtscore of yolov3_loss must be None or Variable TypeError: Attr anchors of yolov3_loss must be list or tuple TypeError: Attr class_num of yolov3_loss must be an integer TypeError: Attr ignore_thresh of yolov3_loss must be a float number @@ -559,7 +559,7 @@ def yolov3_loss(x, x = fluid.layers.data(name='x', shape=[255, 13, 13], dtype='float32') gtbox = fluid.layers.data(name='gtbox', shape=[6, 4], dtype='float32') gtlabel = fluid.layers.data(name='gtlabel', shape=[6], dtype='int32') - gtscore = fluid.layers.data(name='gtscore', shape=[6], dtype='int32') + gtscore = fluid.layers.data(name='gtscore', shape=[6], dtype='float32') anchors = [10, 13, 16, 30, 33, 23, 30, 61, 62, 45, 59, 119, 116, 90, 156, 198, 373, 326] anchor_mask = [0, 1, 2] loss = fluid.layers.yolov3_loss(x=x, gtbox=gtbox, gtlabel=gtlabel, @@ -575,7 +575,7 @@ def yolov3_loss(x, raise TypeError("Input gtbox of yolov3_loss must be Variable") if not isinstance(gtlabel, Variable): raise TypeError("Input gtlabel of yolov3_loss must be Variable") - if not isinstance(gtscore, Variable): + if gtsocre is not None and not isinstance(gtscore, Variable): raise TypeError("Input gtscore of yolov3_loss must be Variable") if not isinstance(anchors, list) and not isinstance(anchors, tuple): raise TypeError("Attr anchors of yolov3_loss must be list or tuple") diff --git a/python/paddle/fluid/tests/test_detection.py b/python/paddle/fluid/tests/test_detection.py index b202c0ffe..b756c532c 100644 --- a/python/paddle/fluid/tests/test_detection.py +++ b/python/paddle/fluid/tests/test_detection.py @@ -476,7 +476,7 @@ class TestYoloDetection(unittest.TestCase): x = layers.data(name='x', shape=[30, 7, 7], dtype='float32') gtbox = layers.data(name='gtbox', shape=[10, 4], dtype='float32') gtlabel = layers.data(name='gtlabel', shape=[10], dtype='int32') - gtscore = layers.data(name='gtscore', shape=[10], dtype='int32') + gtscore = layers.data(name='gtscore', shape=[10], dtype='float32') loss = layers.yolov3_loss( x, gtbox, -- GitLab