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

improved remote-blobs tests

Browse Source
This commit is contained in:
myshevts 2021-11-30 19:06:48 +03:00
parent 515a0f7591
commit 43266c585e
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,7 @@ DeviceInformation AutoBatchInferencePlugin::ParseMetaDevice(const std::string& d
return metaDevice; return metaDevice;
} }
RemoteContext::Ptr AutoBatchInferencePlugin::CreateContext(const InferenceEngine::ParamMap& config) { RemoteContext::Ptr AutoBatchInferencePlugin::CreateContext(const InferenceEngine::ParamMap& config) {
auto cfg = config; auto cfg = config;
auto it = cfg.find(CONFIG_KEY(AUTO_BATCH)); auto it = cfg.find(CONFIG_KEY(AUTO_BATCH));
if (it == cfg.end()) if (it == cfg.end())
@ -474,7 +474,7 @@ RemoteContext::Ptr AutoBatchInferencePlugin::CreateContext(const InferenceEngin
auto val = it->second; auto val = it->second;
auto metaDevice = ParseMetaDevice(val, {{}}); auto metaDevice = ParseMetaDevice(val, {{}});
cfg.erase(it); cfg.erase(it);
std::cout << "AutoBatchInferencePlugin::CreateContext" << std::endl;
return GetCore()->CreateContext(metaDevice.deviceName, cfg); return GetCore()->CreateContext(metaDevice.deviceName, cfg);
} }
@ -604,7 +604,8 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadE
const InferenceEngine::CNNNetwork& network, const InferenceEngine::CNNNetwork& network,
const std::shared_ptr<InferenceEngine::RemoteContext>& context, const std::shared_ptr<InferenceEngine::RemoteContext>& context,
const std::map<std::string, std::string>& config) { const std::map<std::string, std::string>& config) {
return LoadNetworkImpl(network, context, config); std::cout << "AutoBatchInferencePlugin::LoadExeNetworkImpl with context for " << context-> getDeviceName() << std::endl;
return LoadNetworkImpl(network, context, config);
} }
InferenceEngine::QueryNetworkResult AutoBatchInferencePlugin::QueryNetwork(const InferenceEngine::CNNNetwork& network, InferenceEngine::QueryNetworkResult AutoBatchInferencePlugin::QueryNetwork(const InferenceEngine::CNNNetwork& network,

11
inference-engine/tests/functional/plugin/gpu/remote_blob_tests/cldnn_remote_blob_tests.cpp
View File

@ -25,13 +25,17 @@ class RemoteBlob_Test : public CommonTestUtils::TestsCommon, public testing::Wit
protected: protected:
std::shared_ptr<ngraph::Function> fn_ptr; std::shared_ptr<ngraph::Function> fn_ptr;
std::string deviceName; std::string deviceName;
std::map<std::string, std::string> config;
public: public:
void SetUp() override { void SetUp() override {
fn_ptr = ngraph::builder::subgraph::makeSplitMultiConvConcat(); fn_ptr = ngraph::builder::subgraph::makeSplitMultiConvConcat();
deviceName = CommonTestUtils::DEVICE_GPU; deviceName = CommonTestUtils::DEVICE_GPU;
if (this->GetParam()) // BATCH:GPU(1) auto with_auto_batching = this->GetParam();
if (with_auto_batching) { // BATCH:GPU(1)
deviceName = std::string(CommonTestUtils::DEVICE_BATCH) + ":" + deviceName + "(1)"; deviceName = std::string(CommonTestUtils::DEVICE_BATCH) + ":" + deviceName + "(1)";
config = {{CONFIG_KEY(ALLOW_AUTO_BATCHING), CONFIG_VALUE(YES)}};
}
} }
static std::string getTestCaseName(const testing::TestParamInfo<bool>& obj) { static std::string getTestCaseName(const testing::TestParamInfo<bool>& obj) {
auto with_auto_batch = obj.param; auto with_auto_batch = obj.param;
@ -172,7 +176,10 @@ TEST_P(RemoteBlob_Test, smoke_canInferOnUserContext) {
// inference using remote blob // inference using remote blob
auto ocl_instance = std::make_shared<OpenCL>(); auto ocl_instance = std::make_shared<OpenCL>();
auto remote_context = make_shared_context(*ie, deviceName, ocl_instance->_context.get()); auto remote_context = make_shared_context(*ie, deviceName, ocl_instance->_context.get());
auto exec_net_shared = ie->LoadNetwork(net, remote_context); // since there is no way to enable the Auto-Batching thru the device name when loading with the RemoteContext
// (as the device name is deduced from the context, which is the "GPU")
// the only-way to test the auto-batching is explicit config with ALLOW_AUTO_BATCHING set to YES
auto exec_net_shared = ie->LoadNetwork(net, remote_context, config);
auto inf_req_shared = exec_net_shared.CreateInferRequest(); auto inf_req_shared = exec_net_shared.CreateInferRequest();
inf_req_shared.SetBlob(net.getInputsInfo().begin()->first, fakeImageData); inf_req_shared.SetBlob(net.getInputsInfo().begin()->first, fakeImageData);

42
src/inference/src/ie_core.cpp
View File

@ -484,10 +484,10 @@ public:
return newAPI; return newAPI;
} }
ov::runtime::SoPtr<ie::IExecutableNetworkInternal> LoadNetwork(const ie::CNNNetwork& network, ov::runtime::SoPtr<ie::IExecutableNetworkInternal> LoadNetwork(
const std::shared_ptr<ie::RemoteContext>& context, const ie::CNNNetwork& network,
const std::map<std::string, std::string>& config) const std::shared_ptr<ie::RemoteContext>& context,
override { const std::map<std::string, std::string>& config) override {
OV_ITT_SCOPE(FIRST_INFERENCE, ie::itt::domains::IE_LT, "Core::LoadNetwork::RemoteContext"); OV_ITT_SCOPE(FIRST_INFERENCE, ie::itt::domains::IE_LT, "Core::LoadNetwork::RemoteContext");
if (context == nullptr) { if (context == nullptr) {
IE_THROW() << "Remote context is null"; IE_THROW() << "Remote context is null";
@ -497,6 +497,7 @@ public:
std::map<std::string, std::string>& config_with_batch = parsed._config; std::map<std::string, std::string>& config_with_batch = parsed._config;
// if auto-batching is applicable, the below function will patch the device name and config accordingly: // if auto-batching is applicable, the below function will patch the device name and config accordingly:
ApplyAutoBatching(network, deviceName, config_with_batch); ApplyAutoBatching(network, deviceName, config_with_batch);
parsed = parseDeviceNameIntoConfig(deviceName, config_with_batch);
auto plugin = GetCPPPluginByName(parsed._deviceName); auto plugin = GetCPPPluginByName(parsed._deviceName);
ov::runtime::SoPtr<ie::IExecutableNetworkInternal> res; ov::runtime::SoPtr<ie::IExecutableNetworkInternal> res;
@ -515,9 +516,9 @@ public:
return res; return res;
} }
void ApplyAutoBatching (const ie::CNNNetwork& network, void ApplyAutoBatching(const ie::CNNNetwork& network,
std::string& deviceName, std::string& deviceName,
std::map<std::string, std::string>& config_with_batch) { std::map<std::string, std::string>& config_with_batch) {
std::string deviceNameWithBatchSize; std::string deviceNameWithBatchSize;
if (deviceName.find("BATCH") != std::string::npos) { if (deviceName.find("BATCH") != std::string::npos) {
auto pos = deviceName.find_first_of(":"); auto pos = deviceName.find_first_of(":");
@ -529,9 +530,8 @@ public:
const auto& batch_mode = config_with_batch.find(CONFIG_KEY(ALLOW_AUTO_BATCHING)); const auto& batch_mode = config_with_batch.find(CONFIG_KEY(ALLOW_AUTO_BATCHING));
if (batch_mode != config_with_batch.end() && batch_mode->second == CONFIG_VALUE(YES)) { if (batch_mode != config_with_batch.end() && batch_mode->second == CONFIG_VALUE(YES)) {
auto deviceNameWithoutBatch = !deviceNameWithBatchSize.empty() auto deviceNameWithoutBatch =
? DeviceIDParser::getBatchDevice(deviceNameWithBatchSize) !deviceNameWithBatchSize.empty() ? DeviceIDParser::getBatchDevice(deviceNameWithBatchSize) : deviceName;
: deviceName;
unsigned int requests = 0; unsigned int requests = 0;
unsigned int optimalBatchSize = 0; unsigned int optimalBatchSize = 0;
if (deviceNameWithBatchSize.empty()) { if (deviceNameWithBatchSize.empty()) {
@ -541,10 +541,10 @@ public:
std::map<std::string, ie::Parameter> options; std::map<std::string, ie::Parameter> options;
options["MODEL_PTR"] = &network; options["MODEL_PTR"] = &network;
optimalBatchSize = GetCPPPluginByName(DeviceIDParser(deviceNameWithoutBatch).getDeviceName()) optimalBatchSize = GetCPPPluginByName(DeviceIDParser(deviceNameWithoutBatch).getDeviceName())
.get_metric(METRIC_KEY(OPTIMAL_BATCH), options) .get_metric(METRIC_KEY(OPTIMAL_BATCH), options)
.as<unsigned int>(); .as<unsigned int>();
auto res = auto res =
GetConfig(deviceNameWithoutBatch, CONFIG_KEY(PERFORMANCE_HINT_NUM_REQUESTS)).as<std::string>(); GetConfig(deviceNameWithoutBatch, CONFIG_KEY(PERFORMANCE_HINT_NUM_REQUESTS)).as<std::string>();
requests = PerfHintsConfig::CheckPerformanceHintRequestValue(res); requests = PerfHintsConfig::CheckPerformanceHintRequestValue(res);
const auto& reqs = config_with_batch.find(CONFIG_KEY(PERFORMANCE_HINT_NUM_REQUESTS)); const auto& reqs = config_with_batch.find(CONFIG_KEY(PERFORMANCE_HINT_NUM_REQUESTS));
if (reqs != config_with_batch.end()) if (reqs != config_with_batch.end())
@ -570,7 +570,7 @@ public:
if (!std::strcmp("DetectionOutput", node->get_type_info().name) || if (!std::strcmp("DetectionOutput", node->get_type_info().name) ||
(!std::strcmp("Result", node->get_type_info().name) && isDetectionOutputParent(node))) { (!std::strcmp("Result", node->get_type_info().name) && isDetectionOutputParent(node))) {
node->get_rt_info()["affinity"] = node->get_rt_info()["affinity"] =
std::make_shared<ngraph::VariantWrapper<std::string>>(deviceNameWithoutBatch); std::make_shared<ngraph::VariantWrapper<std::string>>(deviceNameWithoutBatch);
std::cout << "!!! AFF !!! type: " << node->get_type_info().name std::cout << "!!! AFF !!! type: " << node->get_type_info().name
<< ", name: " << node->get_friendly_name() << std::endl; << ", name: " << node->get_friendly_name() << std::endl;
bDetectionOutput = true; bDetectionOutput = true;
@ -580,8 +580,8 @@ public:
} }
if (optimalBatchSize > 1 || !deviceNameWithBatchSize.empty()) { if (optimalBatchSize > 1 || !deviceNameWithBatchSize.empty()) {
auto batchConfig = deviceNameWithBatchSize.empty() auto batchConfig = deviceNameWithBatchSize.empty()
? deviceNameWithoutBatch + "(" + std::to_string(optimalBatchSize) + ")" ? deviceNameWithoutBatch + "(" + std::to_string(optimalBatchSize) + ")"
: deviceNameWithBatchSize; : deviceNameWithBatchSize;
if (bDetectionOutput) { if (bDetectionOutput) {
deviceName = "HETERO:BATCH," + deviceNameWithoutBatch; deviceName = "HETERO:BATCH," + deviceNameWithoutBatch;
std::cout << "HETERO code path!!!!" << std::endl; std::cout << "HETERO code path!!!!" << std::endl;
@ -828,11 +828,11 @@ public:
* @param params Map of device-specific shared context parameters. * @param params Map of device-specific shared context parameters.
* @return A shared pointer to a created remote context. * @return A shared pointer to a created remote context.
*/ */
InferenceEngine::RemoteContext::Ptr CreateContext(const std::string& deviceName, InferenceEngine::RemoteContext::Ptr CreateContext(const std::string& deviceName,
const InferenceEngine::ParamMap& params) override { const InferenceEngine::ParamMap& params) override {
auto parsed = ov::runtime::parseDeviceNameIntoConfig(deviceName, params); auto parsed = ov::runtime::parseDeviceNameIntoConfig(deviceName, params);
return GetCPPPluginByName(parsed._deviceName).create_context(parsed._config)._ptr; return GetCPPPluginByName(parsed._deviceName).create_context(parsed._config)._ptr;
} }
/** /**
* @brief Returns reference to CPP plugin wrapper by a device name * @brief Returns reference to CPP plugin wrapper by a device name