diff options
author | Diego Russo <diego.russo@arm.com> | 2023-02-02 22:04:05 +0000 |
---|---|---|
committer | Diego Russo <diego.russo@arm.com> | 2023-02-03 17:48:11 +0000 |
commit | f1eaff3c9790464bed3183ff76555cf815166f50 (patch) | |
tree | bba288bb051925a692e1e1f998f7cc48df755df6 /src/mlia/cli/main.py | |
parent | d1b2374cda6811a93d1174400fc2eecd7100a8c3 (diff) | |
download | mlia-f1eaff3c9790464bed3183ff76555cf815166f50.tar.gz |
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
Diffstat (limited to 'src/mlia/cli/main.py')
-rw-r--r-- | src/mlia/cli/main.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mlia/cli/main.py b/src/mlia/cli/main.py index 1102d45..7ce7dc9 100644 --- a/src/mlia/cli/main.py +++ b/src/mlia/cli/main.py @@ -19,7 +19,6 @@ from mlia.cli.commands import check from mlia.cli.commands import optimize from mlia.cli.common import CommandInfo from mlia.cli.helpers import CLIActionResolver -from mlia.cli.logging import setup_logging from mlia.cli.options import add_backend_install_options from mlia.cli.options import add_backend_options from mlia.cli.options import add_backend_uninstall_options @@ -30,9 +29,11 @@ from mlia.cli.options import add_model_options from mlia.cli.options import add_multi_optimization_options from mlia.cli.options import add_output_options from mlia.cli.options import add_target_options +from mlia.cli.options import get_output_format from mlia.core.context import ExecutionContext from mlia.core.errors import ConfigurationError from mlia.core.errors import InternalError +from mlia.core.logging import setup_logging from mlia.target.registry import registry as target_registry @@ -162,10 +163,13 @@ def setup_context( ctx = ExecutionContext( verbose="debug" in args and args.debug, action_resolver=CLIActionResolver(vars(args)), + output_format=get_output_format(args), ) + setup_logging(ctx.logs_path, ctx.verbose, ctx.output_format) + # these parameters should not be passed into command function - skipped_params = ["func", "command", "debug"] + skipped_params = ["func", "command", "debug", "json"] # pass these parameters only if command expects them expected_params = [context_var_name] @@ -186,7 +190,6 @@ def setup_context( def run_command(args: argparse.Namespace) -> int: """Run command.""" ctx, func_args = setup_context(args) - setup_logging(ctx.logs_path, ctx.verbose) logger.debug( "*** This is the beginning of the command '%s' execution ***", args.command |