Revert "[gna] Fixed export/import precision"

This reverts commit d381a2e.

inference-engine/src/gna_plugin/gna_model_serial.cpp

@@ -831,7 +831,7 @@ std::vector<HeaderLatest::RuntimeEndPoint> GNAModelSerial::serializeOutputs(cons
         }
         uint32_t elementsCount = static_cast<uint32_t>(InferenceEngine::details::product(outputDims.begin(), outputDims.end()));
         InferenceEngine::Layout outputLayout = output.second->getLayout();
-        uint8_t outputPrecision = output.second->getPrecision().getPrecVal();
+        InferenceEngine::Precision::ePrecision outputPrecision = InferenceEngine::Precision::FP32;
         HeaderLatest::RuntimeEndPoint endPoint(outputsDesc[outputIndex].scale_factor,
                                                  outputsDesc[outputIndex].ptrs[0],
                                                  outputsDesc[outputIndex].num_bytes_per_element,
@@ -866,7 +866,7 @@ std::vector<HeaderLatest::RuntimeEndPoint> GNAModelSerial::serializeInputs(const
         uint32_t elementsCount = static_cast<uint32_t>(InferenceEngine::details::product(inputDims.begin(), inputDims.end()));
         intel_dnn_orientation_t orientation = inputDesc->getOrientation(inputName);
         InferenceEngine::Layout inputLayout = input.second->getLayout();
-        uint8_t inputPrecision = input.second->getPrecision().getPrecVal();
+        InferenceEngine::Precision::ePrecision inputPrecision = InferenceEngine::Precision::FP32;
         HeaderLatest::RuntimeEndPoint endPoint(scaleFactor,
                                                  descriptor_ptr[0],
                                                  element_size,
@@ -886,6 +886,7 @@ void GNAModelSerial::ImportInputs(std::istream &is,
         std::shared_ptr<GNAPluginNS::InputDesc> inputsDesc,
         InferenceEngine::InputsDataMap& dataMap) {
     dataMap.clear();
+
     for (uint32_t inputIndex = 0; inputIndex < modelHeader.nInputs; inputIndex++) {
         const std::string& name = (modelHeader.version.major == 2 && modelHeader.version.minor >= 3)
                 ? inputNames.at(inputIndex) : std::string("input" + std::to_string(inputIndex));

inference-engine/src/gna_plugin/gna_plugin.cpp

@@ -714,7 +714,7 @@ void GNAPlugin::LoadNetwork(CNNNetwork & _network) {
         convertedNetwork = InferenceEngine::details::convertFunctionToICNNNetwork(graph, clonedNetwork);
     }
     IE_SUPPRESS_DEPRECATED_START
-    network = convertedNetwork ? InferenceEngine::CNNNetwork{convertedNetwork} : _network;
+    InferenceEngine::CNNNetwork network = convertedNetwork ? InferenceEngine::CNNNetwork{convertedNetwork} : _network;
     IE_SUPPRESS_DEPRECATED_END
 
     NetPass::ConvertPrecision(network, Precision::I64, Precision::I32);
@@ -1623,6 +1623,7 @@ void GNAPlugin::Export(std::ostream &outStream) {
         THROW_GNA_EXCEPTION << " exporting network with multiple inputs not supported";
     }
 #endif
+
     // TODO: nnet group parameter looks only used in application - so can we move this line into load network.
     IE_ASSERT(!inputsDataMap.empty());
     auto inputDims = inputsDataMap.begin()->second->getTensorDesc().getDims();
@@ -1639,8 +1640,8 @@ void GNAPlugin::Export(std::ostream &outStream) {
     auto serial = GNAModelSerial(modelToSerial,
                                  inputsDesc,
                                  outputsDesc,
-                                 network.getInputsInfo(),
-                                 network.getOutputsInfo())
+                                 inputsDataMap,
+                                 outputsDataMap)
                     .SetInputRotation(transpose_inputs_info)
                     .SetOutputRotation(transpose_outputs_info);
 

inference-engine/src/gna_plugin/gna_plugin.hpp

@@ -80,7 +80,6 @@ class GNAPlugin : public InferenceEngine::IInferencePlugin {
      */
     uint32_t rwSegmentSize = 0;
 
-    InferenceEngine::CNNNetwork network;
     InferenceEngine::InputsDataMap inputsDataMap;
     InferenceEngine::OutputsDataMap outputsDataMap;
     std::vector<InferenceEngine::IVariableStateInternal::Ptr> memoryStates;

inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_reshape_permute_conv.cpp

@@ -46,10 +46,6 @@ TEST_P(ImportReshapePermuteConvGNA, CompareWithRefImpl) {
     Run();
 };
 
-const std::vector<std::vector<size_t>> inputShape = {
-    {}
-};
-
 const std::vector<InferenceEngine::Precision> netPrecisions = {
         InferenceEngine::Precision::FP32,
         InferenceEngine::Precision::FP16
@@ -80,7 +76,6 @@ const std::vector<std::string> appHeaders = {
 
 INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkCase, ImportReshapePermuteConvGNA,
                         ::testing::Combine(
-                            ::testing::ValuesIn(inputShape),
                             ::testing::ValuesIn(netPrecisions),
                             ::testing::Values(CommonTestUtils::DEVICE_GNA),
                             ::testing::ValuesIn(exportConfigs),

inference-engine/tests/functional/plugin/gna/shared_tests_instances/skip_tests_config.cpp

@@ -37,6 +37,8 @@ std::vector<std::string> disabledTestPatterns() {
         R"(.*ConvolutionLayerTest.CompareWithRefs.*D=\(3.1\).*)",
         R"(.*ConstantResultSubgraphTest.*IS=\(2\.3\.4\.5\).*)",
         R"(.*ConstantResultSubgraphTest.*inPrc=(U8|I8|I32|U64|I64|BOOL).*)",
+        // TODO: Issue 51528
+        R"(.*CachingSupport.*_(u8|i16)_.*)",
         // TODO: Issue 51525
         R"(.*CachingSupport.*KSOFunction.*)",
         // TODO: Issue 57363 (Param -> Result subgraphs)

inference-engine/tests/functional/plugin/shared/include/base/import_export_base/import_export_base.hpp

@@ -9,7 +9,6 @@
 #include <ie_core.hpp>
 
 typedef std::tuple<
-    std::vector<size_t>,                // Input shape
     InferenceEngine::Precision,         // Network Precision
     std::string,                        // Target Device
     std::map<std::string, std::string>, // Export Configuration

inference-engine/tests/functional/plugin/shared/src/base/import_export_base/import_export_base.cpp

@@ -9,13 +9,12 @@
 namespace FuncTestUtils {
 
 std::string ImportNetworkTestBase::getTestCaseName(testing::TestParamInfo<exportImportNetworkParams> obj) {
-    std::vector<size_t> inputShape;
     InferenceEngine::Precision netPrecision;
     std::string targetDevice;
     std::map<std::string, std::string> exportConfiguration;
     std::map<std::string, std::string> importConfiguration;
     std::string appHeader;
-    std::tie(inputShape, netPrecision, targetDevice, exportConfiguration, importConfiguration, appHeader) = obj.param;
+    std::tie(netPrecision, targetDevice, exportConfiguration, importConfiguration, appHeader) = obj.param;
 
     std::ostringstream result;
     result << "netPRC=" << netPrecision.name() << "_";
@@ -27,8 +26,6 @@ std::string ImportNetworkTestBase::getTestCaseName(testing::TestParamInfo<export
         result << "_importConfigItem=" << configItem.first << "_" << configItem.second;
     }
     result << "_appHeader=" << appHeader;
-    result << CommonTestUtils::vec2str(inputShape);
-
     return result.str();
 }
 

inference-engine/tests/functional/plugin/shared/src/import_export_tests/import_nonzero.cpp

@@ -9,9 +9,8 @@
 namespace LayerTestsDefinitions {
 
 void ImportNonZero::SetUp() {
-    std::vector<size_t> inputShape;
     InferenceEngine::Precision netPrecision;
-    std::tie(inputShape, netPrecision, targetDevice, exportConfiguration, importConfiguration, applicationHeader) = this->GetParam();
+    std::tie(netPrecision, targetDevice, exportConfiguration, importConfiguration, applicationHeader) = this->GetParam();
     const auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
 
     const auto parameter = std::make_shared<ngraph::opset5::Parameter>(ngPrc, ngraph::Shape{1000});

inference-engine/tests/functional/plugin/shared/src/import_export_tests/import_reshape_permute_conv.cpp

@@ -9,9 +9,8 @@
 namespace LayerTestsDefinitions {
 
 void ImportReshapePermuteConv::SetUp() {
-    std::vector<size_t> inputShape;
     InferenceEngine::Precision netPrecision;
-    std::tie(inputShape, netPrecision, targetDevice, exportConfiguration, importConfiguration, applicationHeader) = this->GetParam();
+    std::tie(netPrecision, targetDevice, exportConfiguration, importConfiguration, applicationHeader) = this->GetParam();
     auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision);
 
     auto params = ngraph::builder::makeParams(ngPrc, { {1, 336} });

inference-engine/tests/functional/shared_test_classes/src/base/layer_test_utils.cpp

@@ -269,14 +269,6 @@ void LayerTestsCommon::Compare(const InferenceEngine::Blob::Ptr &expected, const
             Compare(reinterpret_cast<const std::int32_t *>(expectedBuffer),
                     reinterpret_cast<const std::int32_t *>(actualBuffer), size, 0);
             break;
-        case InferenceEngine::Precision::I16:
-            Compare(reinterpret_cast<const std::int16_t *>(expectedBuffer),
-                    reinterpret_cast<const std::int16_t *>(actualBuffer), size, 0);
-            break;
-        case InferenceEngine::Precision::U8:
-            Compare(reinterpret_cast<const std::uint8_t *>(expectedBuffer),
-                    reinterpret_cast<const std::uint8_t *>(actualBuffer), size, 0);
-            break;
         default:
             FAIL() << "Comparator for " << precision << " precision isn't supported";
     }
@@ -321,7 +313,6 @@ void LayerTestsCommon::LoadNetwork() {
 }
 
 void LayerTestsCommon::GenerateInputs() {
-    inputs.clear();
     const auto& inputsInfo = executableNetwork.GetInputsInfo();
     const auto& functionParams = function->get_parameters();
     for (int i = 0; i < functionParams.size(); ++i) {