Updated inference_engine.hpp (#1539)

diff --git a/inference-engine/include/cldnn/cldnn_config.hpp b/inference-engine/include/cldnn/cldnn_config.hpp
index 9d8cf84..5397af3 100644 (file)
--- a/inference-engine/include/cldnn/cldnn_config.hpp
+++ b/inference-engine/include/cldnn/cldnn_config.hpp
@@ -6,11 +6,10 @@
  * @brief A header for advanced hardware related properties for clDNN plugin
  *        To use in SetConfig() method of plugins
  *
- * @file
+ * @file cldnn_config.hpp
  */
 #pragma once
 
-#include <string>
 #include "ie_plugin_config.hpp"
 
 namespace InferenceEngine {

diff --git a/inference-engine/include/cpp/ie_cnn_network.h b/inference-engine/include/cpp/ie_cnn_network.h
index e1b2c71..8cd2358 100644 (file)
--- a/inference-engine/include/cpp/ie_cnn_network.h
+++ b/inference-engine/include/cpp/ie_cnn_network.h
@@ -9,17 +9,17 @@
  */
 #pragma once
 
-#include <details/ie_exception_conversion.hpp>
-#include <ie_icnn_network.hpp>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "ie_icnn_network.hpp"
 #include "ie_blob.h"
 #include "ie_common.h"
 #include "ie_data.h"
+#include "details/ie_exception_conversion.hpp"
 
 namespace ngraph {
 

diff --git a/inference-engine/include/cpp/ie_executable_network.hpp b/inference-engine/include/cpp/ie_executable_network.hpp
index ea0fa07..5b8cfa7 100644 (file)
--- a/inference-engine/include/cpp/ie_executable_network.hpp
+++ b/inference-engine/include/cpp/ie_executable_network.hpp
@@ -18,9 +18,9 @@
 #include "cpp/ie_cnn_network.h"
 #include "cpp/ie_infer_request.hpp"
 #include "cpp/ie_memory_state.hpp"
+#include "ie_iexecutable_network.hpp"
 #include "details/ie_exception_conversion.hpp"
 #include "details/ie_so_loader.h"
-#include "ie_iexecutable_network.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/cpp/ie_infer_request.hpp b/inference-engine/include/cpp/ie_infer_request.hpp
index f89d75e..18daaf7 100644 (file)
--- a/inference-engine/include/cpp/ie_infer_request.hpp
+++ b/inference-engine/include/cpp/ie_infer_request.hpp
@@ -13,9 +13,9 @@
 #include <memory>
 #include <string>
 
+#include "ie_iinfer_request.hpp"
 #include "details/ie_exception_conversion.hpp"
 #include "details/ie_so_loader.h"
-#include "ie_iinfer_request.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/cpp/ie_memory_state.hpp b/inference-engine/include/cpp/ie_memory_state.hpp
index 99da414..3fe79d0 100644 (file)
--- a/inference-engine/include/cpp/ie_memory_state.hpp
+++ b/inference-engine/include/cpp/ie_memory_state.hpp
@@ -9,7 +9,8 @@
 #pragma once
 
 #include <string>
-#include <ie_imemory_state.hpp>
+
+#include "ie_imemory_state.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/details/caseless.hpp b/inference-engine/include/details/caseless.hpp
index 16c910c..b9b0804 100644 (file)
--- a/inference-engine/include/details/caseless.hpp
+++ b/inference-engine/include/details/caseless.hpp
@@ -3,10 +3,11 @@
 //
 
 /**
- * @file
+ * @file A header file with caseless containers
  */
 
 #pragma once
+
 #include <algorithm>
 #include <cctype>
 #include <functional>

diff --git a/inference-engine/include/details/ie_exception.hpp b/inference-engine/include/details/ie_exception.hpp
index 80073a7..e85d5a6 100644 (file)
--- a/inference-engine/include/details/ie_exception.hpp
+++ b/inference-engine/include/details/ie_exception.hpp
@@ -9,7 +9,7 @@
  */
 #pragma once
 
-#include <ie_api.h>
+#include "ie_api.h"
 
 #include <functional>
 #include <memory>

diff --git a/inference-engine/include/details/ie_exception_conversion.hpp b/inference-engine/include/details/ie_exception_conversion.hpp
index 02ab2f9..3a39275 100644 (file)
--- a/inference-engine/include/details/ie_exception_conversion.hpp
+++ b/inference-engine/include/details/ie_exception_conversion.hpp
@@ -8,7 +8,9 @@
  * @file ie_exception_conversion.hpp
  */
 #pragma once
-#include <ie_common.h>
+
+#include "ie_common.h"
+#include "details/ie_exception.hpp"
 
 #define CALL_STATUS_FNC(function, ...)               \
     if (!actual)    THROW_IE_EXCEPTION << "Wrapper used in the CALL_STATUS_FNC was not initialized."; \

diff --git a/inference-engine/include/details/ie_pre_allocator.hpp b/inference-engine/include/details/ie_pre_allocator.hpp
index 79906f7..70cce33 100644 (file)
--- a/inference-engine/include/details/ie_pre_allocator.hpp
+++ b/inference-engine/include/details/ie_pre_allocator.hpp
@@ -9,10 +9,10 @@
  */
 #pragma once
 
-#include <details/ie_exception.hpp>
 #include <memory>
 
 #include "ie_allocator.hpp"
+#include "details/ie_exception.hpp"
 
 namespace InferenceEngine {
 namespace details {

diff --git a/inference-engine/include/details/ie_so_loader.h b/inference-engine/include/details/ie_so_loader.h
index 599df43..82b4412 100644 (file)
--- a/inference-engine/include/details/ie_so_loader.h
+++ b/inference-engine/include/details/ie_so_loader.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #ifndef _WIN32
-#include "os/lin_shared_object_loader.h"
+# include "os/lin_shared_object_loader.h"
 #else
-#include "os/win_shared_object_loader.h"
+# include "os/win_shared_object_loader.h"
 #endif

diff --git a/inference-engine/include/details/ie_so_pointer.hpp b/inference-engine/include/details/ie_so_pointer.hpp
index 983ca97..b67ae3b 100644 (file)
--- a/inference-engine/include/details/ie_so_pointer.hpp
+++ b/inference-engine/include/details/ie_so_pointer.hpp
@@ -13,12 +13,13 @@
 #include <string>
 #include <type_traits>
 
+#include "ie_common.h"
+#include "ie_unicode.hpp"
+#include "ie_so_loader.h"
 #include "details/ie_exception.hpp"
 #include "details/ie_no_release.hpp"
 #include "details/ie_irelease.hpp"
 #include "details/os/os_filesystem.hpp"
-#include "ie_common.h"
-#include "ie_so_loader.h"
 
 namespace InferenceEngine {
 namespace details {

diff --git a/inference-engine/include/details/os/os_filesystem.hpp b/inference-engine/include/details/os/os_filesystem.hpp
index 6513dfc..d48fa43 100644 (file)
--- a/inference-engine/include/details/os/os_filesystem.hpp
+++ b/inference-engine/include/details/os/os_filesystem.hpp
@@ -9,10 +9,10 @@
  */
 #pragma once
 
-#include <ie_api.h>
+#include "ie_api.h"
 
 #ifdef ENABLE_UNICODE_PATH_SUPPORT
-#include <codecvt>
+# include <codecvt>
 #endif
 
 #include <locale>

diff --git a/inference-engine/include/gna/gna_config.hpp b/inference-engine/include/gna/gna_config.hpp
index d9d80d3..a6290f0 100644 (file)
--- a/inference-engine/include/gna/gna_config.hpp
+++ b/inference-engine/include/gna/gna_config.hpp
@@ -11,17 +11,8 @@
 
 #pragma once
 
-#include <string>
 #include "ie_plugin_config.hpp"
 
-#ifdef GNA_LIB_VER
-#if GNA_LIB_VER == 2
-#define DISABLE_TEST_ON_GNA2 GTEST_SKIP();
-#else
-#define DISABLE_TEST_ON_GNA2
-#endif
-#endif
-
 namespace InferenceEngine {
 
 /**

diff --git a/inference-engine/include/gpu/gpu_context_api_dx.hpp b/inference-engine/include/gpu/gpu_context_api_dx.hpp
index b9daeb5..03d284b 100644 (file)
--- a/inference-engine/include/gpu/gpu_context_api_dx.hpp
+++ b/inference-engine/include/gpu/gpu_context_api_dx.hpp
@@ -13,7 +13,8 @@
 
 #include <memory>
 #include <string>
-#include "gpu_context_api_ocl.hpp"
+
+#include "gpu/gpu_context_api_ocl.hpp"
 
 #include <d3d11.h>
 

diff --git a/inference-engine/include/gpu/gpu_context_api_ocl.hpp b/inference-engine/include/gpu/gpu_context_api_ocl.hpp
index aa9d640..16cdd5b 100644 (file)
--- a/inference-engine/include/gpu/gpu_context_api_ocl.hpp
+++ b/inference-engine/include/gpu/gpu_context_api_ocl.hpp
@@ -12,11 +12,13 @@
 
 #include <memory>
 #include <string>
+
 #include "ie_compound_blob.h"
-#include "ie_core.hpp"
-#include "gpu_params.hpp"
-#include "details/gpu_context_helpers.hpp"
-#include "gpu_ocl_wrapper.hpp"
+#include "ie_remote_context.hpp"
+
+#include "gpu/gpu_params.hpp"
+#include "gpu/gpu_ocl_wrapper.hpp"
+#include "gpu/details/gpu_context_helpers.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/gpu/gpu_context_api_va.hpp b/inference-engine/include/gpu/gpu_context_api_va.hpp
index 56e8450..041700f 100644 (file)
--- a/inference-engine/include/gpu/gpu_context_api_va.hpp
+++ b/inference-engine/include/gpu/gpu_context_api_va.hpp
@@ -13,7 +13,8 @@
 
 #include <memory>
 #include <string>
-#include "gpu_context_api_ocl.hpp"
+
+#include "gpu/gpu_context_api_ocl.hpp"
 
 #include <va/va.h>
 

diff --git a/inference-engine/include/hetero/hetero_plugin_config.hpp b/inference-engine/include/hetero/hetero_plugin_config.hpp
index fb5be4e..a0388c6 100644 (file)
--- a/inference-engine/include/hetero/hetero_plugin_config.hpp
+++ b/inference-engine/include/hetero/hetero_plugin_config.hpp
@@ -11,9 +11,6 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include "ie_plugin_config.hpp"
 
 namespace InferenceEngine {

diff --git a/inference-engine/include/ie_allocator.hpp b/inference-engine/include/ie_allocator.hpp
index 27db3ba..edfec35 100644 (file)
--- a/inference-engine/include/ie_allocator.hpp
+++ b/inference-engine/include/ie_allocator.hpp
@@ -9,9 +9,8 @@
  */
 #pragma once
 
-#include <ie_api.h>
-
-#include <details/ie_irelease.hpp>
+#include "ie_api.h"
+#include "details/ie_irelease.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/ie_blob.h b/inference-engine/include/ie_blob.h
index aa0fb21..a586a7b 100644 (file)
--- a/inference-engine/include/ie_blob.h
+++ b/inference-engine/include/ie_blob.h
@@ -19,14 +19,14 @@
 #include <utility>
 #include <vector>
 
-#include "details/ie_blob_iterator.hpp"
-#include "details/ie_exception.hpp"
-#include "details/ie_pre_allocator.hpp"
 #include "ie_allocator.hpp"
 #include "ie_common.h"
 #include "ie_layouts.h"
 #include "ie_locked_memory.hpp"
 #include "ie_precision.hpp"
+#include "details/ie_blob_iterator.hpp"
+#include "details/ie_exception.hpp"
+#include "details/ie_pre_allocator.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/ie_common.h b/inference-engine/include/ie_common.h
index 1dc5667..63617e6 100644 (file)
--- a/inference-engine/include/ie_common.h
+++ b/inference-engine/include/ie_common.h
@@ -11,14 +11,11 @@
 
 #include <algorithm>
 #include <cstdlib>
-#include <details/ie_exception.hpp>
 #include <memory>
 #include <ostream>
 #include <string>
 #include <vector>
 
-#include "ie_unicode.hpp"
-
 namespace InferenceEngine {
 /**
  * @brief Represents tensor size.

diff --git a/inference-engine/include/ie_core.hpp b/inference-engine/include/ie_core.hpp
index fdb60d7..52cedc6 100644 (file)
--- a/inference-engine/include/ie_core.hpp
+++ b/inference-engine/include/ie_core.hpp
@@ -14,10 +14,11 @@
 #include <string>
 #include <vector>
 
-#include <cpp/ie_executable_network.hpp>
-#include "details/os/os_filesystem.hpp"
+#include "ie_version.hpp"
 #include "ie_extension.h"
 #include "ie_remote_context.hpp"
+#include "cpp/ie_executable_network.hpp"
+#include "details/os/os_filesystem.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/ie_data.h b/inference-engine/include/ie_data.h
index 1b70687..0a11cce 100644 (file)
--- a/inference-engine/include/ie_data.h
+++ b/inference-engine/include/ie_data.h
@@ -14,8 +14,6 @@
 #include <string>
 #include <vector>
 
-#include "details/ie_exception.hpp"
-#include "ie_api.h"
 #include "ie_common.h"
 #include "ie_layouts.h"
 #include "ie_precision.hpp"

diff --git a/inference-engine/include/ie_extension.h b/inference-engine/include/ie_extension.h
index e9c860c..f28223e 100644 (file)
--- a/inference-engine/include/ie_extension.h
+++ b/inference-engine/include/ie_extension.h
@@ -14,8 +14,9 @@
 #include <string>
 #include <vector>
 
-#include "details/ie_so_pointer.hpp"
+#include "ie_unicode.hpp"
 #include "ie_iextension.h"
+#include "details/ie_so_pointer.hpp"
 
 namespace InferenceEngine {
 namespace details {

diff --git a/inference-engine/include/ie_icnn_network.hpp b/inference-engine/include/ie_icnn_network.hpp
index 1282621..1d803b3 100644 (file)
--- a/inference-engine/include/ie_icnn_network.hpp
+++ b/inference-engine/include/ie_icnn_network.hpp
@@ -13,13 +13,11 @@
 #include <memory>
 #include <string>
 
-#include "details/ie_irelease.hpp"
 #include "ie_blob.h"
 #include "ie_common.h"
 #include "ie_data.h"
-#include "ie_iextension.h"
 #include "ie_input_info.hpp"
-#include "ie_preprocess.hpp"
+#include "details/ie_irelease.hpp"
 
 namespace ngraph {
 

diff --git a/inference-engine/include/ie_iextension.h b/inference-engine/include/ie_iextension.h
index 9d701f2..964d848 100644 (file)
--- a/inference-engine/include/ie_iextension.h
+++ b/inference-engine/include/ie_iextension.h
@@ -14,12 +14,12 @@
 #include <string>
 #include <vector>
 
-#include "details/ie_no_copy.hpp"
 #include "ie_api.h"
 #include "ie_common.h"
 #include "ie_layouts.h"
 #include "ie_blob.h"
 #include "ie_version.hpp"
+#include "details/ie_no_copy.hpp"
 
 /**
  * @def INFERENCE_EXTENSION_API(TYPE)

diff --git a/inference-engine/include/ie_iinfer_request.hpp b/inference-engine/include/ie_iinfer_request.hpp
index 3acb93a..a83b613 100644 (file)
--- a/inference-engine/include/ie_iinfer_request.hpp
+++ b/inference-engine/include/ie_iinfer_request.hpp
@@ -10,15 +10,14 @@
 
 #pragma once
 
-#include <ie_blob.h>
-
-#include <details/ie_irelease.hpp>
 #include <map>
 #include <memory>
 #include <string>
 
+#include "ie_blob.h"
 #include "ie_common.h"
 #include "ie_preprocess.hpp"
+#include "details/ie_irelease.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/ie_imemory_state.hpp b/inference-engine/include/ie_imemory_state.hpp
index e3b7ce4..98c9f34 100644 (file)
--- a/inference-engine/include/ie_imemory_state.hpp
+++ b/inference-engine/include/ie_imemory_state.hpp
@@ -9,11 +9,12 @@
  */
 
 #pragma once
+
 #include <memory>
 
-#include "details/ie_no_copy.hpp"
 #include "ie_blob.h"
 #include "ie_common.h"
+#include "details/ie_no_copy.hpp"
 
 namespace InferenceEngine {
 

diff --git a/inference-engine/include/ie_parameter.hpp b/inference-engine/include/ie_parameter.hpp
index 4c85d39..d274edd 100644 (file)
--- a/inference-engine/include/ie_parameter.hpp
+++ b/inference-engine/include/ie_parameter.hpp
@@ -20,7 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include "ie_api.h"
 #include "ie_blob.h"
 
 namespace ngraph {

diff --git a/inference-engine/include/ie_plugin_config.hpp b/inference-engine/include/ie_plugin_config.hpp
index 043b706..b218e58 100644 (file)
--- a/inference-engine/include/ie_plugin_config.hpp
+++ b/inference-engine/include/ie_plugin_config.hpp
@@ -3,10 +3,8 @@
 //
 
 /**
- * @brief a header for advanced hardware related properties for IE plugins
- *
- *        To use in SetConfig() method of plugins
- *        LoadNetwork() method overloads that accept config as parameter
+ * @brief A header for advanced hardware related properties for IE plugins
+ *        To use in SetConfig, LoadNetwork, ImportNetwork methods of plugins
  *
  * @file ie_plugin_config.hpp
  */

diff --git a/inference-engine/include/ie_precision.hpp b/inference-engine/include/ie_precision.hpp
index e7f3cf7..2c8f3fe 100644 (file)
--- a/inference-engine/include/ie_precision.hpp
+++ b/inference-engine/include/ie_precision.hpp
@@ -8,6 +8,7 @@
  * @file ie_precision.hpp
  */
 #pragma once
+
 #include <string>
 #include <unordered_map>
 #include <vector>

diff --git a/inference-engine/include/ie_unicode.hpp b/inference-engine/include/ie_unicode.hpp
index 102c9f7..cf43b1a 100644 (file)
--- a/inference-engine/include/ie_unicode.hpp
+++ b/inference-engine/include/ie_unicode.hpp
@@ -11,7 +11,6 @@
 
 #include <algorithm>
 #include <cstdlib>
-#include <details/ie_exception.hpp>
 #include <memory>
 #include <ostream>
 #include <string>

diff --git a/inference-engine/include/inference_engine.hpp b/inference-engine/include/inference_engine.hpp
index c7d1337..4f97a3e 100644 (file)
--- a/inference-engine/include/inference_engine.hpp
+++ b/inference-engine/include/inference_engine.hpp
@@ -8,10 +8,6 @@
  */
 #pragma once
 
-#include <ie_api.h>
-#include <ie_blob.h>
-#include <cpp/ie_executable_network.hpp>
-#include <ie_core.hpp>
-#include <ie_icnn_network.hpp>
-#include <ie_plugin_config.hpp>
-#include <ie_version.hpp>
+#include "ie_plugin_config.hpp"
+#include "ie_compound_blob.h"
+#include "ie_core.hpp"

diff --git a/inference-engine/include/multi-device/multi_device_config.hpp b/inference-engine/include/multi-device/multi_device_config.hpp
index 088be4e..2f5bdb3 100644 (file)
--- a/inference-engine/include/multi-device/multi_device_config.hpp
+++ b/inference-engine/include/multi-device/multi_device_config.hpp
@@ -11,7 +11,6 @@
 
 #pragma once
 
-#include <string>
 #include "ie_plugin_config.hpp"
 
 namespace InferenceEngine {

diff --git a/inference-engine/include/vpu/hddl_plugin_config.hpp b/inference-engine/include/vpu/hddl_plugin_config.hpp
index 37d22c3..c7e1db5 100644 (file)
--- a/inference-engine/include/vpu/hddl_plugin_config.hpp
+++ b/inference-engine/include/vpu/hddl_plugin_config.hpp
@@ -6,16 +6,12 @@
  * @brief A header that defines advanced related properties for VPU plugins.
  * These properties should be used in SetConfig() and LoadNetwork() methods of plugins
  *
- * @file 
+ * @file hddl_plugin_config.hpp
  */
 
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include "ie_plugin_config.hpp"
-#include "ie_api.h"
 
 //
 // Options

diff --git a/inference-engine/include/vpu/myriad_plugin_config.hpp b/inference-engine/include/vpu/myriad_plugin_config.hpp
index 1d94d37..75cd3e2 100644 (file)
--- a/inference-engine/include/vpu/myriad_plugin_config.hpp
+++ b/inference-engine/include/vpu/myriad_plugin_config.hpp
@@ -6,15 +6,12 @@
  * @brief A header that defines advanced related properties for VPU plugins.
  * These properties should be used in SetConfig() and LoadNetwork() methods of plugins
  *
- * @file
+ * @file myriad_plugin_config
  */
 
 #pragma once
 
-#include <string>
-
 #include "ie_plugin_config.hpp"
-#include "ie_api.h"
 
 /**
  * @def VPU_MYRIAD_CONFIG_KEY(name)

diff --git a/inference-engine/include/vpu/vpu_plugin_config.hpp b/inference-engine/include/vpu/vpu_plugin_config.hpp
index e681055..e05eae4 100644 (file)
--- a/inference-engine/include/vpu/vpu_plugin_config.hpp
+++ b/inference-engine/include/vpu/vpu_plugin_config.hpp
@@ -11,11 +11,8 @@
 
 #pragma once
 
-#include <string>
-
-#include "ie_plugin_config.hpp"
-#include "myriad_plugin_config.hpp"
-#include "hddl_plugin_config.hpp"
+#include "vpu/myriad_plugin_config.hpp"
+#include "vpu/hddl_plugin_config.hpp"
 #include "ie_api.h"
 
 //

diff --git a/inference-engine/samples/benchmark_app/infer_request_wrap.hpp b/inference-engine/samples/benchmark_app/infer_request_wrap.hpp
index a381e59..945c5a0 100644 (file)
--- a/inference-engine/samples/benchmark_app/infer_request_wrap.hpp
+++ b/inference-engine/samples/benchmark_app/infer_request_wrap.hpp
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <functional>
 
-#include "inference_engine.hpp"
+#include <inference_engine.hpp>
 #include "statistics_report.hpp"
 
 typedef std::chrono::high_resolution_clock Time;

diff --git a/inference-engine/samples/common/samples/classification_results.h b/inference-engine/samples/common/samples/classification_results.h
index e18eff5..12b4c10 100644 (file)
--- a/inference-engine/samples/common/samples/classification_results.h
+++ b/inference-engine/samples/common/samples/classification_results.h
@@ -12,7 +12,7 @@
 #include <utility>
 #include <algorithm>
 
-#include <ie_blob.h>
+#include <inference_engine.hpp>
 
 /**
  * @class ClassificationResult

diff --git a/inference-engine/samples/common/samples/common.hpp b/inference-engine/samples/common/samples/common.hpp
index 72c6ee3..f7867f8 100644 (file)
--- a/inference-engine/samples/common/samples/common.hpp
+++ b/inference-engine/samples/common/samples/common.hpp
@@ -21,10 +21,7 @@
 #include <algorithm>
 #include <random>
 
-#include <ie_core.hpp>
-#include <ie_plugin_config.hpp>
-#include <cpp/ie_infer_request.hpp>
-#include <ie_blob.h>
+#include <inference_engine.hpp>
 
 #ifndef UNUSED
   #if defined (_MSC_VER) && !defined (__clang__)

diff --git a/inference-engine/samples/hello_nv12_input_classification/main.cpp b/inference-engine/samples/hello_nv12_input_classification/main.cpp
index daed0b3..3e9f7c9 100644 (file)
--- a/inference-engine/samples/hello_nv12_input_classification/main.cpp
+++ b/inference-engine/samples/hello_nv12_input_classification/main.cpp
@@ -11,7 +11,6 @@
 #include <memory>
 
 #include <inference_engine.hpp>
-#include <ie_compound_blob.h>
 
 #include <samples/common.hpp>
 #include <samples/classification_results.h>

diff --git a/inference-engine/samples/hello_reshape_ssd/main.cpp b/inference-engine/samples/hello_reshape_ssd/main.cpp
index fc5387e..cba1d81 100644 (file)
--- a/inference-engine/samples/hello_reshape_ssd/main.cpp
+++ b/inference-engine/samples/hello_reshape_ssd/main.cpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <string>
 
-#include <ie_core.hpp>
+#include <inference_engine.hpp>
 #include <ngraph/ngraph.hpp>
 
 #include <samples/ocv_common.hpp>

diff --git a/inference-engine/samples/hello_reshape_ssd/reshape_ssd_extension.hpp b/inference-engine/samples/hello_reshape_ssd/reshape_ssd_extension.hpp
index 6c44f57..699824d 100644 (file)
--- a/inference-engine/samples/hello_reshape_ssd/reshape_ssd_extension.hpp
+++ b/inference-engine/samples/hello_reshape_ssd/reshape_ssd_extension.hpp
@@ -8,10 +8,7 @@
 #include <algorithm>
 #include <vector>
 
-#include <ie_layouts.h>
-#include <ie_iextension.h>
-#include <ie_blob.h>
-
+#include <inference_engine.hpp>
 #include <ngraph/ngraph.hpp>
 
 #define CUSTOM_RELU_TYPE "CustomReLU"

diff --git a/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp b/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp
index eb61208..85be1a5 100644 (file)
--- a/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp
+++ b/inference-engine/src/cldnn_engine/cldnn_executable_network.cpp
@@ -21,7 +21,6 @@
 #include <net_pass.h>
 #include "cldnn_infer_request.h"
 #include <threading/ie_executor_manager.hpp>
-#include "details/caseless.hpp"
 #include "cldnn_async_infer_request.h"
 #include <fstream>
 #include <utility>

diff --git a/inference-engine/src/cldnn_engine/cldnn_graph.cpp b/inference-engine/src/cldnn_engine/cldnn_graph.cpp
index 10c23f2..92ff42b 100644 (file)
--- a/inference-engine/src/cldnn_engine/cldnn_graph.cpp
+++ b/inference-engine/src/cldnn_engine/cldnn_graph.cpp
@@ -22,7 +22,6 @@
 #include <net_pass.h>
 #include "cldnn_infer_request.h"
 #include <threading/ie_executor_manager.hpp>
-#include "details/caseless.hpp"
 #include <fstream>
 #include <utility>
 #include <sys/types.h>

diff --git a/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp b/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp
index 8a25d74..2e761f4 100644 (file)
--- a/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp
+++ b/inference-engine/src/gna_plugin/frontend/layer_quantizer.hpp
@@ -12,7 +12,6 @@
 #include "gna_plugin_log.hpp"
 #include "quantized_layer_params.hpp"
 #include "quantization.h"
-#include "details/caseless.hpp"
 #include "gna_graph_tools.hpp"
 #include "blob_factory.hpp"
 #include "precision_ex.hpp"

diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
index 678a303..bb2290a 100644 (file)
--- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
+++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
@@ -9,7 +9,6 @@
 #include <math.h>
 
 #include <cassert>
-#include <details/caseless.hpp>
 #include <map>
 #include <memory>
 #include <vector>

diff --git a/inference-engine/src/inference_engine/ie_network_reader.hpp b/inference-engine/src/inference_engine/ie_network_reader.hpp
index 2d8ea63..b98c7be 100644 (file)
--- a/inference-engine/src/inference_engine/ie_network_reader.hpp
+++ b/inference-engine/src/inference_engine/ie_network_reader.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <cpp/ie_cnn_network.h>
+#include <ie_iextension.h>
 #include <ie_blob.h>
 #include <string>
 

diff --git a/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp b/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
index 37a0cd1..15585e9 100644 (file)
--- a/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
+++ b/inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
@@ -39,6 +39,7 @@
 
 #include "ie_profiling.hpp"
 #include "ie_cnn_layer_builder_ngraph.h"
+#include "details/caseless.hpp"
 
 #include <debug.h>
 #include <ngraph/opsets/opset1.hpp>

diff --git a/inference-engine/src/legacy_api/src/graph_transformer.cpp b/inference-engine/src/legacy_api/src/graph_transformer.cpp
index f0e7bec..8088b8d 100644 (file)
--- a/inference-engine/src/legacy_api/src/graph_transformer.cpp
+++ b/inference-engine/src/legacy_api/src/graph_transformer.cpp
@@ -6,7 +6,6 @@
 
 #include <cpp/ie_cnn_network.h>
 
-#include <details/caseless.hpp>
 #include <iterator>
 #include <map>
 #include <utility>

diff --git a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h
index dae481a..d0aaf3c 100644 (file)
--- a/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h
+++ b/inference-engine/src/legacy_api/src/ie_cnn_layer_builder_ngraph.h
@@ -8,7 +8,6 @@
 #include <ie_blob.h>
 #include <ie_layers.h>
 
-#include <details/caseless.hpp>
 #include <map>
 #include <memory>
 #include <ngraph/node.hpp>

diff --git a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp
index cf7465d..80e0dd9 100644 (file)
--- a/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp
+++ b/inference-engine/src/legacy_api/src/shape_infer/built-in/ie_built_in_impl.hpp
@@ -15,8 +15,6 @@
 #include <string>
 #include <vector>
 
-#include "details/caseless.hpp"
-
 namespace InferenceEngine {
 namespace ShapeInfer {
 

diff --git a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp
index 5886f92..d9cf515 100644 (file)
--- a/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp
+++ b/inference-engine/src/legacy_api/src/shape_infer/ie_reshaper.cpp
@@ -17,7 +17,6 @@
 #include <tuple>
 #include <vector>
 
-#include "details/caseless.hpp"
 #include "details/ie_cnn_network_tools.h"
 #include "ie_reshaper.hpp"
 #include "shape_infer/built-in/ie_built_in_holder.hpp"

diff --git a/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp b/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp
index f61095c..a4431f0 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp
+++ b/inference-engine/src/low_precision_transformations/src/dequantization_info.cpp
@@ -8,7 +8,6 @@
 
 #include <blob_factory.hpp>
 #include <cmath>
-#include <details/caseless.hpp>
 #include <limits>
 #include <map>
 #include <memory>

diff --git a/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp b/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp
index acbc151..a19469c 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp
+++ b/inference-engine/src/low_precision_transformations/src/layer_transformation.cpp
@@ -10,7 +10,6 @@
 #include <algorithm>
 #include <blob_factory.hpp>
 #include <cmath>
-#include <details/caseless.hpp>
 #include <limits>
 #include <map>
 #include <memory>

diff --git a/inference-engine/src/low_precision_transformations/src/quantization_details.cpp b/inference-engine/src/low_precision_transformations/src/quantization_details.cpp
index 157c33d..c8d40f2 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/quantization_details.cpp
+++ b/inference-engine/src/low_precision_transformations/src/quantization_details.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <blob_factory.hpp>
 #include <cmath>
-#include <details/caseless.hpp>
 #include <limits>
 #include <map>
 #include <memory>

diff --git a/inference-engine/src/low_precision_transformations/src/resample.cpp b/inference-engine/src/low_precision_transformations/src/resample.cpp
index 8abdca2..7967e8b 100644 (file)
--- a/inference-engine/src/low_precision_transformations/src/resample.cpp
+++ b/inference-engine/src/low_precision_transformations/src/resample.cpp
@@ -6,7 +6,6 @@
 #include "low_precision_transformations/network_helper.hpp"
 
 #include <algorithm>
-#include <details/caseless.hpp>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_node.h b/inference-engine/src/mkldnn_plugin/mkldnn_node.h
index cf80cab..9e41ed9 100644 (file)
--- a/inference-engine/src/mkldnn_plugin/mkldnn_node.h
+++ b/inference-engine/src/mkldnn_plugin/mkldnn_node.h
@@ -14,7 +14,6 @@
 #include <ie_common.h>
 #include <ie_profiling.hpp>
 #include <ie_layers_property.hpp>
-#include "details/caseless.hpp"
 #include "mkldnn_dims.h"
 #include "mkldnn_memory.h"
 #include "mkldnn_edge.h"

diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp
index 2b65d03..0db732f 100644 (file)
--- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp
+++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_activation_node.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <string>
 #include <mkldnn_extension_utils.h>
-#include "details/caseless.hpp"
 
 using namespace mkldnn;
 using namespace MKLDNNPlugin;

diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp
index 5602187..6d71449 100644 (file)
--- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp
+++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_quantize_node.cpp
@@ -12,7 +12,6 @@
 #include <ie_memcpy.h>
 #include <algorithm>
 #include <set>
-#include "details/caseless.hpp"
 
 using namespace mkldnn;
 using namespace MKLDNNPlugin;

diff --git a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp
index 0f866c9..9a8fce6 100644 (file)
--- a/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp
+++ b/inference-engine/src/mkldnn_plugin/nodes/mkldnn_tensoriterator_node.cpp
@@ -12,7 +12,6 @@
 #include <mkldnn_types.h>
 #include <mkldnn_extension_utils.h>
 #include <ie_memcpy.h>
-#include "details/caseless.hpp"
 #include "graph_transformer.h"
 
 using namespace mkldnn;

diff --git a/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.h b/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.h
index 0703022..665d656 100644 (file)
--- a/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.h
+++ b/inference-engine/src/readers/ir_reader_v7/ie_layer_parsers.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-#include "details/caseless.hpp"
 #include "ie_format_parser.h"
 #include "xml_parse_utils.h"
 

diff --git a/inference-engine/src/vpu/common/src/parsed_config_base.cpp b/inference-engine/src/vpu/common/src/parsed_config_base.cpp
index 868c674..41c3170 100644 (file)
--- a/inference-engine/src/vpu/common/src/parsed_config_base.cpp
+++ b/inference-engine/src/vpu/common/src/parsed_config_base.cpp
@@ -13,7 +13,6 @@
 #include <map>
 
 #include <cpp_interfaces/exception2status.hpp>
-#include <details/caseless.hpp>
 #include <ie_plugin_config.hpp>
 
 namespace vpu {

diff --git a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp
index 5a0f474..815ed2c 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp
+++ b/inference-engine/src/vpu/graph_transformer/include/vpu/frontend/frontend.hpp
@@ -14,7 +14,6 @@
 
 #include <ie_icore.hpp>
 #include <cpp/ie_cnn_network.h>
-#include <details/caseless.hpp>
 
 #include <vpu/stage_builder.hpp>
 #include <vpu/frontend/ie_parsed_network.hpp>

diff --git a/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp b/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp
index ca525e0..78b957a 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/backend/dump_to_dot.cpp
@@ -26,7 +26,6 @@
 #include <atomic>
 
 #include <precision_utils.h>
-#include <details/caseless.hpp>
 #include <graph_tools.hpp>
 #include <description_buffer.hpp>
 #include <xml_parse_utils.h>

diff --git a/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp b/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp
index f8d0922..9ef285a 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/backend/get_meta_data.cpp
@@ -26,7 +26,6 @@
 #include <atomic>
 
 #include <precision_utils.h>
-#include <details/caseless.hpp>
 #include <graph_tools.hpp>
 #include <description_buffer.hpp>
 #include <xml_parse_utils.h>

diff --git a/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp b/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp
index 9441a38..6361638 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/backend/serialize.cpp
@@ -12,7 +12,6 @@
 #include <vpu/utils/numeric.hpp>
 
 #include <precision_utils.h>
-#include <details/caseless.hpp>
 #include <graph_tools.hpp>
 #include <description_buffer.hpp>
 #include <xml_parse_utils.h>

diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp
index 574102f..c201cd6 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/frontend/detect_network_batch.cpp
@@ -10,7 +10,6 @@
 #include <set>
 #include <map>
 
-#include <details/caseless.hpp>
 #include <details/ie_cnn_network_iterator.hpp>
 #include <cpp/ie_cnn_network.h>
 #include <graph_tools.hpp>

diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/pre_process.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/pre_process.cpp
index 72185e3..eae8759 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/frontend/pre_process.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/frontend/pre_process.cpp
@@ -9,7 +9,6 @@
 #include <vpu/compile_env.hpp>
 #include <vpu/model/data_contents/mean_contents.hpp>
 
-#include <details/caseless.hpp>
 #include <cpp/ie_cnn_network.h>
 #include <precision_utils.h>
 #include <ie_parallel.hpp>

diff --git a/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp b/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp
index e9328de..32fbc84 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/frontend/unroll_loops.cpp
@@ -8,7 +8,6 @@
 
 #include <net_pass.h>
 #include <details/ie_cnn_network_iterator.hpp>
-#include <details/caseless.hpp>
 
 #include <vpu/compile_env.hpp>
 

diff --git a/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp b/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp
index da87317..e70cf17 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/graph_transformer.cpp
@@ -27,7 +27,6 @@
 #include <atomic>
 
 #include <precision_utils.h>
-#include <details/caseless.hpp>
 #include <graph_tools.hpp>
 #include <description_buffer.hpp>
 #include <xml_parse_utils.h>

diff --git a/inference-engine/src/vpu/graph_transformer/src/middleend/passes/weights_analysis.cpp b/inference-engine/src/vpu/graph_transformer/src/middleend/passes/weights_analysis.cpp
index 10b512a..4c2cf2c 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/middleend/passes/weights_analysis.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/middleend/passes/weights_analysis.cpp
@@ -9,7 +9,6 @@
 #include <vpu/model/data_contents/replicated_data_content.hpp>
 #include <vpu/model/data_contents/scaled_content.hpp>
 
-#include <details/caseless.hpp>
 #include <precision_utils.h>
 
 #include <cmath>

diff --git a/inference-engine/src/vpu/graph_transformer/src/model/model.cpp b/inference-engine/src/vpu/graph_transformer/src/model/model.cpp
index 14bf2ca..7ea7c71 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/model/model.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/model/model.cpp
@@ -9,7 +9,6 @@
 #include <vpu/utils/profiling.hpp>
 #include <vpu/model/data_contents/ie_blob_content.hpp>
 
-#include <details/caseless.hpp>
 #include "blob_factory.hpp"
 
 #include <cctype>

diff --git a/inference-engine/src/vpu/graph_transformer/src/parsed_config.cpp b/inference-engine/src/vpu/graph_transformer/src/parsed_config.cpp
index 26f7a2b..a3c2ac3 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/parsed_config.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/parsed_config.cpp
@@ -14,7 +14,6 @@
 
 #include <debug.h>
 #include <cpp_interfaces/exception2status.hpp>
-#include <details/caseless.hpp>
 #include <ie_plugin_config.hpp>
 
 #include <vpu/utils/string.hpp>

diff --git a/inference-engine/src/vpu/graph_transformer/src/stages/mtcnn.cpp b/inference-engine/src/vpu/graph_transformer/src/stages/mtcnn.cpp
index 8d7d90a..405fa29 100644 (file)
--- a/inference-engine/src/vpu/graph_transformer/src/stages/mtcnn.cpp
+++ b/inference-engine/src/vpu/graph_transformer/src/stages/mtcnn.cpp
@@ -9,8 +9,6 @@
 #include <vpu/utils/file_system.hpp>
 #include <vpu/model/data_contents/mtcnn_blob_content.hpp>
 
-#include <ie_core.hpp>
-
 #include <vector>
 #include <fstream>
 #include <string>

diff --git a/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/lstm/lstm_cell_test.cpp b/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/lstm/lstm_cell_test.cpp
index 2ff95f0..6a530ca 100644 (file)
--- a/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/lstm/lstm_cell_test.cpp
+++ b/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/lstm/lstm_cell_test.cpp
@@ -5,6 +5,12 @@
 #include <gna/gna_config.hpp>
 #include "lstm_cell_test.hpp"
 
+#if defined GNA_LIB_VER && GNA_LIB_VER == 2
+# define DISABLE_TEST_ON_GNA2 GTEST_SKIP();
+#else
+# define DISABLE_TEST_ON_GNA2
+#endif
+
 TEST_P(LSTMCellTestBase, GNA_sw_fp32_single_lstm_test) {
     runSingleLSTMTest({{"GNA_DEVICE_MODE", "GNA_SW_FP32"}, {"GNA_COMPACT_MODE", "NO"}});
 }

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp
index fd8f17b..282b621 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/low_precision_tests_utils.cpp
@@ -5,7 +5,6 @@
 #include "low_precision_tests_utils.hpp"
 
 #include <details/ie_cnn_network_tools.h>
-#include <details/caseless.hpp>
 #include <precision_utils.h>
 #include <cmath>
 

diff --git a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.cpp b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.cpp
index c212b55..9c07c32 100644 (file)
--- a/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.cpp
+++ b/inference-engine/tests_deprecated/functional/shared_tests/transformations/common/validation.cpp
@@ -10,7 +10,6 @@
 #include <vector>
 #include <unordered_set>
 
-#include <details/caseless.hpp>
 #include "low_precision_transformations/network_helper.hpp"
 #include "low_precision_transformations/fake_quantize.hpp"
 #include "low_precision_transformations/transformer.hpp"

diff --git a/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp
index 0e7edee..e7f579d 100644 (file)
--- a/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp
+++ b/inference-engine/tests_deprecated/unit/engines/gna/i16_quantisation_test.cpp
@@ -11,6 +11,12 @@
 #include "gna_matcher.hpp"
 #include <ie_core.hpp>
 
+#if defined GNA_LIB_VER && GNA_LIB_VER == 2
+# define DISABLE_TEST_ON_GNA2 GTEST_SKIP();
+#else
+# define DISABLE_TEST_ON_GNA2
+#endif
+
 using namespace InferenceEngine;
 using namespace GNAPluginNS;
 using namespace GNATestIRs;