IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed deprecated error listener, getmappedtopology (#915)

Browse Source
This commit is contained in:
Ilya Lavrenov
2020-06-16 15:06:48 +03:00
committed by GitHub
parent 3a900d0080
commit 351a11b730
43 changed files with 14 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
inference-engine/include/cpp/ie_cnn_network.h
View File

@@ -79,17 +79,6 @@ public:
*/
virtual ~CNNNetwork() {}
/**
* @deprecated Network precision does not make sence, use precision on egdes. The method will be removed in 2021.1
* @copybrief ICNNNetwork::getPrecision
*
* Wraps ICNNNetwork::getPrecision
*
* @return A precision type
*/
INFERENCE_ENGINE_DEPRECATED("Network precision does not make sence, use precision on egdes. The method will be removed in 2021.1")
virtual Precision getPrecision() const;
/**
* @copybrief ICNNNetwork::getOutputsInfo
*

15
inference-engine/include/cpp/ie_executable_network.hpp
View File

@@ -149,21 +149,6 @@ public:
CALL_STATUS_FNC(Export, networkModel);
}
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* This method will be removed in 2021.1 release.
* @copybrief IExecutableNetwork::GetMappedTopology
*
* Wraps IExecutableNetwork::GetMappedTopology.
* @param deployedTopology Map of PrimitiveInfo objects that represent the deployed topology
*/
IE_SUPPRESS_DEPRECATED_START
INFERENCE_ENGINE_DEPRECATED("Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph")
void GetMappedTopology(std::map<std::string, std::vector<PrimitiveInfo::Ptr>>& deployedTopology) {
CALL_STATUS_FNC(GetMappedTopology, deployedTopology);
}
IE_SUPPRESS_DEPRECATED_END
/**
* @brief cast operator is used when this wrapper initialized by LoadNetwork
* @return A shared pointer to IExecutableNetwork interface.

14
inference-engine/include/ie_core.hpp
View File

@@ -71,20 +71,6 @@ public:
*/
std::map<std::string, Version> GetVersions(const std::string& deviceName) const;
/**
* @deprecated IErrorListener is not used anymore. An exception is thrown in case of any unexpected situations.
* The function will be removed in 2021.1 release.
* @brief Sets logging callback
*
* Logging is used to track what is going on inside the plugins, Inference Engine library
*
* @param listener Logging sink
*/
IE_SUPPRESS_DEPRECATED_START
INFERENCE_ENGINE_DEPRECATED("IErrorListener is not used anymore. An exception is thrown in case of any unexpected situations.")
void SetLogCallback(IErrorListener& listener) const;
IE_SUPPRESS_DEPRECATED_END
#ifdef ENABLE_UNICODE_PATH_SUPPORT
/**
* @brief Reads IR xml and bin files

28
inference-engine/include/ie_error.hpp
View File

@@ -1,28 +0,0 @@
// Copyright (C) 2018-2020 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
/**
* @brief A header file for a plugin logging mechanism
*
* @file ie_error.hpp
*/
#pragma once
namespace InferenceEngine {
/**
* @deprecated IErrorListener is not used anymore. An exception is thrown / StatusCode set in case of any unexpected situations
* The class will be removed in 2021.1 release.
* @brief This class represents a custom error listener.
*/
class
INFERENCE_ENGINE_DEPRECATED("IErrorListener is not used anymore. An exception is thrown / StatusCode set in case of any unexpected situations")
IErrorListener {
public:
/**
* @brief The plugin calls this method with a null terminated error message (in case of error)
* @param msg Error message
*/
virtual void onError(const char* msg) noexcept = 0;
};
} // namespace InferenceEngine

28
inference-engine/include/ie_extension.h
View File

@@ -71,20 +71,6 @@ public:
actual->GetVersion(versionInfo);
}
/**
* @deprecated IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* The method will be removed in 2021.1 release.
* @brief Sets a log callback that is used to track what is going on inside
*
* @param listener Logging listener
*/
IE_SUPPRESS_DEPRECATED_START
INFERENCE_ENGINE_DEPRECATED("IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations")
void SetLogCallback(InferenceEngine::IErrorListener& listener) noexcept override {
actual->SetLogCallback(listener);
}
IE_SUPPRESS_DEPRECATED_END
/**
* @brief Cleans the resources up
*/
@@ -226,20 +212,6 @@ public:
actual->GetVersion(versionInfo);
}
/**
* @brief IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* The method will be removed in 2021.1 release.
* @brief Sets a log callback that is used to track what is going on inside
*
* @param listener Logging listener
*/
IE_SUPPRESS_DEPRECATED_START
INFERENCE_ENGINE_DEPRECATED("IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations")
void SetLogCallback(InferenceEngine::IErrorListener& listener) noexcept override {
actual->SetLogCallback(listener);
}
IE_SUPPRESS_DEPRECATED_END
/**
* @brief Cleans the resources up
*/

16
inference-engine/include/ie_iexecutable_network.hpp
View File

@@ -20,7 +20,6 @@
#include "ie_imemory_state.hpp"
#include "ie_input_info.hpp"
#include "ie_parameter.hpp"
#include "ie_primitive_info.hpp"
#include "ie_remote_context.hpp"
namespace InferenceEngine {
@@ -99,21 +98,6 @@ public:
*/
virtual StatusCode Export(std::ostream& networkModel, ResponseDesc* resp) noexcept = 0;
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* The method will be removed in 2021.1 release.
* @brief Get the mapping of IR layer names to implemented kernels
*
* @param deployedTopology Map of PrimitiveInfo objects that represent the deployed topology
* @param resp Optional: pointer to an already allocated object to contain information in case of failure
* @return Status code of the operation: InferenceEngine::OK (0) for success
*/
IE_SUPPRESS_DEPRECATED_START_WIN
INFERENCE_ENGINE_DEPRECATED("Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph")
virtual StatusCode GetMappedTopology(std::map<std::string, std::vector<PrimitiveInfo::Ptr>>& deployedTopology,
ResponseDesc* resp) noexcept = 0;
IE_SUPPRESS_DEPRECATED_END_WIN
/**
* @brief Get executable graph information from a device
*

15
inference-engine/include/ie_iextension.h
View File

@@ -16,7 +16,6 @@
#include "details/ie_no_copy.hpp"
#include "ie_api.h"
#include "ie_error.hpp"
#include "ie_common.h"
#include "ie_layouts.h"
#include "ie_blob.h"
@@ -212,20 +211,6 @@ public:
*/
class IShapeInferExtension : public InferenceEngine::details::IRelease {
public:
/**
* @deprecated IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* The method will be removed in 2021.1 release.
* @brief Sets logging callback.
*
* Logging is used to track what is going on inside.
*
* @param listener Logging sink
*/
IE_SUPPRESS_DEPRECATED_START
INFERENCE_ENGINE_DEPRECATED("IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations")
virtual void SetLogCallback(InferenceEngine::IErrorListener& listener) noexcept { (void)listener; }
IE_SUPPRESS_DEPRECATED_END
/**
* @brief Gets extension version information and stores in versionInfo
* @param versionInfo Pointer to version info, will be set by plugin

14
inference-engine/include/ie_plugin.hpp
View File

@@ -21,7 +21,6 @@
#include "details/ie_no_copy.hpp"
#include "ie_api.h"
#include "ie_core.hpp"
#include "ie_error.hpp"
#include "ie_iexecutable_network.hpp"
#include "ie_version.hpp"
@@ -42,19 +41,6 @@ public:
*/
virtual void GetVersion(const Version*& versionInfo) noexcept = 0;
/**
* @deprecated IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations
* This API will be removed in 2021.1 release.
* @brief Sets logging callback
*
* Logging is used to track what is going on inside
* @param listener Logging sink
*/
IE_SUPPRESS_DEPRECATED_START
INFERENCE_ENGINE_DEPRECATED("IErrorListener is not used anymore. StatusCode is provided in case of unexpected situations")
virtual void SetLogCallback(IErrorListener& listener) noexcept = 0;
IE_SUPPRESS_DEPRECATED_END
/**
* @brief Creates an executable network from a network object. User can create as many networks as they need and use
* them simultaneously (up to the limitation of the hardware resources)

70
inference-engine/include/ie_primitive_info.hpp
View File

@@ -1,70 +0,0 @@
// Copyright (C) 2018-2020 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
/**
* @brief A header file for the PrimitiveInfo struct
*
* @file ie_primitive_info.hpp
*/
#pragma once
#include <map>
#include <memory>
#include <string>
#include <vector>
#include "ie_tensor_info.hpp"
namespace InferenceEngine {
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* This structure will be removed in 2021.1 release.
* @brief Structure with information about Primitive
*/
struct INFERENCE_ENGINE_DEPRECATED("Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph") PrimitiveInfo {
/**
* @brief A shared pointer to PrimitiveInfo object
*/
IE_SUPPRESS_DEPRECATED_START
using Ptr = std::shared_ptr<PrimitiveInfo>;
IE_SUPPRESS_DEPRECATED_END
/**
* @brief Some internal id, could be used as a name
*/
std::string sId;
/**
* @brief Implementation type of this kernel
*/
std::string sType;
/**
* @brief Mainly the allocation of the output tensor
*/
int iPreAllocatedMemory;
IE_SUPPRESS_DEPRECATED_START
/**
* @brief Vector of TensorInfo objects that are related to input tensors
*/
std::vector<TensorInfo::Ptr> inputs;
/**
* @brief Vector of TensorInfo object that are related to outputs tensors
*/
std::vector<TensorInfo::Ptr> outputs;
IE_SUPPRESS_DEPRECATED_END
/**
* @brief Any other important textual information user might find interesting about this kernel
*/
std::map<std::string, std::string> extraInfo;
};
} // namespace InferenceEngine

44
inference-engine/include/ie_tensor_info.hpp
View File

@@ -1,44 +0,0 @@
// Copyright (C) 2018-2020 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
/**
* @brief A header file for the TensorInfo structure
*
* @file ie_tensor_info.hpp
*/
#pragma once
#include <map>
#include <memory>
#include <string>
#include <ie_api.h>
namespace InferenceEngine {
/**
* @deprecated Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph.
* This API will be removed in 2021.1 release.
* @struct TensorInfo
* @brief This structure describes tensor information
*/
struct INFERENCE_ENGINE_DEPRECATED("Use ExecutableNetwork::GetExecGraphInfo to get information about an internal graph") TensorInfo {
/**
* @brief A shared pointer to the TensorInfo object
*/
IE_SUPPRESS_DEPRECATED_START
using Ptr = std::shared_ptr<TensorInfo>;
IE_SUPPRESS_DEPRECATED_END
/**
* @brief A map of extra info:
* - memory layout BFYX, BXYF (enum)
* - size
* - precision
*/
std::map<std::string, std::string> extraInfo;
};
} // namespace InferenceEngine

1
inference-engine/include/inference_engine.hpp
View File

@@ -15,7 +15,6 @@
#include <cpp/ie_executable_network.hpp>
#include <cpp/ie_plugin_cpp.hpp>
#include <ie_core.hpp>
#include <ie_error.hpp>
#include <ie_icnn_network.hpp>
#include <ie_icnn_network_stats.hpp>
#include <ie_plugin_config.hpp>