diff options
author | Dmitrii Agibov <dmitrii.agibov@arm.com> | 2022-11-18 17:21:09 +0000 |
---|---|---|
committer | Dmitrii Agibov <dmitrii.agibov@arm.com> | 2022-11-29 14:44:13 +0000 |
commit | 6a88ee5315b4ce5b023370c1e55e48bf9f2b6f67 (patch) | |
tree | 88edabf90228724f4fe2944b0ab23859d824a880 /src | |
parent | a34163c9d9a5cc0416bcaea2ebf8383bda9d505c (diff) | |
download | mlia-6a88ee5315b4ce5b023370c1e55e48bf9f2b6f67.tar.gz |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/mlia/api.py | 12 | ||||
-rw-r--r-- | src/mlia/target/__init__.py (renamed from src/mlia/devices/__init__.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/config.py (renamed from src/mlia/devices/config.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/__init__.py (renamed from src/mlia/devices/ethosu/__init__.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/advice_generation.py (renamed from src/mlia/devices/cortexa/advice_generation.py) | 10 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/advisor.py (renamed from src/mlia/devices/cortexa/advisor.py) | 12 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/config.py (renamed from src/mlia/devices/cortexa/config.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/data_analysis.py (renamed from src/mlia/devices/cortexa/data_analysis.py) | 4 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/data_collection.py (renamed from src/mlia/devices/cortexa/data_collection.py) | 4 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/events.py (renamed from src/mlia/devices/cortexa/events.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/handlers.py (renamed from src/mlia/devices/cortexa/handlers.py) | 8 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/operator_compatibility.py (renamed from src/mlia/devices/cortexa/operator_compatibility.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/operators.py (renamed from src/mlia/devices/cortexa/operators.py) | 6 | ||||
-rw-r--r-- | src/mlia/target/cortex_a/reporters.py (renamed from src/mlia/devices/cortexa/reporters.py) | 4 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/__init__.py (renamed from src/mlia/devices/cortexa/__init__.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/advice_generation.py (renamed from src/mlia/devices/ethosu/advice_generation.py) | 8 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/advisor.py (renamed from src/mlia/devices/ethosu/advisor.py) | 20 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/config.py (renamed from src/mlia/devices/ethosu/config.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/data_analysis.py (renamed from src/mlia/devices/ethosu/data_analysis.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/data_collection.py (renamed from src/mlia/devices/ethosu/data_collection.py) | 8 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/events.py (renamed from src/mlia/devices/ethosu/events.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/handlers.py (renamed from src/mlia/devices/ethosu/handlers.py) | 10 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/operators.py (renamed from src/mlia/devices/ethosu/operators.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/performance.py (renamed from src/mlia/devices/ethosu/performance.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/ethos_u/reporters.py (renamed from src/mlia/devices/ethosu/reporters.py) | 4 | ||||
-rw-r--r-- | src/mlia/target/tosa/__init__.py (renamed from src/mlia/devices/tosa/__init__.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/tosa/advice_generation.py (renamed from src/mlia/devices/tosa/advice_generation.py) | 4 | ||||
-rw-r--r-- | src/mlia/target/tosa/advisor.py (renamed from src/mlia/devices/tosa/advisor.py) | 12 | ||||
-rw-r--r-- | src/mlia/target/tosa/config.py (renamed from src/mlia/devices/tosa/config.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/tosa/data_analysis.py (renamed from src/mlia/devices/tosa/data_analysis.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/tosa/data_collection.py (renamed from src/mlia/devices/tosa/data_collection.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/tosa/events.py (renamed from src/mlia/devices/tosa/events.py) | 2 | ||||
-rw-r--r-- | src/mlia/target/tosa/handlers.py (renamed from src/mlia/devices/tosa/handlers.py) | 6 | ||||
-rw-r--r-- | src/mlia/target/tosa/operators.py (renamed from src/mlia/devices/tosa/operators.py) | 0 | ||||
-rw-r--r-- | src/mlia/target/tosa/reporters.py (renamed from src/mlia/devices/tosa/reporters.py) | 2 |
35 files changed, 78 insertions, 78 deletions
diff --git a/src/mlia/api.py b/src/mlia/api.py index 6af7db2..c7be9ec 100644 --- a/src/mlia/api.py +++ b/src/mlia/api.py @@ -12,12 +12,12 @@ from mlia.core.advisor import InferenceAdvisor from mlia.core.common import AdviceCategory from mlia.core.context import ExecutionContext from mlia.core.typing import PathOrFileLike -from mlia.devices.cortexa.advisor import configure_and_get_cortexa_advisor -from mlia.devices.cortexa.operators import report as cortex_a_report -from mlia.devices.ethosu.advisor import configure_and_get_ethosu_advisor -from mlia.devices.ethosu.operators import report as ethos_u_report -from mlia.devices.tosa.advisor import configure_and_get_tosa_advisor -from mlia.devices.tosa.operators import report as tosa_report +from mlia.target.cortex_a.advisor import configure_and_get_cortexa_advisor +from mlia.target.cortex_a.operators import report as cortex_a_report +from mlia.target.ethos_u.advisor import configure_and_get_ethosu_advisor +from mlia.target.ethos_u.operators import report as ethos_u_report +from mlia.target.tosa.advisor import configure_and_get_tosa_advisor +from mlia.target.tosa.operators import report as tosa_report from mlia.utils.filesystem import get_target logger = logging.getLogger(__name__) diff --git a/src/mlia/devices/__init__.py b/src/mlia/target/__init__.py index d533f4a..2370221 100644 --- a/src/mlia/devices/__init__.py +++ b/src/mlia/target/__init__.py @@ -1,3 +1,3 @@ # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. # SPDX-License-Identifier: Apache-2.0 -"""Devices module.""" +"""Target module.""" diff --git a/src/mlia/devices/config.py b/src/mlia/target/config.py index 7ab6b43..7ab6b43 100644 --- a/src/mlia/devices/config.py +++ b/src/mlia/target/config.py diff --git a/src/mlia/devices/ethosu/__init__.py b/src/mlia/target/cortex_a/__init__.py index 73925e1..fe01835 100644 --- a/src/mlia/devices/ethosu/__init__.py +++ b/src/mlia/target/cortex_a/__init__.py @@ -1,3 +1,3 @@ # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. # SPDX-License-Identifier: Apache-2.0 -"""Ethos-U devices module.""" +"""Cortex-A target module.""" diff --git a/src/mlia/devices/cortexa/advice_generation.py b/src/mlia/target/cortex_a/advice_generation.py index bab9530..b68106e 100644 --- a/src/mlia/devices/cortexa/advice_generation.py +++ b/src/mlia/target/cortex_a/advice_generation.py @@ -7,11 +7,11 @@ from mlia.core.advice_generation import advice_category from mlia.core.advice_generation import FactBasedAdviceProducer from mlia.core.common import AdviceCategory from mlia.core.common import DataItem -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.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 class CortexAAdviceProducer(FactBasedAdviceProducer): diff --git a/src/mlia/devices/cortexa/advisor.py b/src/mlia/target/cortex_a/advisor.py index ffbbea5..5912e38 100644 --- a/src/mlia/devices/cortexa/advisor.py +++ b/src/mlia/target/cortex_a/advisor.py @@ -16,12 +16,12 @@ from mlia.core.data_analysis import DataAnalyzer from mlia.core.data_collection import DataCollector from mlia.core.events import Event from mlia.core.typing import PathOrFileLike -from mlia.devices.cortexa.advice_generation import CortexAAdviceProducer -from mlia.devices.cortexa.config import CortexAConfiguration -from mlia.devices.cortexa.data_analysis import CortexADataAnalyzer -from mlia.devices.cortexa.data_collection import CortexAOperatorCompatibility -from mlia.devices.cortexa.events import CortexAAdvisorStartedEvent -from mlia.devices.cortexa.handlers import CortexAEventHandler +from mlia.target.cortex_a.advice_generation import CortexAAdviceProducer +from mlia.target.cortex_a.config import CortexAConfiguration +from mlia.target.cortex_a.data_analysis import CortexADataAnalyzer +from mlia.target.cortex_a.data_collection import CortexAOperatorCompatibility +from mlia.target.cortex_a.events import CortexAAdvisorStartedEvent +from mlia.target.cortex_a.handlers import CortexAEventHandler class CortexAInferenceAdvisor(DefaultInferenceAdvisor): diff --git a/src/mlia/devices/cortexa/config.py b/src/mlia/target/cortex_a/config.py index ec0cf0a..b2b51ea 100644 --- a/src/mlia/devices/cortexa/config.py +++ b/src/mlia/target/cortex_a/config.py @@ -3,7 +3,7 @@ """Cortex-A configuration.""" from __future__ import annotations -from mlia.devices.config import IPConfiguration +from mlia.target.config import IPConfiguration from mlia.utils.filesystem import get_profile diff --git a/src/mlia/devices/cortexa/data_analysis.py b/src/mlia/target/cortex_a/data_analysis.py index 04bc819..4a3a068 100644 --- a/src/mlia/devices/cortexa/data_analysis.py +++ b/src/mlia/target/cortex_a/data_analysis.py @@ -11,9 +11,9 @@ from functools import singledispatchmethod from mlia.core.common import DataItem from mlia.core.data_analysis import Fact from mlia.core.data_analysis import FactExtractor -from mlia.devices.cortexa.operators import CortexACompatibilityInfo -from mlia.devices.cortexa.operators import Operator from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo +from mlia.target.cortex_a.operators import CortexACompatibilityInfo +from mlia.target.cortex_a.operators import Operator class CortexADataAnalyzer(FactExtractor): diff --git a/src/mlia/devices/cortexa/data_collection.py b/src/mlia/target/cortex_a/data_collection.py index f4d5a82..3ec63e2 100644 --- a/src/mlia/devices/cortexa/data_collection.py +++ b/src/mlia/target/cortex_a/data_collection.py @@ -7,12 +7,12 @@ import logging from pathlib import Path from mlia.core.data_collection import ContextAwareDataCollector -from mlia.devices.cortexa.operators import CortexACompatibilityInfo -from mlia.devices.cortexa.operators import get_cortex_a_compatibility_info from mlia.nn.tensorflow.config import get_tflite_model from mlia.nn.tensorflow.tflite_compat import TFLiteChecker from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo from mlia.nn.tensorflow.utils import is_tflite_model +from mlia.target.cortex_a.operators import CortexACompatibilityInfo +from mlia.target.cortex_a.operators import get_cortex_a_compatibility_info from mlia.utils.logging import log_action diff --git a/src/mlia/devices/cortexa/events.py b/src/mlia/target/cortex_a/events.py index dece4c7..a172d0d 100644 --- a/src/mlia/devices/cortexa/events.py +++ b/src/mlia/target/cortex_a/events.py @@ -6,7 +6,7 @@ from pathlib import Path from mlia.core.events import Event from mlia.core.events import EventDispatcher -from mlia.devices.cortexa.config import CortexAConfiguration +from mlia.target.cortex_a.config import CortexAConfiguration @dataclass diff --git a/src/mlia/devices/cortexa/handlers.py b/src/mlia/target/cortex_a/handlers.py index 7ed2b75..b2d5faa 100644 --- a/src/mlia/devices/cortexa/handlers.py +++ b/src/mlia/target/cortex_a/handlers.py @@ -8,11 +8,11 @@ import logging from mlia.core.events import CollectedDataEvent from mlia.core.handlers import WorkflowEventsHandler from mlia.core.typing import PathOrFileLike -from mlia.devices.cortexa.events import CortexAAdvisorEventHandler -from mlia.devices.cortexa.events import CortexAAdvisorStartedEvent -from mlia.devices.cortexa.operators import CortexACompatibilityInfo -from mlia.devices.cortexa.reporters import cortex_a_formatters from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo +from mlia.target.cortex_a.events import CortexAAdvisorEventHandler +from mlia.target.cortex_a.events import CortexAAdvisorStartedEvent +from mlia.target.cortex_a.operators import CortexACompatibilityInfo +from mlia.target.cortex_a.reporters import cortex_a_formatters logger = logging.getLogger(__name__) diff --git a/src/mlia/devices/cortexa/operator_compatibility.py b/src/mlia/target/cortex_a/operator_compatibility.py index c474e75..c474e75 100644 --- a/src/mlia/devices/cortexa/operator_compatibility.py +++ b/src/mlia/target/cortex_a/operator_compatibility.py diff --git a/src/mlia/devices/cortexa/operators.py b/src/mlia/target/cortex_a/operators.py index 3e84d64..91f1886 100644 --- a/src/mlia/devices/cortexa/operators.py +++ b/src/mlia/target/cortex_a/operators.py @@ -9,12 +9,12 @@ from pathlib import Path from typing import Any from typing import ClassVar -from mlia.devices.cortexa.operator_compatibility import ( - ARMNN_TFLITE_DELEGATE as TFLITE_DELEGATE_COMPAT, -) from mlia.nn.tensorflow.tflite_graph import Op from mlia.nn.tensorflow.tflite_graph import parse_subgraphs from mlia.nn.tensorflow.tflite_graph import TFL_ACTIVATION_FUNCTION +from mlia.target.cortex_a.operator_compatibility import ( + ARMNN_TFLITE_DELEGATE as TFLITE_DELEGATE_COMPAT, +) @dataclass diff --git a/src/mlia/devices/cortexa/reporters.py b/src/mlia/target/cortex_a/reporters.py index 84de10b..d43d6c3 100644 --- a/src/mlia/devices/cortexa/reporters.py +++ b/src/mlia/target/cortex_a/reporters.py @@ -16,9 +16,9 @@ from mlia.core.reporting import NestedReport from mlia.core.reporting import Report from mlia.core.reporting import ReportItem from mlia.core.reporting import Table -from mlia.devices.cortexa.config import CortexAConfiguration -from mlia.devices.cortexa.operators import Operator from mlia.nn.tensorflow.tflite_compat import TFLiteCompatibilityInfo +from mlia.target.cortex_a.config import CortexAConfiguration +from mlia.target.cortex_a.operators import Operator from mlia.utils.console import style_improvement from mlia.utils.types import is_list_of diff --git a/src/mlia/devices/cortexa/__init__.py b/src/mlia/target/ethos_u/__init__.py index 3a987e7..503919d 100644 --- a/src/mlia/devices/cortexa/__init__.py +++ b/src/mlia/target/ethos_u/__init__.py @@ -1,3 +1,3 @@ # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. # SPDX-License-Identifier: Apache-2.0 -"""Cortex-A devices module.""" +"""Ethos-U target module.""" diff --git a/src/mlia/devices/ethosu/advice_generation.py b/src/mlia/target/ethos_u/advice_generation.py index 1910460..edd78fd 100644 --- a/src/mlia/devices/ethosu/advice_generation.py +++ b/src/mlia/target/ethos_u/advice_generation.py @@ -11,11 +11,11 @@ from mlia.core.advice_generation import ContextAwareAdviceProducer from mlia.core.advice_generation import FactBasedAdviceProducer from mlia.core.common import AdviceCategory from mlia.core.common import DataItem -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 OptimizationResults from mlia.nn.tensorflow.optimizations.select import OptimizationSettings +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 OptimizationResults class EthosUAdviceProducer(FactBasedAdviceProducer): diff --git a/src/mlia/devices/ethosu/advisor.py b/src/mlia/target/ethos_u/advisor.py index 2c25f6c..b9d64ff 100644 --- a/src/mlia/devices/ethosu/advisor.py +++ b/src/mlia/target/ethos_u/advisor.py @@ -16,17 +16,17 @@ from mlia.core.data_analysis import DataAnalyzer from mlia.core.data_collection import DataCollector from mlia.core.events import Event from mlia.core.typing import PathOrFileLike -from mlia.devices.ethosu.advice_generation import EthosUAdviceProducer -from mlia.devices.ethosu.advice_generation import EthosUStaticAdviceProducer -from mlia.devices.ethosu.config import EthosUConfiguration -from mlia.devices.ethosu.config import get_target -from mlia.devices.ethosu.data_analysis import EthosUDataAnalyzer -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.events import EthosUAdvisorStartedEvent -from mlia.devices.ethosu.handlers import EthosUEventHandler from mlia.nn.tensorflow.utils import is_tflite_model +from mlia.target.ethos_u.advice_generation import EthosUAdviceProducer +from mlia.target.ethos_u.advice_generation import EthosUStaticAdviceProducer +from mlia.target.ethos_u.config import EthosUConfiguration +from mlia.target.ethos_u.config import get_target +from mlia.target.ethos_u.data_analysis import EthosUDataAnalyzer +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.events import EthosUAdvisorStartedEvent +from mlia.target.ethos_u.handlers import EthosUEventHandler from mlia.utils.types import is_list_of diff --git a/src/mlia/devices/ethosu/config.py b/src/mlia/target/ethos_u/config.py index f2e867e..8d8f481 100644 --- a/src/mlia/devices/ethosu/config.py +++ b/src/mlia/target/ethos_u/config.py @@ -8,7 +8,7 @@ from typing import Any from mlia.backend.vela.compiler import resolve_compiler_config from mlia.backend.vela.compiler import VelaCompilerOptions -from mlia.devices.config import IPConfiguration +from mlia.target.config import IPConfiguration from mlia.utils.filesystem import get_profile from mlia.utils.filesystem import get_vela_config diff --git a/src/mlia/devices/ethosu/data_analysis.py b/src/mlia/target/ethos_u/data_analysis.py index db89a5f..6b66734 100644 --- a/src/mlia/devices/ethosu/data_analysis.py +++ b/src/mlia/target/ethos_u/data_analysis.py @@ -10,8 +10,8 @@ from mlia.backend.vela.compat import Operators from mlia.core.common import DataItem from mlia.core.data_analysis import Fact from mlia.core.data_analysis import FactExtractor -from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics from mlia.nn.tensorflow.optimizations.select import OptimizationSettings +from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics @dataclass diff --git a/src/mlia/devices/ethosu/data_collection.py b/src/mlia/target/ethos_u/data_collection.py index d68eadb..258876d 100644 --- a/src/mlia/devices/ethosu/data_collection.py +++ b/src/mlia/target/ethos_u/data_collection.py @@ -12,16 +12,16 @@ from mlia.core.context import Context from mlia.core.data_collection import ContextAwareDataCollector from mlia.core.errors import FunctionalityNotSupportedError from mlia.core.performance import estimate_performance -from mlia.devices.ethosu.config import EthosUConfiguration -from mlia.devices.ethosu.performance import EthosUPerformanceEstimator -from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics -from mlia.devices.ethosu.performance import PerformanceMetrics from mlia.nn.tensorflow.config import get_keras_model from mlia.nn.tensorflow.config import get_tflite_model from mlia.nn.tensorflow.config import KerasModel from mlia.nn.tensorflow.optimizations.select import get_optimizer from mlia.nn.tensorflow.optimizations.select import OptimizationSettings from mlia.nn.tensorflow.utils import save_keras_model +from mlia.target.ethos_u.config import EthosUConfiguration +from mlia.target.ethos_u.performance import EthosUPerformanceEstimator +from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics +from mlia.target.ethos_u.performance import PerformanceMetrics from mlia.utils.logging import log_action from mlia.utils.types import is_list_of diff --git a/src/mlia/devices/ethosu/events.py b/src/mlia/target/ethos_u/events.py index d5408b0..37cc1a9 100644 --- a/src/mlia/devices/ethosu/events.py +++ b/src/mlia/target/ethos_u/events.py @@ -6,7 +6,7 @@ from pathlib import Path from mlia.core.events import Event from mlia.core.events import EventDispatcher -from mlia.devices.ethosu.config import EthosUConfiguration +from mlia.target.ethos_u.config import EthosUConfiguration @dataclass diff --git a/src/mlia/devices/ethosu/handlers.py b/src/mlia/target/ethos_u/handlers.py index f010bdb..84a9554 100644 --- a/src/mlia/devices/ethosu/handlers.py +++ b/src/mlia/target/ethos_u/handlers.py @@ -9,11 +9,11 @@ from mlia.backend.vela.compat import Operators from mlia.core.events import CollectedDataEvent from mlia.core.handlers import WorkflowEventsHandler from mlia.core.typing import PathOrFileLike -from mlia.devices.ethosu.events import EthosUAdvisorEventHandler -from mlia.devices.ethosu.events import EthosUAdvisorStartedEvent -from mlia.devices.ethosu.performance import OptimizationPerformanceMetrics -from mlia.devices.ethosu.performance import PerformanceMetrics -from mlia.devices.ethosu.reporters import ethos_u_formatters +from mlia.target.ethos_u.events import EthosUAdvisorEventHandler +from mlia.target.ethos_u.events import EthosUAdvisorStartedEvent +from mlia.target.ethos_u.performance import OptimizationPerformanceMetrics +from mlia.target.ethos_u.performance import PerformanceMetrics +from mlia.target.ethos_u.reporters import ethos_u_formatters logger = logging.getLogger(__name__) diff --git a/src/mlia/devices/ethosu/operators.py b/src/mlia/target/ethos_u/operators.py index 97c2b17..97c2b17 100644 --- a/src/mlia/devices/ethosu/operators.py +++ b/src/mlia/target/ethos_u/operators.py diff --git a/src/mlia/devices/ethosu/performance.py b/src/mlia/target/ethos_u/performance.py index 8051d6e..e39f4d9 100644 --- a/src/mlia/devices/ethosu/performance.py +++ b/src/mlia/target/ethos_u/performance.py @@ -18,10 +18,10 @@ from mlia.backend.install import is_supported from mlia.backend.install import supported_backends from mlia.core.context import Context from mlia.core.performance import PerformanceEstimator -from mlia.devices.ethosu.config import EthosUConfiguration from mlia.nn.tensorflow.config import get_tflite_model from mlia.nn.tensorflow.config import ModelConfiguration from mlia.nn.tensorflow.optimizations.select import OptimizationSettings +from mlia.target.ethos_u.config import EthosUConfiguration from mlia.utils.logging import log_action diff --git a/src/mlia/devices/ethosu/reporters.py b/src/mlia/target/ethos_u/reporters.py index 7ecaab1..dbc6f4a 100644 --- a/src/mlia/devices/ethosu/reporters.py +++ b/src/mlia/target/ethos_u/reporters.py @@ -23,8 +23,8 @@ from mlia.core.reporting import Report from mlia.core.reporting import ReportItem from mlia.core.reporting import SingleRow from mlia.core.reporting import Table -from mlia.devices.ethosu.config import EthosUConfiguration -from mlia.devices.ethosu.performance import PerformanceMetrics +from mlia.target.ethos_u.config import EthosUConfiguration +from mlia.target.ethos_u.performance import PerformanceMetrics from mlia.utils.console import style_improvement from mlia.utils.types import is_list_of diff --git a/src/mlia/devices/tosa/__init__.py b/src/mlia/target/tosa/__init__.py index 762c831..762c831 100644 --- a/src/mlia/devices/tosa/__init__.py +++ b/src/mlia/target/tosa/__init__.py diff --git a/src/mlia/devices/tosa/advice_generation.py b/src/mlia/target/tosa/advice_generation.py index a3d8011..f531b84 100644 --- a/src/mlia/devices/tosa/advice_generation.py +++ b/src/mlia/target/tosa/advice_generation.py @@ -7,8 +7,8 @@ from mlia.core.advice_generation import advice_category from mlia.core.advice_generation import FactBasedAdviceProducer from mlia.core.common import AdviceCategory from mlia.core.common import DataItem -from mlia.devices.tosa.data_analysis import ModelIsNotTOSACompatible -from mlia.devices.tosa.data_analysis import ModelIsTOSACompatible +from mlia.target.tosa.data_analysis import ModelIsNotTOSACompatible +from mlia.target.tosa.data_analysis import ModelIsTOSACompatible class TOSAAdviceProducer(FactBasedAdviceProducer): diff --git a/src/mlia/devices/tosa/advisor.py b/src/mlia/target/tosa/advisor.py index 53dfa87..2739dfd 100644 --- a/src/mlia/devices/tosa/advisor.py +++ b/src/mlia/target/tosa/advisor.py @@ -16,12 +16,12 @@ from mlia.core.data_analysis import DataAnalyzer from mlia.core.data_collection import DataCollector from mlia.core.events import Event from mlia.core.typing import PathOrFileLike -from mlia.devices.tosa.advice_generation import TOSAAdviceProducer -from mlia.devices.tosa.config import TOSAConfiguration -from mlia.devices.tosa.data_analysis import TOSADataAnalyzer -from mlia.devices.tosa.data_collection import TOSAOperatorCompatibility -from mlia.devices.tosa.events import TOSAAdvisorStartedEvent -from mlia.devices.tosa.handlers import TOSAEventHandler +from mlia.target.tosa.advice_generation import TOSAAdviceProducer +from mlia.target.tosa.config import TOSAConfiguration +from mlia.target.tosa.data_analysis import TOSADataAnalyzer +from mlia.target.tosa.data_collection import TOSAOperatorCompatibility +from mlia.target.tosa.events import TOSAAdvisorStartedEvent +from mlia.target.tosa.handlers import TOSAEventHandler class TOSAInferenceAdvisor(DefaultInferenceAdvisor): diff --git a/src/mlia/devices/tosa/config.py b/src/mlia/target/tosa/config.py index c3879a7..22805b7 100644 --- a/src/mlia/devices/tosa/config.py +++ b/src/mlia/target/tosa/config.py @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. # SPDX-License-Identifier: Apache-2.0 """TOSA target configuration.""" -from mlia.devices.config import IPConfiguration +from mlia.target.config import IPConfiguration from mlia.utils.filesystem import get_profile diff --git a/src/mlia/devices/tosa/data_analysis.py b/src/mlia/target/tosa/data_analysis.py index 7cbd61d..7cbd61d 100644 --- a/src/mlia/devices/tosa/data_analysis.py +++ b/src/mlia/target/tosa/data_analysis.py diff --git a/src/mlia/devices/tosa/data_collection.py b/src/mlia/target/tosa/data_collection.py index 105c501..105c501 100644 --- a/src/mlia/devices/tosa/data_collection.py +++ b/src/mlia/target/tosa/data_collection.py diff --git a/src/mlia/devices/tosa/events.py b/src/mlia/target/tosa/events.py index ceaba57..67d499d 100644 --- a/src/mlia/devices/tosa/events.py +++ b/src/mlia/target/tosa/events.py @@ -6,7 +6,7 @@ from pathlib import Path from mlia.core.events import Event from mlia.core.events import EventDispatcher -from mlia.devices.tosa.config import TOSAConfiguration +from mlia.target.tosa.config import TOSAConfiguration @dataclass diff --git a/src/mlia/devices/tosa/handlers.py b/src/mlia/target/tosa/handlers.py index fc82657..863558c 100644 --- a/src/mlia/devices/tosa/handlers.py +++ b/src/mlia/target/tosa/handlers.py @@ -10,9 +10,9 @@ from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo from mlia.core.events import CollectedDataEvent from mlia.core.handlers import WorkflowEventsHandler from mlia.core.typing import PathOrFileLike -from mlia.devices.tosa.events import TOSAAdvisorEventHandler -from mlia.devices.tosa.events import TOSAAdvisorStartedEvent -from mlia.devices.tosa.reporters import tosa_formatters +from mlia.target.tosa.events import TOSAAdvisorEventHandler +from mlia.target.tosa.events import TOSAAdvisorStartedEvent +from mlia.target.tosa.reporters import tosa_formatters logger = logging.getLogger(__name__) diff --git a/src/mlia/devices/tosa/operators.py b/src/mlia/target/tosa/operators.py index b75ceb0..b75ceb0 100644 --- a/src/mlia/devices/tosa/operators.py +++ b/src/mlia/target/tosa/operators.py diff --git a/src/mlia/devices/tosa/reporters.py b/src/mlia/target/tosa/reporters.py index e5559ee..01fbb97 100644 --- a/src/mlia/devices/tosa/reporters.py +++ b/src/mlia/target/tosa/reporters.py @@ -16,7 +16,7 @@ from mlia.core.reporting import NestedReport from mlia.core.reporting import Report from mlia.core.reporting import ReportItem from mlia.core.reporting import Table -from mlia.devices.tosa.config import TOSAConfiguration +from mlia.target.tosa.config import TOSAConfiguration from mlia.utils.console import style_improvement from mlia.utils.types import is_list_of |