From f1eaff3c9790464bed3183ff76555cf815166f50 Mon Sep 17 00:00:00 2001 From: Diego Russo Date: Thu, 2 Feb 2023 22:04:05 +0000 Subject: MLIA-782 Remove --output parameter * Remove --output parameter from argument parser * Remove FormattedFilePath class and its presence across the codebase * Move logging module from cli to core * The output format is now injected in the execution context and used across MLIA * Depending on the output format, TextReporter and JSONReporter have been created and used accordingly. * The whole output to standard output and/or logfile is driven via the logging module: the only case where the print is used is when the --json parameter is specified. This is needed becase all output (including third party application as well) needs to be disabled otherwise it might corrupt the json output in the standard output. * Debug information is logged into the log file and printed to stdout when the output format is plain_text. * Update E2E test and config to cope with the new mechanism of outputting json data to standard output. Change-Id: I4395800b0b1af4d24406a828d780bdeef98cd413 --- src/mlia/target/tosa/advisor.py | 4 +--- src/mlia/target/tosa/handlers.py | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/mlia/target/tosa') diff --git a/src/mlia/target/tosa/advisor.py b/src/mlia/target/tosa/advisor.py index 0da44db..b60e824 100644 --- a/src/mlia/target/tosa/advisor.py +++ b/src/mlia/target/tosa/advisor.py @@ -10,7 +10,6 @@ from mlia.core.advice_generation import AdviceCategory from mlia.core.advice_generation import AdviceProducer from mlia.core.advisor import DefaultInferenceAdvisor from mlia.core.advisor import InferenceAdvisor -from mlia.core.common import FormattedFilePath from mlia.core.context import Context from mlia.core.context import ExecutionContext from mlia.core.data_analysis import DataAnalyzer @@ -81,12 +80,11 @@ def configure_and_get_tosa_advisor( context: ExecutionContext, target_profile: str, model: str | Path, - output: FormattedFilePath | None = None, **_extra_args: Any, ) -> InferenceAdvisor: """Create and configure TOSA advisor.""" if context.event_handlers is None: - context.event_handlers = [TOSAEventHandler(output)] + context.event_handlers = [TOSAEventHandler()] if context.config_parameters is None: context.config_parameters = _get_config_parameters(model, target_profile) diff --git a/src/mlia/target/tosa/handlers.py b/src/mlia/target/tosa/handlers.py index 7f80f77..f222823 100644 --- a/src/mlia/target/tosa/handlers.py +++ b/src/mlia/target/tosa/handlers.py @@ -7,7 +7,6 @@ from __future__ import annotations import logging from mlia.backend.tosa_checker.compat import TOSACompatibilityInfo -from mlia.core.common import FormattedFilePath from mlia.core.events import CollectedDataEvent from mlia.core.handlers import WorkflowEventsHandler from mlia.target.tosa.events import TOSAAdvisorEventHandler @@ -20,9 +19,9 @@ logger = logging.getLogger(__name__) class TOSAEventHandler(WorkflowEventsHandler, TOSAAdvisorEventHandler): """Event handler for TOSA advisor.""" - def __init__(self, output: FormattedFilePath | None = None) -> None: + def __init__(self) -> None: """Init event handler.""" - super().__init__(tosa_formatters, output) + super().__init__(tosa_formatters) def on_tosa_advisor_started(self, event: TOSAAdvisorStartedEvent) -> None: """Handle TOSAAdvisorStartedEvent event.""" -- cgit v1.2.1