Remove catch(...) code style (openvinotoolkit#14433)

Haiqi Pan · wgzintel · ilyachur · web-flow · commit 3f06d871bfdf · 2023-02-16T11:44:24.000+08:00
* remove ... in /src/bindings/c and resolve format

* remove ... in auto and resolve format

* remove ... in auto batch and resolve format

* remove ... in hetero and resolve format

* IE exception

* IE exception

* const

* const

* resolve format and ov::Exception

* ov::Exception

* reset IE::Exception

* remove ov::Exception

* InferenceEngine-&gt;IE in auto_schedule.cpp

* fix coredump while runing test case smoke_AutoMultiMock_NumStreamsAndDefaultPerfHintToHWTest

* fix coredump issue of running LoadNetworkWithSecondaryConfigsMockTest

* fix commpile fail in CI

* resolve core dump of running exec_network_get_metrics.cpp and disable some test cases for KEEMBAY and MYRIAD in exec_network_get_metrics.cpp

* remove test cases of MYRIAD and resolve core dump of running KEEMBAYin exec_network_get_metrics.cpp

* resolve conflic of common.h

* resolve conflic of common.h

* resolve common.h complie fail

---------

Co-authored-by: guozhong &lt;guozhong.wang@intel.com&gt;
Co-authored-by: Ilya Churaev &lt;ilya.churaev@intel.com&gt;
diff --git a/src/bindings/c/src/ie_c_api.cpp b/src/bindings/c/src/ie_c_api.cpp
@@ -196,7 +196,7 @@ std::map<IE::ColorFormat, colorformat_e> colorformat_map = {{IE::ColorFormat::RA
     CATCH_IE_EXCEPTION(INFER_NOT_STARTED, InferNotStarted)    \
     CATCH_IE_EXCEPTION(NETWORK_NOT_READ, NetworkNotRead)      \
     CATCH_IE_EXCEPTION(INFER_CANCELLED, InferCancelled)       \
-    catch (...) {                                             \
+    catch (const std::exception&) {                           \
         return IEStatusCode::UNEXPECTED;                      \
     }
 
diff --git a/src/plugins/auto/auto_executable_network.cpp b/src/plugins/auto/auto_executable_network.cpp
@@ -92,7 +92,7 @@ IE::Parameter AutoExecutableNetwork::GetMetric(const std::string& name) const {
                 bThroughputEnabledInPlugin =
                     _autoSContext->_core->GetConfig(deviceInfo.deviceName,
                         CONFIG_KEY(PERFORMANCE_HINT)).as<std::string>() == CONFIG_VALUE(THROUGHPUT);
-            } catch (...) {
+            } catch (const IE::Exception&) {
                 LOG_DEBUG_TAG("GetMetric:%s for %s", "PERF_HINT config not supported",
                     deviceInfo.deviceName.c_str());
             }
@@ -117,7 +117,7 @@ IE::Parameter AutoExecutableNetwork::GetMetric(const std::string& name) const {
                                 METRIC_KEY(OPTIMAL_BATCH_SIZE), options).as<unsigned int>();
                         LOG_DEBUG_TAG("BATCHING:%s:%ld", "optimal batch size",
                             optimalBatchSize);
-                    } catch (...) {
+                    } catch (const IE::Exception&) {
                         LOG_DEBUG_TAG("BATCHING:%s", "metric OPTIMAL_BATCH_SIZE not supported");
                     }
                 }
diff --git a/src/plugins/auto/auto_schedule.cpp b/src/plugins/auto/auto_schedule.cpp
@@ -212,7 +212,7 @@ void AutoSchedule::init(const ScheduleContext::Ptr& sContext) {
                                         deviceName.c_str(),
                                         cfg.c_str(),
                                         contextPtr->executableNetwork->GetConfig(cfg).as<std::string>().c_str());
-                                } catch (...) {
+                                } catch (const IE::Exception&) {
                                 }
                             }
                         });
@@ -323,7 +323,7 @@ void AutoSchedule::TryToLoadNetWork(AutoLoadContext& context, const std::string&
             int maxNumThreads = 0;
             try {
                 maxNumThreads = _autoSContext->_core->GetConfig(device, GPU_CONFIG_KEY(MAX_NUM_THREADS)).as<int>();
-            } catch (...) {
+            } catch (const IE::Exception&) {
                 LOG_DEBUG_TAG("cannot get MAX_NUM_THREADS from GPU");
             }
             if (maxNumThreads == static_cast<int>(std::thread::hardware_concurrency())) {
@@ -537,7 +537,7 @@ IInferPtr AutoSchedule::CreateInferRequest() {
         try {
             perfmode = _passthroughExeNet->GetConfig(
                                 CONFIG_KEY(PERFORMANCE_HINT)).as<std::string>();
-        } catch(...) {
+        } catch (const IE::Exception&) {
             LOG_INFO("query perf hint from passthrough network failed");
         }
         if (_autoSContext->_batchingDisabled || perfmode != CONFIG_VALUE(THROUGHPUT)) {
diff --git a/src/plugins/auto/multi_schedule.cpp b/src/plugins/auto/multi_schedule.cpp
@@ -308,7 +308,7 @@ IInferPtr MultiSchedule::CreateInferRequest() {
         try {
             perfmode = _passthroughExeNet->GetConfig(
                                 CONFIG_KEY(PERFORMANCE_HINT)).as<std::string>();
-        } catch(...) {
+        } catch (const IE::Exception&) {
             LOG_INFO("query perf hint from passthrough network failed");
         }
         if (_multiSContext->_batchingDisabled || perfmode != CONFIG_VALUE(THROUGHPUT)) {
diff --git a/src/plugins/auto/plugin.cpp b/src/plugins/auto/plugin.cpp
@@ -533,7 +533,7 @@ IExecutableNetworkInternal::Ptr MultiDeviceInferencePlugin::LoadNetworkImpl(cons
                              deviceName.c_str(),
                              sThreadNums.c_str());
             }
-        } catch (...) {
+        } catch (const IE::Exception&) {
             LOG_DEBUG_TAG("deviceName:%s cannot get streamNums and threadNums from exec_net", deviceName.c_str());
         }
         std::unique_lock<std::mutex> lock{load_mutex};
@@ -592,7 +592,7 @@ IExecutableNetworkInternal::Ptr MultiDeviceInferencePlugin::LoadNetworkImpl(cons
                 num_plugins_supporting_perf_counters +=
                         n.second->GetConfig(PluginConfigParams::KEY_PERF_COUNT).as<std::string>() ==
                         PluginConfigParams::YES;
-            } catch (...) {
+            } catch (const IE::Exception&) {
             }
     }
     // MULTI can enable the perf counters only if all  devices support/enable that
diff --git a/src/plugins/auto/utils/config.hpp b/src/plugins/auto/utils/config.hpp
@@ -148,7 +148,7 @@ struct PluginConfig {
                             << " for key: " << kvp.first;
                     }
                     _batchTimeout = kvp.second;
-                } catch (...) {
+                } catch (const std::exception&) {
                     IE_THROW() << "Unsupported config value: " << kvp.second
                             << " for key: " << kvp.first;
                 }
diff --git a/src/plugins/auto/utils/log.hpp b/src/plugins/auto/utils/log.hpp
@@ -52,7 +52,7 @@ inline int parseInteger(const char* str) {
     std::string var(str ? str : "");
     try {
         return std::stoi(var);
-    } catch (...) {
+    } catch (const std::exception&) {
         return INT32_MAX;
     }
 }
diff --git a/src/plugins/auto_batch/auto_batch.cpp b/src/plugins/auto_batch/auto_batch.cpp
@@ -902,7 +902,7 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN
         if (!batched_inputs.size() || !batched_outputs.size())
             IE_THROW(NotImplemented)
                 << "Auto-batching supports only networks with inputs/outputs featuring batched dim!";
-    } catch (...) {
+    } catch (const InferenceEngine::Exception&) {
         metaDevice.batchForDevice = 1;
     }
 
@@ -969,7 +969,7 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN
             reshaped.reshape(shapes);
             executableNetworkWithBatch = ctx ? core->LoadNetwork(reshaped, ctx, deviceConfigNoAutoBatch)
                                              : core->LoadNetwork(reshaped, deviceName, deviceConfigNoAutoBatch);
-        } catch (...) {
+        } catch (const InferenceEngine::Exception&) {
             metaDevice.batchForDevice = 1;
         }
     }
diff --git a/src/plugins/hetero/async_infer_request.cpp b/src/plugins/hetero/async_infer_request.cpp
@@ -48,7 +48,7 @@ StatusCode HeteroAsyncInferRequest::Wait(int64_t millis_timeout) {
     auto waitStatus = StatusCode::OK;
     try {
         waitStatus = AsyncInferRequestThreadSafeDefault::Wait(millis_timeout);
-    } catch (...) {
+    } catch (const InferenceEngine::Exception&) {
         for (auto&& requestDesc : _heteroInferRequest->_inferRequests) {
             requestDesc._request->Wait(InferRequest::RESULT_READY);
         }
diff --git a/src/tests/unit/auto/auto_default_perf_hint_test.cpp b/src/tests/unit/auto/auto_default_perf_hint_test.cpp
@@ -295,6 +295,8 @@ class AutoDefaultPerfHintTest : public ::testing::TestWithParam<ConfigParams> {
         std::vector<std::string> configKeys = {"SUPPORTED_CONFIG_KEYS", "NUM_STREAMS"};
         ON_CALL(*core, GetMetric(_, StrEq(METRIC_KEY(SUPPORTED_CONFIG_KEYS)), _)).WillByDefault(Return(configKeys));
 
+        ON_CALL(*core, GetConfig(_, StrEq(GPU_CONFIG_KEY(MAX_NUM_THREADS)))).WillByDefault(Return(12));
+
         ON_CALL(*plugin, ParseMetaDevices)
             .WillByDefault(
                 [this](const std::string& priorityDevices, const std::map<std::string, std::string>& config) {
diff --git a/src/tests/unit/auto/auto_load_network_properties_test.cpp b/src/tests/unit/auto/auto_load_network_properties_test.cpp
@@ -174,6 +174,8 @@ class LoadNetworkWithSecondaryConfigsMockTest : public ::testing::TestWithParam<
         std::vector<std::string> configKeys = {"SUPPORTED_CONFIG_KEYS", "NUM_STREAMS"};
         ON_CALL(*core, GetMetric(_, StrEq(METRIC_KEY(SUPPORTED_CONFIG_KEYS)), _)).WillByDefault(Return(configKeys));
 
+        ON_CALL(*core, GetConfig(_, StrEq(GPU_CONFIG_KEY(MAX_NUM_THREADS)))).WillByDefault(Return(12));
+
         ON_CALL(*plugin, ParseMetaDevices)
             .WillByDefault(
                 [this](const std::string& priorityDevices, const std::map<std::string, std::string>& config) {
diff --git a/src/tests/unit/auto/exec_network_get_metrics.cpp b/src/tests/unit/auto/exec_network_get_metrics.cpp
@@ -194,10 +194,13 @@ TEST_P(ExecNetworkGetMetric, OPTIMAL_NUMBER_OF_INFER_REQUESTS) {
         metaDevices.push_back({actualDeviceName, {{CONFIG_KEY(PERFORMANCE_HINT),
                     InferenceEngine::PluginConfigParams::THROUGHPUT}}, actualCustomerNum, ""});
         // enable autoBatch
-        IE_SET_METRIC(OPTIMAL_BATCH_SIZE, optimalBatchNum, 8);
+        IE_SET_METRIC(OPTIMAL_BATCH_SIZE, gpuOptimalBatchNum, 8);
+        IE_SET_METRIC(OPTIMAL_BATCH_SIZE, keembayOptimalBatchNum, 1);
         IE_SET_METRIC(RANGE_FOR_STREAMS, rangeOfStreams, std::make_tuple<unsigned int, unsigned int>(1, 3));
         ON_CALL(*core.get(), GetMetric(StrEq(CommonTestUtils::DEVICE_GPU), StrEq(METRIC_KEY(OPTIMAL_BATCH_SIZE)), _))
-            .WillByDefault(RETURN_MOCK_VALUE(optimalBatchNum));
+            .WillByDefault(RETURN_MOCK_VALUE(gpuOptimalBatchNum));
+        ON_CALL(*core.get(), GetMetric(StrEq(CommonTestUtils::DEVICE_KEEMBAY), StrEq(METRIC_KEY(OPTIMAL_BATCH_SIZE)), _))
+            .WillByDefault(RETURN_MOCK_VALUE(keembayOptimalBatchNum));
         ON_CALL(*core.get(), GetMetric(_, StrEq(METRIC_KEY(RANGE_FOR_STREAMS)), _))
             .WillByDefault(RETURN_MOCK_VALUE(rangeOfStreams));
         ON_CALL(*core.get(), GetConfig(_, StrEq(CONFIG_KEY(PERFORMANCE_HINT))))
@@ -212,6 +215,7 @@ TEST_P(ExecNetworkGetMetric, OPTIMAL_NUMBER_OF_INFER_REQUESTS) {
     } else {
         metaDevices.push_back({CommonTestUtils::DEVICE_CPU, {}, cpuCustomerNum, ""});
         metaDevices.push_back({actualDeviceName, {}, actualCustomerNum, ""});
+        ON_CALL(*core, GetConfig(_, StrEq(GPU_CONFIG_KEY(MAX_NUM_THREADS)))).WillByDefault(Return(8));
     }
     ON_CALL(*plugin, SelectDevice(_, _, _)).WillByDefault(Return(metaDevices[1]));
     ON_CALL(*plugin, ParseMetaDevices(_, _)).WillByDefault(Return(metaDevices));

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ std::map<IE::ColorFormat, colorformat_e> colorformat_map = {{IE::ColorFormat::RA`
`196`	`196`	`CATCH_IE_EXCEPTION(INFER_NOT_STARTED, InferNotStarted) \`
`197`	`197`	`CATCH_IE_EXCEPTION(NETWORK_NOT_READ, NetworkNotRead) \`
`198`	`198`	`CATCH_IE_EXCEPTION(INFER_CANCELLED, InferCancelled) \`
`199`		`- catch (...) { \`
	`199`	`+ catch (const std::exception&) { \`
`200`	`200`	`return IEStatusCode::UNEXPECTED; \`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ IE::Parameter AutoExecutableNetwork::GetMetric(const std::string& name) const {`
`92`	`92`	`bThroughputEnabledInPlugin =`
`93`	`93`	`_autoSContext->_core->GetConfig(deviceInfo.deviceName,`
`94`	`94`	`CONFIG_KEY(PERFORMANCE_HINT)).as<std::string>() == CONFIG_VALUE(THROUGHPUT);`
`95`		`- } catch (...) {`
	`95`	`+ } catch (const IE::Exception&) {`
`96`	`96`	`LOG_DEBUG_TAG("GetMetric:%s for %s", "PERF_HINT config not supported",`
`97`	`97`	`deviceInfo.deviceName.c_str());`
`98`	`98`	`}`
`@@ -117,7 +117,7 @@ IE::Parameter AutoExecutableNetwork::GetMetric(const std::string& name) const {`
`117`	`117`	`METRIC_KEY(OPTIMAL_BATCH_SIZE), options).as<unsigned int>();`
`118`	`118`	`LOG_DEBUG_TAG("BATCHING:%s:%ld", "optimal batch size",`
`119`	`119`	`optimalBatchSize);`
`120`		`- } catch (...) {`
	`120`	`+ } catch (const IE::Exception&) {`
`121`	`121`	`LOG_DEBUG_TAG("BATCHING:%s", "metric OPTIMAL_BATCH_SIZE not supported");`
`122`	`122`	`}`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ IInferPtr MultiSchedule::CreateInferRequest() {`
`308`	`308`	`try {`
`309`	`309`	`perfmode = _passthroughExeNet->GetConfig(`
`310`	`310`	`CONFIG_KEY(PERFORMANCE_HINT)).as<std::string>();`
`311`		`- } catch(...) {`
	`311`	`+ } catch (const IE::Exception&) {`
`312`	`312`	`LOG_INFO("query perf hint from passthrough network failed");`
`313`	`313`	`}`
`314`	`314`	`if (_multiSContext->_batchingDisabled \|\| perfmode != CONFIG_VALUE(THROUGHPUT)) {`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ IExecutableNetworkInternal::Ptr MultiDeviceInferencePlugin::LoadNetworkImpl(cons`
`533`	`533`	`deviceName.c_str(),`
`534`	`534`	`sThreadNums.c_str());`
`535`	`535`	`}`
`536`		`- } catch (...) {`
	`536`	`+ } catch (const IE::Exception&) {`
`537`	`537`	`LOG_DEBUG_TAG("deviceName:%s cannot get streamNums and threadNums from exec_net", deviceName.c_str());`
`538`	`538`	`}`
`539`	`539`	`std::unique_lock<std::mutex> lock{load_mutex};`
`@@ -592,7 +592,7 @@ IExecutableNetworkInternal::Ptr MultiDeviceInferencePlugin::LoadNetworkImpl(cons`
`592`	`592`	`num_plugins_supporting_perf_counters +=`
`593`	`593`	`n.second->GetConfig(PluginConfigParams::KEY_PERF_COUNT).as<std::string>() ==`
`594`	`594`	`PluginConfigParams::YES;`
`595`		`- } catch (...) {`
	`595`	`+ } catch (const IE::Exception&) {`
`596`	`596`	`}`
`597`	`597`	`}`
`598`	`598`	`// MULTI can enable the perf counters only if all devices support/enable that`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ struct PluginConfig {`
`148`	`148`	`<< " for key: " << kvp.first;`
`149`	`149`	`}`
`150`	`150`	`_batchTimeout = kvp.second;`
`151`		`- } catch (...) {`
	`151`	`+ } catch (const std::exception&) {`
`152`	`152`	`IE_THROW() << "Unsupported config value: " << kvp.second`
`153`	`153`	`<< " for key: " << kvp.first;`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ inline int parseInteger(const char* str) {`
`52`	`52`	`std::string var(str ? str : "");`
`53`	`53`	`try {`
`54`	`54`	`return std::stoi(var);`
`55`		`- } catch (...) {`
	`55`	`+ } catch (const std::exception&) {`
`56`	`56`	`return INT32_MAX;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -902,7 +902,7 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN`
`902`	`902`	`if (!batched_inputs.size() \|\| !batched_outputs.size())`
`903`	`903`	`IE_THROW(NotImplemented)`
`904`	`904`	`<< "Auto-batching supports only networks with inputs/outputs featuring batched dim!";`
`905`		`- } catch (...) {`
	`905`	`+ } catch (const InferenceEngine::Exception&) {`
`906`	`906`	`metaDevice.batchForDevice = 1;`
`907`	`907`	`}`
`908`	`908`
`@@ -969,7 +969,7 @@ InferenceEngine::IExecutableNetworkInternal::Ptr AutoBatchInferencePlugin::LoadN`
`969`	`969`	`reshaped.reshape(shapes);`
`970`	`970`	`executableNetworkWithBatch = ctx ? core->LoadNetwork(reshaped, ctx, deviceConfigNoAutoBatch)`
`971`	`971`	`: core->LoadNetwork(reshaped, deviceName, deviceConfigNoAutoBatch);`
`972`		`- } catch (...) {`
	`972`	`+ } catch (const InferenceEngine::Exception&) {`
`973`	`973`	`metaDevice.batchForDevice = 1;`
`974`	`974`	`}`
`975`	`975`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ StatusCode HeteroAsyncInferRequest::Wait(int64_t millis_timeout) {`
`48`	`48`	`auto waitStatus = StatusCode::OK;`
`49`	`49`	`try {`
`50`	`50`	`waitStatus = AsyncInferRequestThreadSafeDefault::Wait(millis_timeout);`
`51`		`- } catch (...) {`
	`51`	`+ } catch (const InferenceEngine::Exception&) {`
`52`	`52`	`for (auto&& requestDesc : _heteroInferRequest->_inferRequests) {`
`53`	`53`	`requestDesc._request->Wait(InferRequest::RESULT_READY);`
`54`	`54`	`}`