!34788 change nmsmask checktype order

Merge pull request !34788 from TuDouNi/pass_support_dynamic
This commit is contained in:
i-robot 2022-05-25 01:46:25 +00:00 committed by Gitee
commit 8be4f542e7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 3 deletions

View File

@ -64,7 +64,8 @@ abstract::TupleShapePtr NMSWithMaskInferShape(const PrimitivePtr &primitive,
(void)CheckAndConvertUtils::CheckValue<size_t>("shape of bboxes", bboxes_shape.size(), kEqual, kBboxesShapeSize, (void)CheckAndConvertUtils::CheckValue<size_t>("shape of bboxes", bboxes_shape.size(), kEqual, kBboxesShapeSize,
op_name); op_name);
if (bboxes_shape[1] != kBboxesShapeIn2ndDimNormal && bboxes_shape[1] != kBboxesShapeIn2ndDimAscendAfterPad) { if (bboxes_shape[1] != kBboxesShapeIn2ndDimNormal && bboxes_shape[1] != kBboxesShapeIn2ndDimAscendAfterPad) {
MS_EXCEPTION(ValueError) << "The 2nd dim in shape of bboxes should equal to 5 or 8, but got " << bboxes_shape[1]; MS_EXCEPTION(ValueError) << " For " << op_name
<< ", the 2nd dim in shape of bboxes should equal to 5 or 8, but got " << bboxes_shape[1];
} }
// for ascend // for ascend
@ -121,8 +122,9 @@ AbstractBasePtr NMSWithMaskInfer(const abstract::AnalysisEnginePtr &, const Prim
MS_EXCEPTION_IF_NULL(item); MS_EXCEPTION_IF_NULL(item);
} }
return abstract::MakeAbstract(NMSWithMaskInferShape(primitive, input_args), auto infer_type = NMSWithMaskInferType(primitive, input_args);
NMSWithMaskInferType(primitive, input_args)); auto infer_shape = NMSWithMaskInferShape(primitive, input_args);
return abstract::MakeAbstract(infer_shape, infer_type);
} }
REGISTER_PRIMITIVE_EVAL_IMPL(NMSWithMask, prim::kPrimNMSWithMask, NMSWithMaskInfer, nullptr, true); REGISTER_PRIMITIVE_EVAL_IMPL(NMSWithMask, prim::kPrimNMSWithMask, NMSWithMaskInfer, nullptr, true);
} // namespace ops } // namespace ops