Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[MXNET-137]fix parameters name inconsistent for Proposal OP and Multi Proposal OP #10242

Merged
merged 1 commit into from May 29, 2018
Merged

[MXNET-137]fix parameters name inconsistent for Proposal OP and Multi Proposal OP #10242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/operator/contrib/multi_proposal.cc
View file
Open in desktop
Expand Up @@ -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__());
Expand Down
2 changes: 1 addition & 1 deletion src/operator/contrib/proposal.cc
View file
Open in desktop
Expand Up @@ -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__());
Expand Down
4 changes: 2 additions & 2 deletions tests/python/gpu/test_operator_gpu.py
View file
Open in desktop
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions tests/python/unittest/test_operator.py
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down