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

Align AUTO/MULTI/HETERO wording (#8884)

Browse Source 
* Align AUTO's behavior to parent Epic.

Signed-off-by: Wang, Yang <yang4.wang@intel.com>

* update wording.

Signed-off-by: Wang, Yang <yang4.wang@intel.com>

* Update.

Signed-off-by: Wang, Yang <yang4.wang@intel.com>

* Update wprding in hetero plugin.

Signed-off-by: Wang, Yang <yang4.wang@intel.com>

* Update.

Signed-off-by: Wang, Yang <yang4.wang@intel.com>

* Change "metric" to  "metric key".

Signed-off-by: Wang, Yang <yang4.wang@intel.com>
This commit is contained in:
Wang, Yang 2021-12-22 17:21:08 +08:00 committed by GitHub
parent 0e3c4cc103
commit 8c746fd52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/auto/executable_network.cpp
View File

@ -158,11 +158,11 @@ MultiDeviceExecutableNetwork::MultiDeviceExecutableNetwork(const std::string&
, _context(context)
, _workModeIsAUTO(true) {
if (_multiPlugin->GetCore() == nullptr) {
IE_THROW() << "Please, work with MULTI device via InferencEngine::Core object";
IE_THROW() << "Please, work with " << _multiPlugin->GetName() << " device via InferencEngine::Core object";
}
if (modelPath.empty() && network.getFunction() == nullptr) {
IE_THROW() << "MULTI device supports just ngraph network representation";
IE_THROW() << "MULTI " << _multiPlugin->GetName() << " device supports just ngraph network representation";
}
_core = _multiPlugin->GetCore(); // shared_ptr that holds the Core
@ -413,7 +413,7 @@ void MultiDeviceExecutableNetwork::ScheduleToWorkerInferRequest(Task inferPipeli
WaitActualNetworkReady();
// the preferred_device should be the selected device in AUTO work mode
if (preferred_device != _loadContext[ACTUALDEVICE].deviceInfo.deviceName) {
IE_THROW(NotFound) << "The preferred_device should be the selected device";
IE_THROW(NotFound) << "The preferred device should be the selected device";
}
devices.push_back(_loadContext[ACTUALDEVICE].deviceInfo);
} else {
@ -515,7 +515,7 @@ std::shared_ptr<InferenceEngine::RemoteContext> MultiDeviceExecutableNetwork::Ge
return n->GetContext();
} catch (const NotImplemented&) {}
}
IE_THROW(NotImplemented) << "None of the devices in the MULTI has an associated remote context."
IE_THROW(NotImplemented) << "None of the devices in the MULTI device has an associated remote context."
<< " Current list of devices allowed via the DEVICE_PRIORITIES config: " << devices_names;
}
@ -654,6 +654,7 @@ InferenceEngine::Parameter MultiDeviceExecutableNetwork::GetConfig(const std::st
return execNetwork->GetConfig(configKey);
}
}
IE_THROW() << "Unsupported ExecutableNetwork config key: " << name;
}
IE_THROW(NotFound) << name <<" not found in the ExecutableNetwork config";
}
@ -708,7 +709,7 @@ InferenceEngine::Parameter MultiDeviceExecutableNetwork::GetMetric(const std::st
std::vector<std::string> configKeys = { MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES };
IE_SET_METRIC_RETURN(SUPPORTED_CONFIG_KEYS, configKeys);
} else {
IE_THROW() << "Unsupported Network metric: " << name;
IE_THROW() << "Unsupported ExecutableNetwork metric key: " << name;
}
}
} // namespace MultiDevicePlugin

4
src/plugins/auto/plugin.cpp
View File

@ -217,7 +217,7 @@ InferenceEngine::Parameter MultiDeviceInferencePlugin::GetMetric(const std::stri
} else if (name == METRIC_KEY(SUPPORTED_CONFIG_KEYS)) {
IE_SET_METRIC_RETURN(SUPPORTED_CONFIG_KEYS, supported_configKeys);
} else {
IE_THROW() << "Unsupported metric key " << name;
IE_THROW() << "Unsupported metric key: " << name;
}
}
@ -271,7 +271,7 @@ IExecutableNetworkInternal::Ptr MultiDeviceInferencePlugin::LoadNetworkImpl(cons
auto metaDevices = ParseMetaDevices(strDevices, fullConfig);
auto supportDevicesByConfig = FilterDevice(metaDevices, filterConfig);
if (supportDevicesByConfig.size() == 0) {
IE_THROW() << "there is no device support the configure";
IE_THROW() << "There is no device support the configure";
}
auto supportDevices = FilterDeviceByNetwork(supportDevicesByConfig, network);
// replace the configure with configure that auto want to pass to device

10
src/plugins/hetero/executable_network.cpp
View File

@ -93,7 +93,7 @@ HeteroExecutableNetwork::HeteroExecutableNetwork(const InferenceEngine::CNNNetwo
if (it != _config.end()) {
queryNetworkResult = _heteroPlugin->QueryNetwork(network, _config);
} else {
IE_THROW() << "The 'TARGET_FALLBACK' option was not defined for heterogeneous plugin";
IE_THROW() << "The 'TARGET_FALLBACK' option was not defined for heterogeneous device";
}
}
@ -131,7 +131,7 @@ HeteroExecutableNetwork::HeteroExecutableNetwork(const InferenceEngine::CNNNetwo
affinities[node.get()] = itAffinity->second;
devices.emplace(itAffinity->second);
} else if (allEmpty) {
IE_THROW() << "Hetero plugin used default fallback policy, but some layers eg: \n(Name:"
IE_THROW() << "Hetero device used default fallback policy, but some layers eg: \n(Name:"
<< node->get_friendly_name() << ", Type: " << node->get_type_name()
<< ") were not able to be assigned on any pointed device.\n"
<< "It happened because these layers are not supported in plugins by default.\n"
@ -501,7 +501,7 @@ HeteroExecutableNetwork::HeteroExecutableNetwork(std::istream& heteroModel,
pugi::xml_parse_result res = heteroXmlDoc.load_string(heteroXmlStr.c_str());
if (res.status != pugi::status_ok) {
IE_THROW(NetworkNotRead) << "Error reading HETERO plugin xml header";
IE_THROW(NetworkNotRead) << "Error reading HETERO device xml header";
}
using namespace XMLParseUtils;
@ -751,7 +751,7 @@ void HeteroExecutableNetwork::Export(std::ostream& heteroModel) {
} else {
auto subnet = subnetwork._clonedNetwork;
if (!subnet.getFunction()) {
IE_THROW() << "Hetero plugin supports only ngraph function representation";
IE_THROW() << "Hetero device supports only ngraph function representation";
}
// Note: custom ngraph extensions are not supported
@ -937,6 +937,6 @@ InferenceEngine::Parameter HeteroExecutableNetwork::GetMetric(const std::string&
}
}
IE_THROW() << "Unsupported ExecutableNetwork metric: " << name;
IE_THROW() << "Unsupported ExecutableNetwork metric key: " << name;
}
}

10
src/plugins/hetero/plugin.cpp
View File

@ -55,13 +55,13 @@ InferenceEngine::IExecutableNetworkInternal::Ptr Engine::LoadExeNetworkImpl(cons
auto tconfig = mergeConfigs(_config, config);
auto it = tconfig.find("TARGET_FALLBACK");
if (it == tconfig.end()) {
IE_THROW() << "The 'TARGET_FALLBACK' option was not defined for heterogeneous plugin";
IE_THROW() << "The 'TARGET_FALLBACK' option was not defined for heterogeneous device";
}
DeviceMetaInformationMap metaDevices = GetDevicePlugins(it->second, tconfig);
auto function = network.getFunction();
if (function == nullptr) {
IE_THROW() << "HETERO plugin supports just ngraph network representation";
IE_THROW() << "HETERO device supports just ngraph network representation";
}
return std::make_shared<HeteroExecutableNetwork>(network, mergeConfigs(_config, config), this);
@ -133,7 +133,7 @@ QueryNetworkResult Engine::QueryNetwork(const CNNNetwork& network, const Configs
auto tconfig = mergeConfigs(_config, config);
auto it = tconfig.find("TARGET_FALLBACK");
if (it == tconfig.end()) {
IE_THROW() << "The 'TARGET_FALLBACK' option was not defined for heterogeneous plugin";
IE_THROW() << "The 'TARGET_FALLBACK' option was not defined for heterogeneous device";
}
std::string fallbackDevicesStr = it->second;
@ -141,7 +141,7 @@ QueryNetworkResult Engine::QueryNetwork(const CNNNetwork& network, const Configs
auto function = network.getFunction();
if (function == nullptr) {
IE_THROW() << "HETERO plugin supports just ngraph network representation";
IE_THROW() << "HETERO device supports just ngraph network representation";
}
std::map<std::string, QueryNetworkResult> queryResults;
@ -189,7 +189,7 @@ Parameter Engine::GetMetric(const std::string& name, const std::map<std::string,
}
IE_SET_METRIC_RETURN(DEVICE_ARCHITECTURE, DeviceArchitecture(targetFallback));
} else {
IE_THROW() << "Unsupported Plugin metric: " << name;
IE_THROW() << "Unsupported metric key: " << name;
}
}
std::string Engine::DeviceArchitecture(const std::string& targetFallback) const {