From e5a0bc3ecd4d9c46ead3b8217584eaa916a3afa4 Mon Sep 17 00:00:00 2001 From: Benjamin Klimczak Date: Thu, 24 Aug 2023 16:38:47 +0100 Subject: MLIA-961 Update tox dependencies - Update version dependencies in the tox.ini - Fix linter issues Change-Id: I04c3a841ee2646a865dab037701d66c28792f2a4 Signed-off-by: Benjamin Klimczak --- tests/test_cli_options.py | 70 ++++++++++++------------ tests/test_nn_tensorflow_config.py | 12 ++-- tests/test_nn_tensorflow_optimizations_select.py | 11 ++-- tests/test_utils_console.py | 2 +- tests/test_utils_filesystem.py | 4 +- 5 files changed, 51 insertions(+), 48 deletions(-) (limited to 'tests') diff --git a/tests/test_cli_options.py b/tests/test_cli_options.py index 94c3111..c02ef89 100644 --- a/tests/test_cli_options.py +++ b/tests/test_cli_options.py @@ -26,11 +26,11 @@ from mlia.core.typing import OutputFormat None, does_not_raise(), [ - dict( - optimization_type="pruning", - optimization_target=0.5, - layers_to_optimize=None, - ) + { + "optimization_type": "pruning", + "optimization_target": 0.5, + "layers_to_optimize": None, + } ], ], [ @@ -40,11 +40,11 @@ from mlia.core.typing import OutputFormat None, does_not_raise(), [ - dict( - optimization_type="pruning", - optimization_target=0.5, - layers_to_optimize=None, - ) + { + "optimization_type": "pruning", + "optimization_target": 0.5, + "layers_to_optimize": None, + } ], ], [ @@ -54,11 +54,11 @@ from mlia.core.typing import OutputFormat None, does_not_raise(), [ - dict( - optimization_type="clustering", - optimization_target=32, - layers_to_optimize=None, - ) + { + "optimization_type": "clustering", + "optimization_target": 32, + "layers_to_optimize": None, + } ], ], [ @@ -68,16 +68,16 @@ from mlia.core.typing import OutputFormat None, does_not_raise(), [ - dict( - optimization_type="pruning", - optimization_target=0.5, - layers_to_optimize=None, - ), - dict( - optimization_type="clustering", - optimization_target=32, - layers_to_optimize=None, - ), + { + "optimization_type": "pruning", + "optimization_target": 0.5, + "layers_to_optimize": None, + }, + { + "optimization_type": "clustering", + "optimization_target": 32, + "layers_to_optimize": None, + }, ], ], [ @@ -87,11 +87,11 @@ from mlia.core.typing import OutputFormat None, does_not_raise(), [ - dict( - optimization_type="pruning", - optimization_target=0.4, - layers_to_optimize=None, - ) + { + "optimization_type": "pruning", + "optimization_target": 0.4, + "layers_to_optimize": None, + } ], ], [ @@ -113,11 +113,11 @@ from mlia.core.typing import OutputFormat 32.2, does_not_raise(), [ - dict( - optimization_type="clustering", - optimization_target=32.2, - layers_to_optimize=None, - ) + { + "optimization_type": "clustering", + "optimization_target": 32.2, + "layers_to_optimize": None, + } ], ], ], diff --git a/tests/test_nn_tensorflow_config.py b/tests/test_nn_tensorflow_config.py index 1a6fbe3..656619d 100644 --- a/tests/test_nn_tensorflow_config.py +++ b/tests/test_nn_tensorflow_config.py @@ -1,4 +1,4 @@ -# 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 """Tests for config module.""" from contextlib import ExitStack as does_not_raise @@ -45,10 +45,12 @@ def test_convert_tf_to_tflite(tmp_path: Path, test_tf_model: Path) -> None: "test.model", None, pytest.raises( - Exception, - match="The input model format is not supported" - r"\(supported formats: TensorFlow Lite, Keras, " - r"TensorFlow saved model\)!", + ValueError, + match=( + "The input model format is not supported " + r"\(supported formats: TensorFlow Lite, Keras, " + r"TensorFlow saved model\)!" + ), ), ), ], diff --git a/tests/test_nn_tensorflow_optimizations_select.py b/tests/test_nn_tensorflow_optimizations_select.py index e22a9d8..f5ba6f0 100644 --- a/tests/test_nn_tensorflow_optimizations_select.py +++ b/tests/test_nn_tensorflow_optimizations_select.py @@ -1,4 +1,4 @@ -# 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 """Tests for module select.""" from __future__ import annotations @@ -10,6 +10,7 @@ from typing import Any import pytest import tensorflow as tf +from mlia.core.errors import ConfigurationError from mlia.nn.tensorflow.optimizations.clustering import Clusterer from mlia.nn.tensorflow.optimizations.clustering import ClusteringConfiguration from mlia.nn.tensorflow.optimizations.pruning import Pruner @@ -55,7 +56,7 @@ from mlia.nn.tensorflow.optimizations.select import OptimizationSettings layers_to_optimize=None, ), pytest.raises( - Exception, + ConfigurationError, match="Optimization target should be a " "positive integer. " "Optimization target provided: 0.5", @@ -76,7 +77,7 @@ from mlia.nn.tensorflow.optimizations.select import OptimizationSettings layers_to_optimize="all", # type: ignore ), pytest.raises( - Exception, + ConfigurationError, match="Unsupported optimization type: superoptimization", ), None, @@ -89,7 +90,7 @@ from mlia.nn.tensorflow.optimizations.select import OptimizationSettings layers_to_optimize=None, ), pytest.raises( - Exception, + ConfigurationError, match="Optimization type is not provided", ), None, @@ -225,7 +226,7 @@ def test_optimization_settings_create_from( OptimizationSettings("super_optimization", 42, None), None, pytest.raises( - Exception, match="Unknown optimization type super_optimization" + Exception, match="Optimization type super_optimization is unknown." ), ], ], diff --git a/tests/test_utils_console.py b/tests/test_utils_console.py index 0a537a6..59bc6f4 100644 --- a/tests/test_utils_console.py +++ b/tests/test_utils_console.py @@ -53,7 +53,7 @@ def test_produce_table( def test_produce_table_unknown_style() -> None: """Test that function should fail if unknown style provided.""" - with pytest.raises(Exception, match="Unsupported table style unknown_style"): + with pytest.raises(ValueError, match="Table style unknown_style is not supported."): produce_table([["1", "2", "3"]], [], "unknown_style") diff --git a/tests/test_utils_filesystem.py b/tests/test_utils_filesystem.py index 654f5c8..c1c9876 100644 --- a/tests/test_utils_filesystem.py +++ b/tests/test_utils_filesystem.py @@ -40,12 +40,12 @@ def test_get_mlia_target_profiles() -> None: @pytest.mark.parametrize("raise_exception", [True, False]) def test_temp_file(raise_exception: bool) -> None: """Test temp_file context manager.""" - with contextlib.suppress(Exception): + with contextlib.suppress(RuntimeError): with temp_file() as tmp_path: assert tmp_path.is_file() if raise_exception: - raise Exception("Error!") + raise RuntimeError("Error!") assert not tmp_path.exists() -- cgit v1.2.1