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

Revert "[CPU] Fix for CoreThreadingTestsWithIterations tests (#5892)"

Browse Source 
This reverts commit 115aa143ef.
This commit is contained in:
DD 2021-06-04 10:43:45 +08:00
parent a3b232a8fb
commit 95afa50d94
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inference-engine/src/mkldnn_plugin/mkldnn_weights_cache.cpp
View File

@ -43,7 +43,8 @@ MKLDNNWeightsSharing::MKLDNNSharedMemory::Ptr MKLDNNWeightsSharing::findOrCreate
MKLDNNMemoryPtr newPtr;
if (found == sharedWeights.end()
|| !((ptr = found->second) && (newPtr = ptr->sharedMemory.lock()))) {
|| !(ptr = found->second)
|| ptr->sharedMemory.expired()) {
newPtr = create();
ptr = std::make_shared<MKLDNNMemoryInfo>(newPtr, valid);
sharedWeights[key] = ptr;
@ -59,15 +60,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) && (newPtr = ptr->sharedMemory.lock())))
|| !(ptr = found->second)
|| ptr->sharedMemory.expired())
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, newPtr);
: std::unique_lock<std::mutex>(ptr->guard), ptr);
}
NumaNodesWeights::NumaNodesWeights() {

3
inference-engine/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp
View File

@ -52,6 +52,9 @@ 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