Merge pull request #12 from liubo-intel/liubo/multiclass_nms_cpu_plugin

Liubo/multiclass nms cpu plugin
liubo-intel · Jul 15, 2021 · 553c99b · 553c99b
2 parents 0e21b43 + ad2642a
commit 553c99b
Show file tree

Hide file tree

Showing 9 changed files with 1,046 additions and 222 deletions.
diff --git a/inference-engine/src/mkldnn_plugin/cpu_types.h b/inference-engine/src/mkldnn_plugin/cpu_types.h
@@ -86,7 +86,8 @@ enum Type {
     ExperimentalDetectronGenerateProposalsSingleImage,
     ExtractImagePatches,
     NonMaxSuppression,
-    MatrixNms
+    MatrixNms,
+    MulticlassNms
 };
 
 enum Algorithm {

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp
@@ -224,7 +224,8 @@ static const InferenceEngine::details::caseless_unordered_map<std::string, Type>
         { "ExperimentalDetectronGenerateProposalsSingleImage", ExperimentalDetectronGenerateProposalsSingleImage},
         { "ExtractImagePatches", ExtractImagePatches},
         { "NonMaxSuppressionIEInternal", NonMaxSuppression},
-        { "MatrixNms", MatrixNms}
+        { "MatrixNms", MatrixNms},
+        { "MulticlassNms", MulticlassNms}
 };
 
 Type TypeFromName(const std::string type) {

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.h b/inference-engine/src/mkldnn_plugin/mkldnn_node.h
@@ -194,6 +194,8 @@ static std::string NameFromType(Type type) {
             return "NonMaxSuppression";
         case MatrixNms:
             return "MatrixNms";
+        case MulticlassNms:
+            return "MulticlassNms";
         default:
             return "Unknown";
     }