From 5d81f37de09efe10f90512e50252be9c36925fcf Mon Sep 17 00:00:00 2001 From: Benjamin Klimczak Date: Mon, 11 Jul 2022 12:33:42 +0100 Subject: MLIA-551 Rework remains of AIET architecture Re-factoring the code base to further merge the old AIET code into MLIA. - Remove last traces of the backend type 'tool' - Controlled systems removed, including SSH protocol, controller, RunningCommand, locks etc. - Build command / build dir and deploy functionality removed from Applications and Systems - Moving working_dir() - Replace module 'output_parser' with new module 'output_consumer' and merge Base64 parsing into it - Change the output consumption to optionally remove (i.e. actually consume) lines - Use Base64 parsing in GenericInferenceOutputParser, replacing the regex-based parsing and remove the now unused regex parsing - Remove AIET reporting - Pre-install applications by moving them to src/mlia/resources/backends - Rename aiet-config.json to backend-config.json - Move tests from tests/mlia/ to tests/ - Adapt unit tests to code changes - Dependencies removed: paramiko, filelock, psutil - Fix bug in corstone.py: The wrong resource directory was used which broke the functionality to download backends. - Use f-string formatting. - Use logging instead of print. Change-Id: I768bc3bb6b2eda57d219ad01be4a8e0a74167d76 --- tests/utils/__init__.py | 3 +++ tests/utils/common.py | 32 ++++++++++++++++++++++++++++++++ tests/utils/logging.py | 13 +++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 tests/utils/__init__.py create mode 100644 tests/utils/common.py create mode 100644 tests/utils/logging.py (limited to 'tests/utils') diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py new file mode 100644 index 0000000..27166ef --- /dev/null +++ b/tests/utils/__init__.py @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. +# SPDX-License-Identifier: Apache-2.0 +"""Test utils module.""" diff --git a/tests/utils/common.py b/tests/utils/common.py new file mode 100644 index 0000000..932343e --- /dev/null +++ b/tests/utils/common.py @@ -0,0 +1,32 @@ +# SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. +# SPDX-License-Identifier: Apache-2.0 +"""Common test utils module.""" +from typing import Tuple + +import numpy as np +import tensorflow as tf + + +def get_dataset() -> Tuple[np.ndarray, np.ndarray]: + """Return sample dataset.""" + mnist = tf.keras.datasets.mnist + (x_train, y_train), _ = mnist.load_data() + x_train = x_train / 255.0 + + # Use subset of 60000 examples to keep unit test speed fast. + x_train = x_train[0:1] + y_train = y_train[0:1] + + return x_train, y_train + + +def train_model(model: tf.keras.Model) -> None: + """Train model using sample dataset.""" + num_epochs = 1 + + loss_fn = tf.keras.losses.SparseCategoricalCrossentropy(from_logits=True) + model.compile(optimizer="adam", loss=loss_fn, metrics=["accuracy"]) + + x_train, y_train = get_dataset() + + model.fit(x_train, y_train, epochs=num_epochs) diff --git a/tests/utils/logging.py b/tests/utils/logging.py new file mode 100644 index 0000000..d223fb2 --- /dev/null +++ b/tests/utils/logging.py @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates. +# SPDX-License-Identifier: Apache-2.0 +"""Utils for logging.""" +import logging + + +def clear_loggers() -> None: + """Close the log handlers.""" + for _, logger in logging.Logger.manager.loggerDict.items(): + if not isinstance(logger, logging.PlaceHolder): + for handler in logger.handlers: + handler.close() + logger.removeHandler(handler) -- cgit v1.2.1