Skip to content

Commit 56ccd39

Browse files
committed
Revert new mutexes added
1 parent 8b57bad commit 56ccd39

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/plugins/intel_npu/src/backend/src/zero_executor.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,9 @@ ZeroExecutor::ZeroExecutor(const std::shared_ptr<const ZeroInitStructsHolder>& i
6767
_networkDesc->compiledNetwork.data(),
6868
nullptr};
6969

70-
static std::mutex _zeroExecutorMutex;
71-
_zeroExecutorMutex.lock();
7270
zeroUtils::throwOnFail(
7371
"pfnCreate",
7472
_graph_ddi_table_ext->pfnCreate(_initStructs->getContext(), _initStructs->getDevice(), &desc, &_graph));
75-
_zeroExecutorMutex.unlock();
7673
OV_ITT_TASK_NEXT(ZERO_EXECUTOR_GRAPH, "pfnGetProperties");
7774
zeroUtils::throwOnFail("pfnGetProperties", _graph_ddi_table_ext->pfnGetProperties(_graph, &_props));
7875

src/plugins/intel_npu/src/compiler/src/zero_compiler_in_driver.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -694,10 +694,7 @@ ze_result_t LevelZeroCompilerInDriver<TableExtension>::createGraph(const ze_grap
694694
flags};
695695

696696
// Create querynetwork handle
697-
static std::mutex _graphMutex;
698-
_graphMutex.lock();
699697
auto res = _graphDdiTableExt->pfnCreate2(_context, _deviceHandle, &desc, graph);
700-
_graphMutex.unlock();
701698
return res;
702699
}
703700

@@ -758,10 +755,7 @@ NetworkDescription LevelZeroCompilerInDriver<TableExtension>::compileIR(const st
758755

759756
// Get blob size first
760757
size_t blobSize = -1;
761-
static std::mutex _graphMutex;
762-
_graphMutex.lock();
763758
result = _graphDdiTableExt->pfnGetNativeBinary(graphHandle, &blobSize, nullptr);
764-
_graphMutex.unlock();
765759
OPENVINO_ASSERT(result == ZE_RESULT_SUCCESS,
766760
"Failed to compile network. L0 pfnGetNativeBinary get blob size",
767761
" result: ",

src/tests/functional/plugin/shared/include/behavior/ov_plugin/core_threading.hpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ class CoreThreadingTestsBase {
2929
for (auto& thread : threads) {
3030
thread = std::thread([&]() {
3131
for (unsigned int i = 0; i < iterations; ++i) {
32-
OV_ASSERT_NO_THROW(func());
32+
try {
33+
func();
34+
} catch (ov::Exception e) {
35+
std::cerr << "Exception occurred:" << std::endl << e.what();
36+
std::exit(EXIT_FAILURE);
37+
} catch (...) {
38+
std::cerr << "Unkown exception occurred!" << std::endl;
39+
std::exit(EXIT_FAILURE);
40+
}
3341
}
3442
});
3543
}

0 commit comments

Comments
 (0)