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

fixed arithemtic on blobs ptrs

Browse Source
This commit is contained in:
myshevts 2021-11-19 11:53:36 +03:00
parent 8f1067f4f1
commit 2a74294e34
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,18 +162,19 @@ void AutoBatchInferRequest::CopyBlobIfNeeded(InferenceEngine::Blob::CPtr src, In
auto ptrSrc = bufferSrc.as<const char*>(); auto ptrSrc = bufferSrc.as<const char*>();
ptrdiff_t szDst = dst->byteSize(); ptrdiff_t szDst = dst->byteSize();
ptrdiff_t szSrc = src->byteSize(); ptrdiff_t szSrc = src->byteSize();
// to do check the int vs float math for offset
if (bInput) { if (bInput) {
ptrdiff_t offset = szSrc != szDst ? _batchId*szDst/_batchSize : 0; ptrdiff_t offset = szSrc != szDst ? _batchId*szDst/_batchSize : 0;
if (ptrDst - ptrSrc < szDst) if ((ptrDst + offset) == ptrSrc)
return; return;
else else
memcpy(ptrDst + offset, ptrSrc, src->byteSize()); memcpy(ptrDst + offset, ptrSrc, szSrc);
} else { } else {
ptrdiff_t offset = szSrc != szDst ? _batchId*szSrc/_batchSize : 0; ptrdiff_t offset = szSrc != szDst ? _batchId*szSrc/_batchSize : 0;
if (ptrSrc - ptrDst < szDst) if ((ptrSrc + offset) == ptrDst)
return; return;
else else
memcpy(ptrDst, ptrSrc + offset, dst->byteSize()); memcpy(ptrDst, ptrSrc + offset, szDst);
} }
// std::cout << "!!! COPY !!!" << std::endl; // std::cout << "!!! COPY !!!" << std::endl;
} }
@ -206,6 +207,7 @@ AutoBatchAsyncInferRequest::AutoBatchAsyncInferRequest(
std::pair<AutoBatchAsyncInferRequest*, InferenceEngine::Task> t; std::pair<AutoBatchAsyncInferRequest*, InferenceEngine::Task> t;
t.first = _this; t.first = _this;
t.second = std::move(task); t.second = std::move(task);
// std::lock_guard<std::mutex>(workerInferRequest->_mutex);
workerInferRequest->_tasks.push(t); workerInferRequest->_tasks.push(t);
const int sz = workerInferRequest->_tasks.unsafe_size(); const int sz = workerInferRequest->_tasks.unsafe_size();
if (sz == workerInferRequest->_batchSize) { if (sz == workerInferRequest->_batchSize) {
@ -249,14 +251,7 @@ AutoBatchExecutableNetwork::AutoBatchExecutableNetwork(const InferenceEngine::So
} }
AutoBatchExecutableNetwork::~AutoBatchExecutableNetwork() { AutoBatchExecutableNetwork::~AutoBatchExecutableNetwork() {
// {
// std::lock_guard<std::mutex> lock(_mutex);
// _device = {};
// }
_terminate = true; _terminate = true;
/* NOTE: The only threads that use `AutoBatchExecutableNetwork` Context are those that are used by Worker infer requests.
* But AsyncInferRequest destructor should waits for all asynchronous tasks that are used by the request
*/
for (auto w : _workerRequests) { for (auto w : _workerRequests) {
w->_thread.join(); w->_thread.join();
} }
@ -586,7 +581,7 @@ IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadExeNetworkImpl(con
InferenceEngine::QueryNetworkResult AutoBatchInferencePlugin::QueryNetwork(const InferenceEngine::CNNNetwork& network, InferenceEngine::QueryNetworkResult AutoBatchInferencePlugin::QueryNetwork(const InferenceEngine::CNNNetwork& network,
const std::map<std::string, std::string>& config) const { const std::map<std::string, std::string>& config) const {
// IE_THROW() <<NOT_IMPLEMENTED_str; // IE_THROW(NotImplemented);
const std::map<std::string, std::string> cfg; const std::map<std::string, std::string> cfg;
return GetCore()->QueryNetwork(network, "CPU", cfg); return GetCore()->QueryNetwork(network, "CPU", cfg);
} }