Fixed segfault in ARM compute (#407)

ilyachur · web-flow · commit c0bac97d15e0 · 2022-08-25T17:02:31.000+03:00
diff --git a/modules/arm_plugin/src/arm_executable_network.cpp b/modules/arm_plugin/src/arm_executable_network.cpp
@@ -38,12 +38,12 @@ ArmPlugin::ExecutableNetwork::ExecutableNetwork(const std::shared_ptr<const ov::
 
 void ArmPlugin::ExecutableNetwork::InitExecutor() {
     if (_cfg._exclusiveAsyncRequests) {
-        _taskExecutor = ExecutorManager::getInstance()->getExecutor("CPU");
+        _taskExecutor = InferenceEngine::executorManager()->getExecutor("CPU");
     } else {
         auto streamsExecutorConfig = InferenceEngine::IStreamsExecutor::Config::MakeDefaultMultiThreaded(_cfg._streamsExecutorConfig);
         streamsExecutorConfig._name = "CPUStreamsExecutor";
         streamsExecutorConfig._threadBindingType = InferenceEngine::IStreamsExecutor::NONE;
-        _taskExecutor = ExecutorManager::getInstance()->getIdleCPUStreamsExecutor(streamsExecutorConfig);
+        _taskExecutor = InferenceEngine::executorManager()->getIdleCPUStreamsExecutor(streamsExecutorConfig);
     }
     _executor = _taskExecutor.get();
 }
diff --git a/modules/arm_plugin/src/arm_plugin.cpp b/modules/arm_plugin/src/arm_plugin.cpp
@@ -55,7 +55,7 @@ Plugin::~Plugin() {
         std::lock_guard<std::mutex> lock{armSchedulerMutex};
         arm_compute::Scheduler::set(arm_compute::Scheduler::Type::ST);
     }
-    ExecutorManager::getInstance()->clear("CPUStreamsExecutor");
+    InferenceEngine::executorManager()->clear("CPUStreamsExecutor");
 }
 
 std::shared_ptr<ov::Model> Plugin::Transform(const std::shared_ptr<const ov::Model>& model,

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ ArmPlugin::ExecutableNetwork::ExecutableNetwork(const std::shared_ptr<const ov::`
`38`	`38`
`39`	`39`	`void ArmPlugin::ExecutableNetwork::InitExecutor() {`
`40`	`40`	`if (_cfg._exclusiveAsyncRequests) {`
`41`		`- _taskExecutor = ExecutorManager::getInstance()->getExecutor("CPU");`
	`41`	`+ _taskExecutor = InferenceEngine::executorManager()->getExecutor("CPU");`
`42`	`42`	`} else {`
`43`	`43`	`auto streamsExecutorConfig = InferenceEngine::IStreamsExecutor::Config::MakeDefaultMultiThreaded(_cfg._streamsExecutorConfig);`
`44`	`44`	`streamsExecutorConfig._name = "CPUStreamsExecutor";`
`45`	`45`	`streamsExecutorConfig._threadBindingType = InferenceEngine::IStreamsExecutor::NONE;`
`46`		`- _taskExecutor = ExecutorManager::getInstance()->getIdleCPUStreamsExecutor(streamsExecutorConfig);`
	`46`	`+ _taskExecutor = InferenceEngine::executorManager()->getIdleCPUStreamsExecutor(streamsExecutorConfig);`
`47`	`47`	`}`
`48`	`48`	`_executor = _taskExecutor.get();`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ Plugin::~Plugin() {`
`55`	`55`	`std::lock_guard<std::mutex> lock{armSchedulerMutex};`
`56`	`56`	`arm_compute::Scheduler::set(arm_compute::Scheduler::Type::ST);`
`57`	`57`	`}`
`58`		`- ExecutorManager::getInstance()->clear("CPUStreamsExecutor");`
	`58`	`+ InferenceEngine::executorManager()->clear("CPUStreamsExecutor");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`std::shared_ptr<ov::Model> Plugin::Transform(const std::shared_ptr<const ov::Model>& model,`