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

brushed names a bit

Browse Source
This commit is contained in:
myshevts 2021-11-30 12:22:48 +03:00
parent b5480373bb
commit 1e461a3b47
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inference-engine/src/auto_batch/auto_batch.cpp
View File

@ -235,7 +235,8 @@ AutoBatchAsyncInferRequest::~AutoBatchAsyncInferRequest() {
} }
// ------------------------------AutoBatchExecutableNetwork---------------------------- // ------------------------------AutoBatchExecutableNetwork----------------------------
AutoBatchExecutableNetwork::AutoBatchExecutableNetwork(const InferenceEngine::SoExecutableNetworkInternal& networkForDevice, AutoBatchExecutableNetwork::AutoBatchExecutableNetwork(
const InferenceEngine::SoExecutableNetworkInternal& networkWithBatch,
const InferenceEngine::SoExecutableNetworkInternal& networkWithoutBatch, const InferenceEngine::SoExecutableNetworkInternal& networkWithoutBatch,
const DeviceInformation& networkDevice, const DeviceInformation& networkDevice,
const std::unordered_map<std::string, InferenceEngine::Parameter>& config, const std::unordered_map<std::string, InferenceEngine::Parameter>& config,
@ -244,7 +245,7 @@ AutoBatchExecutableNetwork::AutoBatchExecutableNetwork(const InferenceEngine::So
nullptr, nullptr,
std::make_shared<InferenceEngine::ImmediateExecutor>()), std::make_shared<InferenceEngine::ImmediateExecutor>()),
_device{networkDevice}, _device{networkDevice},
_network{networkForDevice}, _network{networkWithBatch},
_networkWithoutBatch{networkWithoutBatch}, _networkWithoutBatch{networkWithoutBatch},
_config{config}, _config{config},
_needPerfCounters{needPerfCounters} { _needPerfCounters{needPerfCounters} {
@ -259,7 +260,7 @@ AutoBatchExecutableNetwork::~AutoBatchExecutableNetwork() {
} }
std::shared_ptr<InferenceEngine::RemoteContext> AutoBatchExecutableNetwork::GetContext() const { std::shared_ptr<InferenceEngine::RemoteContext> AutoBatchExecutableNetwork::GetContext() const {
return _networkWithoutBatch->GetContext(); return _network->GetContext();
} }
InferenceEngine::IInferRequestInternal::Ptr AutoBatchExecutableNetwork::CreateInferRequestImpl(InferenceEngine::InputsDataMap networkInputs, InferenceEngine::IInferRequestInternal::Ptr AutoBatchExecutableNetwork::CreateInferRequestImpl(InferenceEngine::InputsDataMap networkInputs,
@ -527,14 +528,14 @@ IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadExeNetworkImpl(con
const auto perfConfig = fullConfig.find(PluginConfigParams::KEY_PERF_COUNT); const auto perfConfig = fullConfig.find(PluginConfigParams::KEY_PERF_COUNT);
const bool enablePerfCounters = (fullConfig.end() != perfConfig) && (perfConfig->second == PluginConfigParams::YES); const bool enablePerfCounters = (fullConfig.end() != perfConfig) && (perfConfig->second == PluginConfigParams::YES);
auto networkWithoutBatch = GetCore()->LoadNetwork(network, deviceName, deviceConfig); auto executableNetworkWithoutBatch = GetCore()->LoadNetwork(network, deviceName, deviceConfig);
// device settings + auto-batch settings // device settings + auto-batch settings
std::unordered_map<std::string, InferenceEngine::Parameter> networkConfig; std::unordered_map<std::string, InferenceEngine::Parameter> networkConfig;
networkConfig.insert(*device_batch); networkConfig.insert(*device_batch);
networkConfig.insert(deviceConfig.begin(), deviceConfig.end()); networkConfig.insert(deviceConfig.begin(), deviceConfig.end());
// TODO: remove this experimental code that does loop rather than use the batch1 footprint only // TODO: remove this experimental code that does loop rather than use the batch1 footprint only
InferenceEngine::SoExecutableNetworkInternal executableNetworkForDevice; InferenceEngine::SoExecutableNetworkInternal executableNetworkWithBatch;
do { do {
try { try {
CNNNetwork clonedNetwork(InferenceEngine::cloneNetwork(network)); CNNNetwork clonedNetwork(InferenceEngine::cloneNetwork(network));
@ -555,20 +556,21 @@ IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadExeNetworkImpl(con
} }
std::cout << "Reshaped network by batch to " << metaDevice.batchForDevice << std::endl; std::cout << "Reshaped network by batch to " << metaDevice.batchForDevice << std::endl;
clonedNetwork.reshape(shapes); clonedNetwork.reshape(shapes);
executableNetworkForDevice = GetCore()->LoadNetwork(CNNNetwork{clonedNetwork}, deviceName, deviceConfig); executableNetworkWithBatch = GetCore()->LoadNetwork(CNNNetwork{clonedNetwork}, deviceName, deviceConfig);
IE_ASSERT(executableNetworkWithoutBatch->GetContext() == executableNetworkWithBatch->GetContext());
} catch (...) { } catch (...) {
// reload the network with smaller batch // reload the network with smaller batch
executableNetworkForDevice = {nullptr, nullptr}; executableNetworkWithBatch = {nullptr, nullptr};
std::cout << "WA for network failure!!!" << std::endl; std::cout << "WA for network failure!!!" << std::endl;
metaDevice.batchForDevice /= 2; metaDevice.batchForDevice /= 2;
} }
} while (!executableNetworkForDevice && (metaDevice.batchForDevice)); } while (!executableNetworkWithBatch && (metaDevice.batchForDevice));
if (executableNetworkForDevice == nullptr) if (executableNetworkWithBatch == nullptr)
IE_THROW(NetworkNotLoaded) << "Failed to load Executable network to the device " << deviceName IE_THROW(NetworkNotLoaded) << "Failed to load Executable network to the device " << deviceName
<< "that the BATCH device is initialized to work with"; << "that the BATCH device is initialized to work with";
return std::make_shared<AutoBatchExecutableNetwork>(executableNetworkForDevice, return std::make_shared<AutoBatchExecutableNetwork>(executableNetworkWithBatch,
networkWithoutBatch, executableNetworkWithoutBatch,
metaDevice, metaDevice,
networkConfig, networkConfig,
enablePerfCounters); enablePerfCounters);