You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by jx...@apache.org on 2018/05/29 22:38:39 UTC
[incubator-mxnet] branch master updated: fix parameters name
inconsistent for Proposal OP and Multi Proposal OP (#10242)
This is an automated email from the ASF dual-hosted git repository.
jxie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 33de266 fix parameters name inconsistent for Proposal OP and Multi Proposal OP (#10242)
33de266 is described below
commit 33de266342a210cbeaee53107bf766c3d1ceb0d5
Author: JackieWu <wk...@live.cn>
AuthorDate: Wed May 30 06:38:16 2018 +0800
fix parameters name inconsistent for Proposal OP and Multi Proposal OP (#10242)
---
src/operator/contrib/multi_proposal.cc | 2 +-
src/operator/contrib/proposal.cc | 2 +-
tests/python/gpu/test_operator_gpu.py | 4 ++--
tests/python/unittest/test_operator.py | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/operator/contrib/multi_proposal.cc b/src/operator/contrib/multi_proposal.cc
index 0c52b9b..3793f27 100644
--- a/src/operator/contrib/multi_proposal.cc
+++ b/src/operator/contrib/multi_proposal.cc
@@ -497,7 +497,7 @@ DMLC_REGISTER_PARAMETER(MultiProposalParam);
MXNET_REGISTER_OP_PROPERTY(_contrib_MultiProposal, MultiProposalProp)
.describe("Generate region proposals via RPN")
-.add_argument("cls_score", "NDArray-or-Symbol", "Score of how likely proposal is object.")
+.add_argument("cls_prob", "NDArray-or-Symbol", "Score of how likely proposal is object.")
.add_argument("bbox_pred", "NDArray-or-Symbol", "BBox Predicted deltas from anchors for proposals")
.add_argument("im_info", "NDArray-or-Symbol", "Image size and scale.")
.add_arguments(MultiProposalParam::__FIELDS__());
diff --git a/src/operator/contrib/proposal.cc b/src/operator/contrib/proposal.cc
index fa28c26..c582fb0 100644
--- a/src/operator/contrib/proposal.cc
+++ b/src/operator/contrib/proposal.cc
@@ -459,7 +459,7 @@ DMLC_REGISTER_PARAMETER(ProposalParam);
MXNET_REGISTER_OP_PROPERTY(_contrib_Proposal, ProposalProp)
.describe("Generate region proposals via RPN")
-.add_argument("cls_score", "NDArray-or-Symbol", "Score of how likely proposal is object.")
+.add_argument("cls_prob", "NDArray-or-Symbol", "Score of how likely proposal is object.")
.add_argument("bbox_pred", "NDArray-or-Symbol", "BBox Predicted deltas from anchors for proposals")
.add_argument("im_info", "NDArray-or-Symbol", "Image size and scale.")
.add_arguments(ProposalParam::__FIELDS__());
diff --git a/tests/python/gpu/test_operator_gpu.py b/tests/python/gpu/test_operator_gpu.py
index d5e0262..7c3d670 100644
--- a/tests/python/gpu/test_operator_gpu.py
+++ b/tests/python/gpu/test_operator_gpu.py
@@ -1748,7 +1748,7 @@ def test_multi_proposal_op():
'''
cls_prob, bbox_pred, im_info = get_new_data(batch_size, mx.cpu(0))
rois_cpu, score_cpu = op(
- cls_score = cls_prob,
+ cls_prob = cls_prob,
bbox_pred = bbox_pred,
im_info = im_info,
feature_stride = feature_stride,
@@ -1767,7 +1767,7 @@ def test_multi_proposal_op():
im_info_gpu = im_info.as_in_context(gpu_ctx)
rois_gpu, score_gpu = op(
- cls_score = cls_prob_gpu,
+ cls_prob = cls_prob_gpu,
bbox_pred = bbox_pred_gpu,
im_info = im_info_gpu,
feature_stride = feature_stride,
diff --git a/tests/python/unittest/test_operator.py b/tests/python/unittest/test_operator.py
index 923a453..69516bc 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -5818,7 +5818,7 @@ def test_multi_proposal_op():
rpn_min_size = 16
batch_size = 20
- feat_len = 14
+ feat_len = (1000 + 15) // 16
H, W = feat_len, feat_len
num_anchors = len(scales) * len(ratios)
count_anchors = H * W * num_anchors
@@ -5852,7 +5852,7 @@ def test_multi_proposal_op():
single_score = []
for i in range(batch_size):
rois, score = mx.nd.contrib.Proposal(
- cls_score = get_sub(cls_prob, i),
+ cls_prob = get_sub(cls_prob, i),
bbox_pred = get_sub(bbox_pred, i),
im_info = get_sub(im_info, i),
feature_stride = feature_stride,
@@ -5866,7 +5866,7 @@ def test_multi_proposal_op():
single_score.append(score)
multi_proposal, multi_score = mx.nd.contrib.MultiProposal(
- cls_score = cls_prob,
+ cls_prob = cls_prob,
bbox_pred = bbox_pred,
im_info = im_info,
feature_stride = feature_stride,
--
To stop receiving notification emails like this one, please contact
jxie@apache.org.