Updated inference_engine.hpp (#1539)

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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>

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>

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."; \

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 {

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

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 {

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>

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 {
 
 /**

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>
 

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 {
 

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>
 

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 {

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 {
 

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 {
 

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.

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 {
 

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"

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 {

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 {
 

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)

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 {
 

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 {
 

inference-engine/include/ie_parameter.hpp

@@ -20,7 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include "ie_api.h"
 #include "ie_blob.h"
 
 namespace ngraph {

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
  */

inference-engine/include/ie_precision.hpp

@@ -8,6 +8,7 @@
  * @file ie_precision.hpp
  */
 #pragma once
+
 #include <string>
 #include <unordered_map>
 #include <vector>

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>

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"

inference-engine/include/multi-device/multi_device_config.hpp

@@ -11,7 +11,6 @@
 
 #pragma once
 
-#include <string>
 #include "ie_plugin_config.hpp"
 
 namespace InferenceEngine {

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

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)

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"
 
 //