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

[IE CLDNN] Disable blobs reuse if shapes differ (#5567)

This commit is contained in:
Vladimir Paramuzov 2021-05-14 12:12:04 +03:00 committed by GitHub
parent 5fa899a39e
commit 0bac48d5ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,8 @@ public:
std::map<std::string, InferenceEngine::SizeVector> outputDims;
std::map<std::string, cldnn::layout> inputLayouts;
std::map<const char *, cldnn::primitive_id> blobMemCache;
using BlobCacheKey = std::pair<const char*, std::vector<size_t>>;
std::map<BlobCacheKey, cldnn::primitive_id> blobMemCache;
int m_max_batch;
int m_curBatch;

5
inference-engine/src/cldnn_engine/ops/constant.cpp
View File

@ -163,7 +163,8 @@ void CreateConstantOp(Program& p, const std::shared_ptr<ngraph::op::v0::Constant
cldnn::primitive_id constPrimID;
auto data = op->get_data_ptr<char>();
auto bufIter = p.blobMemCache.find(data);
auto bufIter = p.blobMemCache.find(std::make_pair(data, constDims));
if (bufIter != p.blobMemCache.end()) {
constPrimID = bufIter->second;
@ -198,7 +199,7 @@ void CreateConstantOp(Program& p, const std::shared_ptr<ngraph::op::v0::Constant
std::memcpy(&buf[0], &data[0], bufSize);
}
p.AddPrimitive(cldnn::data(initialconstPrimID, mem));
p.blobMemCache[data] = initialconstPrimID;
p.blobMemCache[std::make_pair(data, constDims)] = initialconstPrimID;
constPrimID = initialconstPrimID;
}

4
inference-engine/src/cldnn_engine/ops/parameter.cpp
View File

@ -154,7 +154,7 @@ void CreateParameterOp(Program& p, const std::shared_ptr<ngraph::op::v0::Paramet
auto data = static_cast<const char *>(meanBlobPtr->buffer());
auto bufIter = p.blobMemCache.find(data);
auto bufIter = p.blobMemCache.find(std::make_pair(data, meanDims));
if (bufIter != p.blobMemCache.end()) {
meanBlobID = bufIter->second;
} else {
@ -166,7 +166,7 @@ void CreateParameterOp(Program& p, const std::shared_ptr<ngraph::op::v0::Paramet
std::memcpy(&buf[0], &data[0], bufSize);
p.AddPrimitive(cldnn::data(meanBlobID, mem));
p.blobMemCache[data] = meanBlobID;
p.blobMemCache[std::make_pair(data, meanDims)] = meanBlobID;
}
break;
}