piiswrong closed pull request #10242: [MXNET-137]fix parameters name
inconsistent for Proposal OP and Multi Proposal OP
URL: https://github.com/apache/incubator-mxnet/pull/10242
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/operator/contrib/multi_proposal.cc
b/src/operator/contrib/multi_proposal.cc
index 0c52b9b7cfc..3793f27d810 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 fa28c26ace6..c582fb0fce5 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 cb422e2263a..10125a00f06 100644
--- a/tests/python/gpu/test_operator_gpu.py
+++ b/tests/python/gpu/test_operator_gpu.py
@@ -1703,7 +1703,7 @@ def check_proposal_consistency(op, batch_size):
'''
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,
@@ -1722,7 +1722,7 @@ def check_proposal_consistency(op, batch_size):
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 240c06a5d7a..e5d79b71c5b 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -5267,7 +5267,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
@@ -5301,7 +5301,7 @@ def check_forward(rpn_pre_nms_top_n, rpn_post_nms_top_n):
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,
@@ -5315,7 +5315,7 @@ def check_forward(rpn_pre_nms_top_n, rpn_post_nms_top_n):
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,
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
