From 909ff33989138e26594692908be51e372b841654 Mon Sep 17 00:00:00 2001 From: jiaorui Date: Thu, 16 Feb 2023 16:05:44 +0800 Subject: [PATCH] fix acl reg --- .../op_declare/elewise_calculation_ops_declare.cc | 2 +- .../graph_ir/op_declare/image_ops_declare.cc | 13 +++++++++++++ .../graph_ir/op_declare/image_ops_declare.h | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mindspore/ccsrc/transform/graph_ir/op_declare/elewise_calculation_ops_declare.cc b/mindspore/ccsrc/transform/graph_ir/op_declare/elewise_calculation_ops_declare.cc index a4b7d4a9dfa..326675a9487 100644 --- a/mindspore/ccsrc/transform/graph_ir/op_declare/elewise_calculation_ops_declare.cc +++ b/mindspore/ccsrc/transform/graph_ir/op_declare/elewise_calculation_ops_declare.cc @@ -659,7 +659,7 @@ INPUT_MAP(ArgMin) = {{1, INPUT_DESC(x)}, {2, INPUT_DESC(dimension)}}; ATTR_INPUT_MAP(ArgMin) = {{"axis", "dimension"}}; ATTR_MAP(ArgMin) = {{"output_type", ATTR_DESC(dtype, AnyTraits())}}; OUTPUT_MAP(ArgMin) = {{0, OUTPUT_DESC(y)}}; -REG_ADPT_DESC(ArgMin, kArgminOpName, ADPT_DESC(ArgMin)) +REG_ADPT_DESC(ArgMin, kArgMinOpName, ADPT_DESC(ArgMin)) REG_ADPT_DESC(ArgMinD, kArgMinDOpName, ADPT_DESC(ArgMin)) // Threshold diff --git a/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.cc b/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.cc index 85634e3b865..6fa648c2741 100644 --- a/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.cc +++ b/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.cc @@ -111,4 +111,17 @@ ATTR_MAP(NonMaxSuppressionWithOverlaps) = EMPTY_ATTR_MAP; OUTPUT_MAP(NonMaxSuppressionWithOverlaps) = {{0, OUTPUT_DESC(selected_indices)}}; REG_ADPT_DESC(NonMaxSuppressionWithOverlaps, prim::kPrimNonMaxSuppressionWithOverlaps->name(), ADPT_DESC(NonMaxSuppressionWithOverlaps)) + +// CombinedNonMaxSuppression +INPUT_MAP(CombinedNonMaxSuppression) = { + {1, INPUT_DESC(boxes)}, {2, INPUT_DESC(scores)}, {3, INPUT_DESC(max_output_size_per_class)}, + {4, INPUT_DESC(max_total_size)}, {5, INPUT_DESC(iou_threshold)}, {6, INPUT_DESC(score_threshold)}}; +ATTR_MAP(CombinedNonMaxSuppression) = {{"pad_per_class", ATTR_DESC(pad_per_class, AnyTraits())}, + {"clip_boxes", ATTR_DESC(clip_boxes, AnyTraits())}}; +OUTPUT_MAP(CombinedNonMaxSuppression) = {{0, OUTPUT_DESC(nmsed_boxes)}, + {1, OUTPUT_DESC(nmsed_scores)}, + {2, OUTPUT_DESC(nmsed_classes)}, + {3, OUTPUT_DESC(valid_detections)}}; +REG_ADPT_DESC(CombinedNonMaxSuppression, prim::kPrimCombinedNonMaxSuppression->name(), + ADPT_DESC(CombinedNonMaxSuppression)) } // namespace mindspore::transform diff --git a/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.h b/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.h index dd1d121486e..a3c186f8276 100644 --- a/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.h +++ b/mindspore/ccsrc/transform/graph_ir/op_declare/image_ops_declare.h @@ -51,5 +51,8 @@ DECLARE_OP_USE_OUTPUT(RGBToHSV) DECLARE_OP_ADAPTER(NonMaxSuppressionWithOverlaps) DECLARE_OP_USE_OUTPUT(NonMaxSuppressionWithOverlaps) + +DECLARE_OP_ADAPTER(CombinedNonMaxSuppression) +DECLARE_OP_USE_OUTPUT(CombinedNonMaxSuppression) } // namespace mindspore::transform #endif // MINDSPORE_CCSRC_TRANSFORM_GRAPH_IR_OP_DECLARE_IMAGE_OPS_DECLARE_H_