[CPU] Broken support for Layout::ANY in CPU plugin (#9434)

src/plugins/intel_cpu/src/mkldnn_graph.cpp

@@ -810,7 +810,11 @@ void MKLDNNGraph::PullOutputData(BlobMap &out) {
         if (ext_blob_ptr == intr_blob_ptr) continue;
 
         if (actualDesc.getBlockingDesc() != expectedDesc.getBlockingDesc() && !isScalarOutput) {
-            auto outBlobDesc = MemoryDescUtils::convertToDnnlBlockedMemoryDesc(expectedDesc);
+            // User can initialize output via SetOutput API using tensorDesc with ANY layout.
+            // For these cases we create planar memory descriptor.
+            auto outBlobDesc = expectedDesc.getLayout() == InferenceEngine::Layout::ANY
+                                ? DnnlBlockedMemoryDesc(expectedDesc.getPrecision(), Shape(expectedDesc.getDims()))
+                                : MemoryDescUtils::convertToDnnlBlockedMemoryDesc(expectedDesc);
             auto outBloMem = MKLDNNMemory(eng);
             outBloMem.Create(outBlobDesc, ext_blob_ptr, false);
 

src/tests/functional/plugin/cpu/subgraph_tests/src/any_layout.cpp

@@ -0,0 +1,95 @@
+// Copyright (C) 2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#include "test_utils/cpu_test_utils.hpp"
+
+using namespace InferenceEngine;
+
+namespace SubgraphTestsDefinitions {
+
+class AnyLayoutOnInputsAndOutputs : public ::testing::TestWithParam<ov::Shape> {
+public:
+    static std::string getTestCaseName(::testing::TestParamInfo<ov::Shape> obj) {
+        std::ostringstream result;
+        result << "shape=" << obj.param;
+        return result.str();
+    }
+
+protected:
+    std::shared_ptr<ngraph::Function>
+    create_test_function(const ov::Shape & shape) {
+        auto param = std::make_shared<ngraph::op::Parameter>(ov::element::f32, shape);
+
+        float shift = 1.0f;
+        auto shift_node = std::make_shared<ngraph::op::Constant>(ov::element::f32, ov::Shape{1}, &shift);
+
+        auto add = std::make_shared<ngraph::op::v1::Add>(param, shift_node);
+
+        auto result = std::make_shared<ngraph::op::Result>(add);
+
+        return std::make_shared<ngraph::Function>(ngraph::ResultVector{result}, ngraph::ParameterVector{param});
+    }
+
+    void Run() {
+        const ov::Shape & shape = GetParam();
+        auto shape_size = ov::shape_size(shape);
+
+        std::vector<float> input_data(shape_size, 2);
+        std::vector<float> output_data(shape_size);
+        std::vector<float> expected_output(shape_size, 3);
+
+        // Create CNNNetwork
+        auto ngraph_function = create_test_function(shape);
+        auto cnn = InferenceEngine::CNNNetwork(ngraph_function);
+
+        // Fill inputs and outputs
+        std::vector<std::string> input_names;
+        std::vector<std::string> out_names;
+        for (const auto& it : cnn.getInputsInfo()) {
+            input_names.push_back(it.first);
+        }
+        for (const auto& it : cnn.getOutputsInfo()) {
+            out_names.push_back(it.first);
+        }
+
+        BlobMap inputBlobs;
+        BlobMap outputBlobs;
+
+        TensorDesc tensorDescInp1(Precision::FP32, shape, Layout::ANY);
+        TensorDesc tensorDescOut(Precision::FP32, shape, Layout::ANY);
+
+        inputBlobs[input_names[0]] = make_shared_blob<float>(tensorDescInp1, input_data.data());
+        outputBlobs[out_names[0]]  = make_shared_blob<float>(tensorDescOut, output_data.data());
+
+        // Load network
+        Core ie;
+        ExecutableNetwork executable_network = ie.LoadNetwork(cnn, "CPU");
+
+        // Infer
+        InferRequest infer_request = executable_network.CreateInferRequest();
+        infer_request.SetInput(inputBlobs);
+        infer_request.SetOutput(outputBlobs);
+        infer_request.Infer();
+
+        ASSERT_EQ(output_data, expected_output);
+    }
+};
+
+TEST_P(AnyLayoutOnInputsAndOutputs, CheckExpectedResult) {
+    SKIP_IF_CURRENT_TEST_IS_DISABLED()
+    Run();
+}
+
+static AnyLayoutOnInputsAndOutputs::ParamType AnyLayoutOnInputsAndOutputsParams[] = {
+    ov::Shape{ 1, 2, 3, 4 },
+    ov::Shape{ 1, 2, 3, 4, 5 },
+    ov::Shape{ 1, 2, 3, 4, 5, 6 },
+};
+
+INSTANTIATE_TEST_SUITE_P(AnyLayoutOnInputsAndOutputs,
+                         AnyLayoutOnInputsAndOutputs,
+                         ::testing::ValuesIn(AnyLayoutOnInputsAndOutputsParams),
+                         AnyLayoutOnInputsAndOutputs::getTestCaseName);
+
+}   // namespace SubgraphTestsDefinitions