Rename modules

- Rename module "mlia.devices" into "mlia.target"
- Rename module "mlia.target.ethosu" into "mlia.target.ethos_u"
- Rename module "mlia.target.cortexa" into "mlia.target.cortex_a"
- Rename and update tests

Change-Id: I6dca7c8646d881f739fb6b5914d1cc7e45e63dc2

24 files changed, 95 insertions, 95 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index feb2aa0..e27acaf 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,10 +12,10 @@ import tensorflow as tf
 
 from mlia.backend.vela.compiler import optimize_model
 from mlia.core.context import ExecutionContext
-from mlia.devices.ethosu.config import EthosUConfiguration
 from mlia.nn.tensorflow.utils import convert_to_tflite
 from mlia.nn.tensorflow.utils import save_keras_model
 from mlia.nn.tensorflow.utils import save_tflite_model
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 @pytest.fixture(scope="session", name="test_resources_path")
diff --git a/tests/test_api.py b/tests/test_api.py
index b9ab8ea..fbc558b 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -15,8 +15,8 @@ from mlia.api import get_advisor
 from mlia.core.common import AdviceCategory
 from mlia.core.context import Context
 from mlia.core.context import ExecutionContext
-from mlia.devices.ethosu.advisor import EthosUInferenceAdvisor
-from mlia.devices.tosa.advisor import TOSAInferenceAdvisor
+from mlia.target.ethos_u.advisor import EthosUInferenceAdvisor
+from mlia.target.tosa.advisor import TOSAInferenceAdvisor
 
 
 def test_get_advice_no_target_provided(test_keras_model: Path) -> None:
@@ -118,12 +118,12 @@ def test_get_advisor(
     [
         [
             "ethos-u55-128",
-            "mlia.devices.ethosu.operators.generate_supported_operators_report",
+            "mlia.target.ethos_u.operators.generate_supported_operators_report",
             None,
         ],
         [
             "ethos-u65-256",
-            "mlia.devices.ethosu.operators.generate_supported_operators_report",
+            "mlia.target.ethos_u.operators.generate_supported_operators_report",
             None,
         ],
         [
diff --git a/tests/test_backend_vela_compat.py b/tests/test_backend_vela_compat.py
index 6f7a41c..a2e7f90 100644
--- a/tests/test_backend_vela_compat.py
+++ b/tests/test_backend_vela_compat.py
@@ -10,7 +10,7 @@ from mlia.backend.vela.compat import NpuSupported
 from mlia.backend.vela.compat import Operator
 from mlia.backend.vela.compat import Operators
 from mlia.backend.vela.compat import supported_operators
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 from mlia.utils.filesystem import working_directory
 
 
diff --git a/tests/test_backend_vela_compiler.py b/tests/test_backend_vela_compiler.py
index 40268ae..ff07c74 100644
--- a/tests/test_backend_vela_compiler.py
+++ b/tests/test_backend_vela_compiler.py
@@ -10,7 +10,7 @@ from mlia.backend.vela.compiler import optimize_model
 from mlia.backend.vela.compiler import OptimizedModel
 from mlia.backend.vela.compiler import VelaCompiler
 from mlia.backend.vela.compiler import VelaCompilerOptions
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 def test_default_vela_compiler() -> None:
diff --git a/tests/test_backend_vela_performance.py b/tests/test_backend_vela_performance.py
index a1c806c..34c11ab 100644
--- a/tests/test_backend_vela_performance.py
+++ b/tests/test_backend_vela_performance.py
@@ -9,7 +9,7 @@ import pytest
 from mlia.backend.vela.compiler import optimize_model
 from mlia.backend.vela.performance import estimate_performance
 from mlia.backend.vela.performance import PerformanceMetrics
-from mlia.devices.ethosu.config import EthosUConfiguration
+from mlia.target.ethos_u.config import EthosUConfiguration
 
 
 def test_estimate_performance(test_tflite_model: Path) -> None:
diff --git a/tests/test_cli_commands.py b/tests/test_cli_commands.py
index 77e1f88..aed5c42 100644
--- a/tests/test_cli_commands.py
+++ b/tests/test_cli_commands.py
@@ -18,10 +18,10 @@ from mlia.cli.commands import operators
 from mlia.cli.commands import optimization
 from mlia.cli.commands import performance
 from mlia.core.context import ExecutionContext
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import PerformanceMetrics
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import PerformanceMetrics
 
 
 def test_operators_expected_parameters(sample_context: ExecutionContext) -> None:
@@ -133,7 +133,7 @@ def mock_performance_estimation(monkeypatch: pytest.MonkeyPatch) -> None:
         MemoryUsage(1, 2, 3, 4, 5),
     )
     monkeypatch.setattr(
-        "mlia.devices.ethosu.data_collection.EthosUPerformanceEstimator.estimate",
+        "mlia.target.ethos_u.data_collection.EthosUPerformanceEstimator.estimate",
         MagicMock(return_value=metrics),
     )
 
diff --git a/tests/test_devices_cortexa_advice_generation.py b/tests/test_target_cortex_a_advice_generation.py
index fd669d4..02a2b14 100644
--- a/tests/test_devices_cortexa_advice_generation.py
+++ b/tests/test_target_cortex_a_advice_generation.py
@@ -9,14 +9,14 @@ from mlia.core.advice_generation import Advice
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
 from mlia.core.context import ExecutionContext
-from mlia.devices.cortexa.advice_generation import CortexAAdviceProducer
-from mlia.devices.cortexa.data_analysis import ModelHasCustomOperators
-from mlia.devices.cortexa.data_analysis import ModelIsCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotTFLiteCompatible
-from mlia.devices.cortexa.data_analysis import TFLiteCompatibilityCheckFailed
-from mlia.devices.cortexa.operator_compatibility import ARMNN_TFLITE_DELEGATE
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.advice_generation import CortexAAdviceProducer
+from mlia.target.cortex_a.data_analysis import ModelHasCustomOperators
+from mlia.target.cortex_a.data_analysis import ModelIsCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotTFLiteCompatible
+from mlia.target.cortex_a.data_analysis import TFLiteCompatibilityCheckFailed
+from mlia.target.cortex_a.operator_compatibility import ARMNN_TFLITE_DELEGATE
 
 BACKEND_INFO = (
     f"{ARMNN_TFLITE_DELEGATE['metadata']['backend']} "
diff --git a/tests/test_devices_cortexa_advisor.py b/tests/test_target_cortex_a_advisor.py
index 8cd60d6..1788a6d 100644
--- a/tests/test_devices_cortexa_advisor.py
+++ b/tests/test_target_cortex_a_advisor.py
@@ -5,8 +5,8 @@ from pathlib import Path
 
 from mlia.core.context import ExecutionContext
 from mlia.core.workflow import DefaultWorkflowExecutor
-from mlia.devices.cortexa.advisor import configure_and_get_cortexa_advisor
-from mlia.devices.cortexa.advisor import CortexAInferenceAdvisor
+from mlia.target.cortex_a.advisor import configure_and_get_cortexa_advisor
+from mlia.target.cortex_a.advisor import CortexAInferenceAdvisor
 
 
 def test_advisor_metadata() -> None:
diff --git a/tests/test_devices_cortexa_data_analysis.py b/tests/test_target_cortex_a_data_analysis.py
index ed30b9a..b223b01 100644
--- a/tests/test_devices_cortexa_data_analysis.py
+++ b/tests/test_target_cortex_a_data_analysis.py
@@ -7,20 +7,20 @@ import pytest
 
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
-from mlia.devices.cortexa.data_analysis import CortexADataAnalyzer
-from mlia.devices.cortexa.data_analysis import ModelHasCustomOperators
-from mlia.devices.cortexa.data_analysis import ModelIsCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotCortexACompatible
-from mlia.devices.cortexa.data_analysis import ModelIsNotTFLiteCompatible
-from mlia.devices.cortexa.data_analysis import TFLiteCompatibilityCheckFailed
-from mlia.devices.cortexa.operator_compatibility import ARMNN_TFLITE_DELEGATE
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.operators import Operator
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityStatus
 from mlia.nn.tensorflow.tflite_compat import TFLiteConversionError
 from mlia.nn.tensorflow.tflite_compat import TFLiteConversionErrorCode
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.data_analysis import CortexADataAnalyzer
+from mlia.target.cortex_a.data_analysis import ModelHasCustomOperators
+from mlia.target.cortex_a.data_analysis import ModelIsCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotCortexACompatible
+from mlia.target.cortex_a.data_analysis import ModelIsNotTFLiteCompatible
+from mlia.target.cortex_a.data_analysis import TFLiteCompatibilityCheckFailed
+from mlia.target.cortex_a.operator_compatibility import ARMNN_TFLITE_DELEGATE
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.operators import Operator
 
 BACKEND_INFO = (
     f"{ARMNN_TFLITE_DELEGATE['metadata']['backend']} "
diff --git a/tests/test_devices_cortexa_data_collection.py b/tests/test_target_cortex_a_data_collection.py
index 6d3b2ac..7504166 100644
--- a/tests/test_devices_cortexa_data_collection.py
+++ b/tests/test_target_cortex_a_data_collection.py
@@ -7,8 +7,8 @@ from unittest.mock import MagicMock
 import pytest
 
 from mlia.core.context import ExecutionContext
-from mlia.devices.cortexa.data_collection import CortexAOperatorCompatibility
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.data_collection import CortexAOperatorCompatibility
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
 
 
 def check_cortex_a_data_collection(
@@ -18,7 +18,7 @@ def check_cortex_a_data_collection(
     assert CortexAOperatorCompatibility.name()
 
     monkeypatch.setattr(
-        "mlia.devices.cortexa.data_collection.get_cortex_a_compatibility_info",
+        "mlia.target.cortex_a.data_collection.get_cortex_a_compatibility_info",
         MagicMock(return_value=CortexACompatibilityInfo(True, [])),
     )
 
diff --git a/tests/test_devices_cortexa_operators.py b/tests/test_target_cortex_a_operators.py
index 23c4b0a..94eb890 100644
--- a/tests/test_devices_cortexa_operators.py
+++ b/tests/test_target_cortex_a_operators.py
@@ -6,12 +6,12 @@ from pathlib import Path
 import pytest
 import tensorflow as tf
 
-from mlia.devices.cortexa import operator_compatibility as op_compat
-from mlia.devices.cortexa.operators import CortexACompatibilityInfo
-from mlia.devices.cortexa.operators import get_cortex_a_compatibility_info
-from mlia.devices.cortexa.operators import Operator
 from mlia.nn.tensorflow.tflite_graph import TFL_OP
 from mlia.nn.tensorflow.utils import convert_to_tflite
+from mlia.target.cortex_a import operator_compatibility as op_compat
+from mlia.target.cortex_a.operators import CortexACompatibilityInfo
+from mlia.target.cortex_a.operators import get_cortex_a_compatibility_info
+from mlia.target.cortex_a.operators import Operator
 
 
 def test_op_compat_data() -> None:
diff --git a/tests/test_devices_cortexa_reporters.py b/tests/test_target_cortex_a_reporters.py
index 1110653..4b39aa1 100644
--- a/tests/test_devices_cortexa_reporters.py
+++ b/tests/test_target_cortex_a_reporters.py
@@ -7,13 +7,13 @@ import pytest
 
 from mlia.core.advice_generation import Advice
 from mlia.core.reporting import Report
-from mlia.devices.cortexa.config import CortexAConfiguration
-from mlia.devices.cortexa.operators import Operator
-from mlia.devices.cortexa.reporters import cortex_a_formatters
-from mlia.devices.cortexa.reporters import report_device
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo
 from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityStatus
 from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION
+from mlia.target.cortex_a.config import CortexAConfiguration
+from mlia.target.cortex_a.operators import Operator
+from mlia.target.cortex_a.reporters import cortex_a_formatters
+from mlia.target.cortex_a.reporters import report_device
 
 
 def test_report_device() -> None:
diff --git a/tests/test_devices_ethosu_advice_generation.py b/tests/test_target_ethos_u_advice_generation.py
index 21a3667..1569592 100644
--- a/tests/test_devices_ethosu_advice_generation.py
+++ b/tests/test_target_ethos_u_advice_generation.py
@@ -12,15 +12,15 @@ from mlia.core.common import DataItem
 from mlia.core.context import ExecutionContext
 from mlia.core.helpers import ActionResolver
 from mlia.core.helpers import APIActionResolver
-from mlia.devices.ethosu.advice_generation import EthosUAdviceProducer
-from mlia.devices.ethosu.advice_generation import EthosUStaticAdviceProducer
-from mlia.devices.ethosu.data_analysis import AllOperatorsSupportedOnNPU
-from mlia.devices.ethosu.data_analysis import HasCPUOnlyOperators
-from mlia.devices.ethosu.data_analysis import HasUnsupportedOnNPUOperators
-from mlia.devices.ethosu.data_analysis import OptimizationDiff
-from mlia.devices.ethosu.data_analysis import OptimizationResults
-from mlia.devices.ethosu.data_analysis import PerfMetricDiff
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.advice_generation import EthosUAdviceProducer
+from mlia.target.ethos_u.advice_generation import EthosUStaticAdviceProducer
+from mlia.target.ethos_u.data_analysis import AllOperatorsSupportedOnNPU
+from mlia.target.ethos_u.data_analysis import HasCPUOnlyOperators
+from mlia.target.ethos_u.data_analysis import HasUnsupportedOnNPUOperators
+from mlia.target.ethos_u.data_analysis import OptimizationDiff
+from mlia.target.ethos_u.data_analysis import OptimizationResults
+from mlia.target.ethos_u.data_analysis import PerfMetricDiff
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_devices_ethosu_advisor.py b/tests/test_target_ethos_u_advisor.py
index 74d2408..fb68800 100644
--- a/tests/test_devices_ethosu_advisor.py
+++ b/tests/test_target_ethos_u_advisor.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
 # SPDX-License-Identifier: Apache-2.0
 """Tests for Ethos-U MLIA module."""
-from mlia.devices.ethosu.advisor import EthosUInferenceAdvisor
+from mlia.target.ethos_u.advisor import EthosUInferenceAdvisor
 
 
 def test_advisor_metadata() -> None:
diff --git a/tests/test_devices_ethosu_config.py b/tests/test_target_ethos_u_config.py
index 2fec0d5..6ccd5ce 100644
--- a/tests/test_devices_ethosu_config.py
+++ b/tests/test_target_ethos_u_config.py
@@ -10,8 +10,8 @@ from unittest.mock import MagicMock
 import pytest
 
 from mlia.backend.vela.compiler import VelaCompilerOptions
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.config import get_target
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.config import get_target
 from mlia.utils.filesystem import get_vela_config
 
 
@@ -118,7 +118,7 @@ def test_ethosu_configuration(
 ) -> None:
     """Test creating Ethos-U configuration."""
     monkeypatch.setattr(
-        "mlia.devices.ethosu.config.get_profile", MagicMock(return_value=profile_data)
+        "mlia.target.ethos_u.config.get_profile", MagicMock(return_value=profile_data)
     )
 
     with expected_error:
diff --git a/tests/test_devices_ethosu_data_analysis.py b/tests/test_target_ethos_u_data_analysis.py
index 8184c70..bac27ad 100644
--- a/tests/test_devices_ethosu_data_analysis.py
+++ b/tests/test_target_ethos_u_data_analysis.py
@@ -10,19 +10,19 @@ from mlia.backend.vela.compat import Operator
 from mlia.backend.vela.compat import Operators
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.data_analysis import AllOperatorsSupportedOnNPU
-from mlia.devices.ethosu.data_analysis import EthosUDataAnalyzer
-from mlia.devices.ethosu.data_analysis import HasCPUOnlyOperators
-from mlia.devices.ethosu.data_analysis import HasUnsupportedOnNPUOperators
-from mlia.devices.ethosu.data_analysis import OptimizationDiff
-from mlia.devices.ethosu.data_analysis import OptimizationResults
-from mlia.devices.ethosu.data_analysis import PerfMetricDiff
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
-from mlia.devices.ethosu.performance import PerformanceMetrics
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.data_analysis import AllOperatorsSupportedOnNPU
+from mlia.target.ethos_u.data_analysis import EthosUDataAnalyzer
+from mlia.target.ethos_u.data_analysis import HasCPUOnlyOperators
+from mlia.target.ethos_u.data_analysis import HasUnsupportedOnNPUOperators
+from mlia.target.ethos_u.data_analysis import OptimizationDiff
+from mlia.target.ethos_u.data_analysis import OptimizationResults
+from mlia.target.ethos_u.data_analysis import PerfMetricDiff
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
+from mlia.target.ethos_u.performance import PerformanceMetrics
 
 
 def test_perf_metrics_diff() -> None:
diff --git a/tests/test_devices_ethosu_data_collection.py b/tests/test_target_ethos_u_data_collection.py
index 84b9424..2cf7482 100644
--- a/tests/test_devices_ethosu_data_collection.py
+++ b/tests/test_target_ethos_u_data_collection.py
@@ -10,15 +10,15 @@ from mlia.backend.vela.compat import Operators
 from mlia.core.context import Context
 from mlia.core.data_collection import DataCollector
 from mlia.core.errors import FunctionalityNotSupportedError
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.data_collection import EthosUOperatorCompatibility
-from mlia.devices.ethosu.data_collection import EthosUOptimizationPerformance
-from mlia.devices.ethosu.data_collection import EthosUPerformance
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics
-from mlia.devices.ethosu.performance import PerformanceMetrics
 from mlia.nn.tensorflow.optimizations.select import OptimizationSettings
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.data_collection import EthosUOperatorCompatibility
+from mlia.target.ethos_u.data_collection import EthosUOptimizationPerformance
+from mlia.target.ethos_u.data_collection import EthosUPerformance
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics
+from mlia.target.ethos_u.performance import PerformanceMetrics
 
 
 @pytest.mark.parametrize(
@@ -146,6 +146,6 @@ def mock_performance_estimation(
         MemoryUsage(1, 2, 3, 4, 5),
     )
     monkeypatch.setattr(
-        "mlia.devices.ethosu.data_collection.EthosUPerformanceEstimator.estimate",
+        "mlia.target.ethos_u.data_collection.EthosUPerformanceEstimator.estimate",
         MagicMock(return_value=metrics),
     )
diff --git a/tests/test_devices_ethosu_performance.py b/tests/test_target_ethos_u_performance.py
index 3ff73d8..76860b5 100644
--- a/tests/test_devices_ethosu_performance.py
+++ b/tests/test_target_ethos_u_performance.py
@@ -5,8 +5,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from mlia.devices.ethosu.performance import MemorySizeType
-from mlia.devices.ethosu.performance import MemoryUsage
+from mlia.target.ethos_u.performance import MemorySizeType
+from mlia.target.ethos_u.performance import MemoryUsage
 
 
 def test_memory_usage_conversion() -> None:
diff --git a/tests/test_devices_ethosu_reporters.py b/tests/test_target_ethos_u_reporters.py
index 926c4c3..7f372bf 100644
--- a/tests/test_devices_ethosu_reporters.py
+++ b/tests/test_target_ethos_u_reporters.py
@@ -21,14 +21,14 @@ from mlia.core.reporting import produce_report
 from mlia.core.reporting import Report
 from mlia.core.reporting import Reporter
 from mlia.core.reporting import Table
-from mlia.devices.ethosu.config import EthosUConfiguration
-from mlia.devices.ethosu.performance import MemoryUsage
-from mlia.devices.ethosu.performance import NPUCycles
-from mlia.devices.ethosu.performance import PerformanceMetrics
-from mlia.devices.ethosu.reporters import ethos_u_formatters
-from mlia.devices.ethosu.reporters import report_device_details
-from mlia.devices.ethosu.reporters import report_operators
-from mlia.devices.ethosu.reporters import report_perf_metrics
+from mlia.target.ethos_u.config import EthosUConfiguration
+from mlia.target.ethos_u.performance import MemoryUsage
+from mlia.target.ethos_u.performance import NPUCycles
+from mlia.target.ethos_u.performance import PerformanceMetrics
+from mlia.target.ethos_u.reporters import ethos_u_formatters
+from mlia.target.ethos_u.reporters import report_device_details
+from mlia.target.ethos_u.reporters import report_operators
+from mlia.target.ethos_u.reporters import report_perf_metrics
 from mlia.utils.console import remove_ascii_codes
 
 
diff --git a/tests/test_devices_tosa_advice_generation.py b/tests/test_target_tosa_advice_generation.py
index 1b97c8b..e8e06f8 100644
--- a/tests/test_devices_tosa_advice_generation.py
+++ b/tests/test_target_tosa_advice_generation.py
@@ -9,9 +9,9 @@ from mlia.core.advice_generation import Advice
 from mlia.core.common import AdviceCategory
 from mlia.core.common import DataItem
 from mlia.core.context import ExecutionContext
-from mlia.devices.tosa.advice_generation import TOSAAdviceProducer
-from mlia.devices.tosa.data_analysis import ModelIsNotTOSACompatible
-from mlia.devices.tosa.data_analysis import ModelIsTOSACompatible
+from mlia.target.tosa.advice_generation import TOSAAdviceProducer
+from mlia.target.tosa.data_analysis import ModelIsNotTOSACompatible
+from mlia.target.tosa.data_analysis import ModelIsTOSACompatible
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_devices_tosa_advisor.py b/tests/test_target_tosa_advisor.py
index 1c7a31a..32a6b77 100644
--- a/tests/test_devices_tosa_advisor.py
+++ b/tests/test_target_tosa_advisor.py
@@ -5,8 +5,8 @@ from pathlib import Path
 
 from mlia.core.context import ExecutionContext
 from mlia.core.workflow import DefaultWorkflowExecutor
-from mlia.devices.tosa.advisor import configure_and_get_tosa_advisor
-from mlia.devices.tosa.advisor import TOSAInferenceAdvisor
+from mlia.target.tosa.advisor import configure_and_get_tosa_advisor
+from mlia.target.tosa.advisor import TOSAInferenceAdvisor
 
 
 def test_configure_and_get_tosa_advisor(test_tflite_model: Path) -> None:
diff --git a/tests/test_devices_tosa_data_analysis.py b/tests/test_target_tosa_data_analysis.py
index f2da691..41e977f 100644
--- a/tests/test_devices_tosa_data_analysis.py
+++ b/tests/test_target_tosa_data_analysis.py
@@ -8,9 +8,9 @@ import pytest
 from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo
 from mlia.core.common import DataItem
 from mlia.core.data_analysis import Fact
-from mlia.devices.tosa.data_analysis import ModelIsNotTOSACompatible
-from mlia.devices.tosa.data_analysis import ModelIsTOSACompatible
-from mlia.devices.tosa.data_analysis import TOSADataAnalyzer
+from mlia.target.tosa.data_analysis import ModelIsNotTOSACompatible
+from mlia.target.tosa.data_analysis import ModelIsTOSACompatible
+from mlia.target.tosa.data_analysis import TOSADataAnalyzer
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_devices_tosa_data_collection.py b/tests/test_target_tosa_data_collection.py
index 0c1eda1..9d590ca 100644
--- a/tests/test_devices_tosa_data_collection.py
+++ b/tests/test_target_tosa_data_collection.py
@@ -8,7 +8,7 @@ import pytest
 
 from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo
 from mlia.core.context import ExecutionContext
-from mlia.devices.tosa.data_collection import TOSAOperatorCompatibility
+from mlia.target.tosa.data_collection import TOSAOperatorCompatibility
 
 
 def test_tosa_data_collection(
@@ -16,7 +16,7 @@ def test_tosa_data_collection(
 ) -> None:
     """Test TOSA data collection."""
     monkeypatch.setattr(
-        "mlia.devices.tosa.data_collection.get_tosa_compatibility_info",
+        "mlia.target.tosa.data_collection.get_tosa_compatibility_info",
         MagicMock(return_value=TOSACompatibilityInfo(True, [])),
     )
     context = ExecutionContext(working_dir=tmpdir)
diff --git a/tests/test_mlia_utils_py_manager.py b/tests/test_utils_py_manager.py
index e41680d..e41680d 100644
--- a/tests/test_mlia_utils_py_manager.py
+++ b/tests/test_utils_py_manager.py