9 files changed, 16 insertions, 14 deletions
diff --git a/src/mlia/target/cortex_a/advisor.py b/src/mlia/target/cortex_a/advisor.py
index 3c127ec..db07b96 100644
--- a/src/mlia/target/cortex_a/advisor.py
+++ b/src/mlia/target/cortex_a/advisor.py
@@ -45,12 +45,12 @@ class CortexAInferenceAdvisor(DefaultInferenceAdvisor):
             collectors.append(CortexAOperatorCompatibility(model, target_config))
 
         if context.category_enabled(AdviceCategory.PERFORMANCE):
-            raise Exception(
+            raise RuntimeError(
                 "Performance estimation is currently not supported for Cortex-A."
             )
 
         if context.category_enabled(AdviceCategory.OPTIMIZATION):
-            raise Exception(
+            raise RuntimeError(
                 "Model optimizations are currently not supported for Cortex-A."
             )
 
diff --git a/src/mlia/target/cortex_a/operators.py b/src/mlia/target/cortex_a/operators.py
index cd92f31..4a8d992 100644
--- a/src/mlia/target/cortex_a/operators.py
+++ b/src/mlia/target/cortex_a/operators.py
@@ -143,7 +143,7 @@ def get_cortex_a_compatibility_info(
 
 def report() -> None:
     """Generate supported operators report."""
-    raise Exception(
+    raise NotImplementedError(
         "Generating a supported operators report is not "
         "currently supported with Cortex-A target profile."
     )
diff --git a/src/mlia/target/cortex_a/reporters.py b/src/mlia/target/cortex_a/reporters.py
index e7247f5..7f4f21b 100644
--- a/src/mlia/target/cortex_a/reporters.py
+++ b/src/mlia/target/cortex_a/reporters.py
@@ -87,4 +87,4 @@ def cortex_a_formatters(data: Any) -> Callable[[Any], Report]:
     if isinstance(data, CortexACompatibilityInfo):
         return report_cortex_a_operators
 
-    raise Exception(f"Unable to find appropriate formatter for {data}.")
+    raise RuntimeError(f"Unable to find appropriate formatter for {data}.")
diff --git a/src/mlia/target/ethos_u/advisor.py b/src/mlia/target/ethos_u/advisor.py
index 714d6a4..d2c308a 100644
--- a/src/mlia/target/ethos_u/advisor.py
+++ b/src/mlia/target/ethos_u/advisor.py
@@ -54,7 +54,7 @@ class EthosUInferenceAdvisor(DefaultInferenceAdvisor):
         if is_tflite_model(model):
             # TensorFlow Lite models do not support optimization (only performance)!
             if context.category_enabled(AdviceCategory.OPTIMIZATION):
-                raise Exception(
+                raise RuntimeError(
                     "Optimizations are not supported for TensorFlow Lite files."
                 )
             if context.category_enabled(AdviceCategory.PERFORMANCE):
@@ -170,7 +170,7 @@ def _get_config_parameters(
     backends = extra_args.get("backends")
     if backends is not None:
         if not is_list_of(backends, str):
-            raise Exception("Backends value has wrong format")
+            raise ValueError("Backends value has wrong format.")
 
         advisor_parameters["ethos_u_inference_advisor"]["backends"] = backends
 
@@ -179,7 +179,7 @@ def _get_config_parameters(
         optimization_targets = _DEFAULT_OPTIMIZATION_TARGETS
 
     if not is_list_of(optimization_targets, dict):
-        raise Exception("Optimization targets value has wrong format")
+        raise ValueError("Optimization targets value has wrong format.")
 
     advisor_parameters.update(
         {
diff --git a/src/mlia/target/ethos_u/data_collection.py b/src/mlia/target/ethos_u/data_collection.py
index 8348393..0654143 100644
--- a/src/mlia/target/ethos_u/data_collection.py
+++ b/src/mlia/target/ethos_u/data_collection.py
@@ -178,7 +178,7 @@ class EthosUOptimizationPerformance(ContextAwareDataCollector):
     ) -> list[list[OptimizationSettings]]:
         """Parse optimization parameters."""
         if not is_list_of(optimizations, list):
-            raise Exception("Optimization parameters expected to be a list")
+            raise ValueError("Optimization parameters expected to be a list.")
 
         return [
             [
diff --git a/src/mlia/target/ethos_u/reporters.py b/src/mlia/target/ethos_u/reporters.py
index 00e68b5..711f036 100644
--- a/src/mlia/target/ethos_u/reporters.py
+++ b/src/mlia/target/ethos_u/reporters.py
@@ -390,6 +390,6 @@ def ethos_u_formatters(data: Any) -> Callable[[Any], Report]:
         report = report_tflite_compatiblity
 
     else:
-        raise Exception(f"Unable to find appropriate formatter for {data}")
+        raise RuntimeError(f"Unable to find appropriate formatter for {data}.")
 
     return report
diff --git a/src/mlia/target/tosa/advisor.py b/src/mlia/target/tosa/advisor.py
index 7859eca..2d5163e 100644
--- a/src/mlia/target/tosa/advisor.py
+++ b/src/mlia/target/tosa/advisor.py
@@ -44,12 +44,14 @@ class TOSAInferenceAdvisor(DefaultInferenceAdvisor):
             collectors.append(TOSAOperatorCompatibility(model))
 
         if context.category_enabled(AdviceCategory.PERFORMANCE):
-            raise Exception(
+            raise RuntimeError(
                 "Performance estimation is currently not supported for TOSA."
             )
 
         if context.category_enabled(AdviceCategory.OPTIMIZATION):
-            raise Exception("Model optimizations are currently not supported for TOSA.")
+            raise RuntimeError(
+                "Model optimizations are currently not supported for TOSA."
+            )
 
         return collectors
 
diff --git a/src/mlia/target/tosa/operators.py b/src/mlia/target/tosa/operators.py
index b75ceb0..62f2e76 100644
--- a/src/mlia/target/tosa/operators.py
+++ b/src/mlia/target/tosa/operators.py
@@ -1,11 +1,11 @@
-# SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
+# SPDX-FileCopyrightText: Copyright 2022-2023, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
 """Operators module."""
 
 
 def report() -> None:
     """Generate supported operators report."""
-    raise Exception(
+    raise NotImplementedError(
         "Generating a supported operators report is not "
         "currently supported with TOSA target profile."
     )
diff --git a/src/mlia/target/tosa/reporters.py b/src/mlia/target/tosa/reporters.py
index e10f047..7b91e94 100644
--- a/src/mlia/target/tosa/reporters.py
+++ b/src/mlia/target/tosa/reporters.py
@@ -168,4 +168,4 @@ def tosa_formatters(data: Any) -> Callable[[Any], Report]:
     if isinstance(data, TFLiteCompatibilityInfo):
         return report_tflite_compatiblity
 
-    raise Exception(f"Unable to find appropriate formatter for {data}")
+    raise RuntimeError(f"Unable to find appropriate formatter for {data}.")