[IE CPU] Reimplement extension nodes via MKLDNNNode API (openvinotool…

…kit#5784)
andrei-cv · Jun 23, 2021 · fcc07f8 · fcc07f8
1 parent d690ac6
commit fcc07f8
Show file tree

Hide file tree

Showing 80 changed files with 6,169 additions and 5,714 deletions.
diff --git a/inference-engine/src/mkldnn_plugin/cpu_types.h b/inference-engine/src/mkldnn_plugin/cpu_types.h
@@ -64,7 +64,28 @@ enum Type {
     Reference,
     ShuffleChannels,
     DFT,
-    Math
+    Math,
+    CTCLoss,
+    Bucketize,
+    CTCGreedyDecoder,
+    CTCGreedyDecoderSeqLen,
+    CumSum,
+    DetectionOutput,
+    ExperimentalDetectronDetectionOutput,
+    LogSoftmax,
+    TopK,
+    GatherTree,
+    GRN,
+    Range,
+    Proposal,
+    ReorgYolo,
+    ReverseSequence,
+    ExperimentalDetectronTopKROIs,
+    ExperimentalDetectronROIFeatureExtractor,
+    ExperimentalDetectronPriorGridGenerator,
+    ExperimentalDetectronGenerateProposalsSingleImage,
+    ExtractImagePatches,
+    NonMaxSuppression
 };
 
 enum Algorithm {

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_node.cpp
@@ -203,6 +203,27 @@ static const InferenceEngine::details::caseless_unordered_map<std::string, Type>
         { "SoftPlus", Math},
         { "Softsign", Math},
         { "Tan", Math},
+        { "CTCLoss", CTCLoss},
+        { "Bucketize", Bucketize},
+        { "CTCGreedyDecoder", CTCGreedyDecoder},
+        { "CTCGreedyDecoderSeqLen", CTCGreedyDecoderSeqLen},
+        { "CumSum", CumSum},
+        { "DetectionOutput", DetectionOutput},
+        { "ExperimentalDetectronDetectionOutput", ExperimentalDetectronDetectionOutput},
+        { "LogSoftmax", LogSoftmax},
+        { "TopK", TopK},
+        { "GatherTree", GatherTree},
+        { "GRN", GRN},
+        { "Range", Range},
+        { "Proposal", Proposal},
+        { "ReorgYolo", ReorgYolo},
+        { "ReverseSequence", ReverseSequence},
+        { "ExperimentalDetectronTopKROIs", ExperimentalDetectronTopKROIs},
+        { "ExperimentalDetectronROIFeatureExtractor", ExperimentalDetectronROIFeatureExtractor},
+        { "ExperimentalDetectronPriorGridGenerator", ExperimentalDetectronPriorGridGenerator},
+        { "ExperimentalDetectronGenerateProposalsSingleImage", ExperimentalDetectronGenerateProposalsSingleImage},
+        { "ExtractImagePatches", ExtractImagePatches},
+        { "NonMaxSuppressionIEInternal", NonMaxSuppression}
 };
 
 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
@@ -129,7 +129,7 @@ static std::string NameFromType(Type type) {
         case EmbeddingBagPackedSum:
             return "EmbeddingBagPackedSum";
         case EmbeddingBagOffsetsSum:
-            return "EmbeddingBagPackedSum";
+            return "EmbeddingBagOffsetsSum";
         case Gather:
             return "Gather";
         case GatherElements:
@@ -150,6 +150,48 @@ static std::string NameFromType(Type type) {
             return "DFT";
         case Math:
             return "Math";
+        case CTCLoss:
+            return "CTCLoss";
+        case Bucketize:
+            return "Bucketize";
+        case CTCGreedyDecoder:
+            return "CTCGreedyDecoder";
+        case CTCGreedyDecoderSeqLen:
+            return "CTCGreedyDecoderSeqLen";
+        case CumSum:
+            return "CumSum";
+        case DetectionOutput:
+            return "DetectionOutput";
+        case ExperimentalDetectronDetectionOutput:
+            return "ExperimentalDetectronDetectionOutput";
+        case LogSoftmax:
+            return "LogSoftmax";
+        case TopK:
+            return "TopK";
+        case GatherTree:
+            return "GatherTree";
+        case GRN:
+            return "GRN";
+        case Range:
+            return "Range";
+        case Proposal:
+            return "Proposal";
+        case ReorgYolo:
+            return "ReorgYolo";
+        case ReverseSequence:
+            return "ReverseSequence";
+        case ExperimentalDetectronTopKROIs:
+            return "ExperimentalDetectronTopKROIs";
+        case ExperimentalDetectronROIFeatureExtractor:
+            return "ExperimentalDetectronROIFeatureExtractor";
+        case ExperimentalDetectronPriorGridGenerator:
+            return "ExperimentalDetectronPriorGridGenerator";
+        case ExperimentalDetectronGenerateProposalsSingleImage:
+            return "ExperimentalDetectronGenerateProposalsSingleImage";
+        case ExtractImagePatches:
+            return "ExtractImagePatches";
+        case NonMaxSuppression:
+            return "NonMaxSuppression";
         default:
             return "Unknown";
     }

diff --git a/inference-engine/src/mkldnn_plugin/nodes/bucketize.cpp b/inference-engine/src/mkldnn_plugin/nodes/bucketize.cpp