Skip to content

Commit

Permalink
[CPU] Fix for CoreThreadingTestsWithIterations tests (openvinotoolkit…
Browse files Browse the repository at this point in the history
  • Loading branch information
maxnick authored May 31, 2021
1 parent 3d82b50 commit 115aa14
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
9 changes: 4 additions & 5 deletions inference-engine/src/mkldnn_plugin/mkldnn_weights_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ MKLDNNWeightsSharing::MKLDNNSharedMemory::Ptr MKLDNNWeightsSharing::findOrCreate
MKLDNNMemoryPtr newPtr;

if (found == sharedWeights.end()
|| !(ptr = found->second)
|| ptr->sharedMemory.expired()) {
|| !((ptr = found->second) && (newPtr = ptr->sharedMemory.lock()))) {
newPtr = create();
ptr = std::make_shared<MKLDNNMemoryInfo>(newPtr, valid);
sharedWeights[key] = ptr;
Expand All @@ -60,15 +59,15 @@ MKLDNNWeightsSharing::MKLDNNSharedMemory::Ptr MKLDNNWeightsSharing::get(const st
auto found = sharedWeights.find(key);

MKLDNNMemoryInfo::Ptr ptr;
MKLDNNMemoryPtr newPtr;

if (found == sharedWeights.end()
|| !(ptr = found->second)
|| ptr->sharedMemory.expired())
|| !((ptr = found->second) && (newPtr = ptr->sharedMemory.lock())))
IE_THROW() << "Unknown shared memory with key " << key;

return std::make_shared<MKLDNNSharedMemory>(ptr->valid
? std::unique_lock<std::mutex>(ptr->guard, std::defer_lock)
: std::unique_lock<std::mutex>(ptr->guard), ptr);
: std::unique_lock<std::mutex>(ptr->guard), ptr, newPtr);
}

NumaNodesWeights::NumaNodesWeights() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ std::vector<std::string> disabledTestPatterns() {
R"(.*BinaryConvolutionLayerTest.*)",
R"(.*ClampLayerTest.*netPrc=(I64|I32).*)",
R"(.*ClampLayerTest.*netPrc=U64.*)",
// TODO: 42538. Unexpected application crash
R"(.*CoreThreadingTestsWithIterations\.smoke_LoadNetwork.t.*)",
R"(.*CoreThreadingTestsWithIterations\.smoke_LoadNetworkAccuracy.*AUTO.*)",
// TODO: 53618. BF16 gemm ncsp convolution crash
R"(.*_GroupConv.*_inPRC=BF16.*_inFmts=nc.*_primitive=jit_gemm.*)",
// TODO: 53578. fork DW bf16 convolution does not support 3d cases yet
Expand Down

0 comments on commit 115aa14

Please sign in to comment.