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

[IE CLDNN] Fix NormalizeL2 creation in QueryNetwork (#4310)

Browse Source
This commit is contained in:
Mikhail Letavin 2021-03-12 09:44:12 +03:00 committed by GitHub
parent 13066a0bc6
commit ad4cfbfceb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,7 +536,12 @@ QueryNetworkResult clDNNEngine::QueryNetwork(const CNNNetwork& network,
CLDNNPlugin::Config conf = _impl->m_config; CLDNNPlugin::Config conf = _impl->m_config;
UpdateConfig(conf, network, config); UpdateConfig(conf, network, config);
Program prog; if (m_defaultContext == nullptr) {
m_defaultContext.reset(new CLDNNRemoteCLContext(
std::const_pointer_cast<InferenceEngine::IInferencePlugin>(shared_from_this()),
ParamMap(), conf));
}
Program prog(m_defaultContext->getImpl()->GetEngine(), conf);
auto function = network.getFunction(); auto function = network.getFunction();
if (function == nullptr) { if (function == nullptr) {
THROW_IE_EXCEPTION << "CNNetworkImpl representation is not supported anymore"; THROW_IE_EXCEPTION << "CNNetworkImpl representation is not supported anymore";

2
inference-engine/src/cldnn_engine/cldnn_engine.h
View File

@ -24,7 +24,7 @@ class clDNNEngine : public InferenceEngine::InferencePluginInternal,
std::map<std::string, cldnn::device> device_map; std::map<std::string, cldnn::device> device_map;
std::mutex engine_mutex; std::mutex engine_mutex;
CLDNNRemoteCLContext::Ptr m_defaultContext; mutable CLDNNRemoteCLContext::Ptr m_defaultContext;
cldnn::device_info GetDeviceInfo(const std::map<std::string, std::string> &config) const; cldnn::device_info GetDeviceInfo(const std::map<std::string, std::string> &config) const;
InferenceEngine::CNNNetwork CloneAndTransformNetwork(const InferenceEngine::CNNNetwork& network, InferenceEngine::CNNNetwork CloneAndTransformNetwork(const InferenceEngine::CNNNetwork& network,

2
inference-engine/src/cldnn_engine/cldnn_program.h
View File

@ -71,6 +71,8 @@ public:
class Program { class Program {
public: public:
Program(InferenceEngine::CNNNetwork& network, std::shared_ptr<const cldnn::engine> engine, const Config& config); Program(InferenceEngine::CNNNetwork& network, std::shared_ptr<const cldnn::engine> engine, const Config& config);
Program(std::shared_ptr<const cldnn::engine> engine, const Config& config) : m_config(config), m_engine(engine),
m_curBatch(-1), queryMode(false), m_max_batch(1) {}
Program() : m_config({}), m_engine(nullptr), m_curBatch(-1), queryMode(false), m_max_batch(1) {} Program() : m_config({}), m_engine(nullptr), m_curBatch(-1), queryMode(false), m_max_batch(1) {}
static const cldnn::primitive_id m_preProcessTag; static const cldnn::primitive_id m_preProcessTag;