From 042a352cfb76297d21d8757c32473abe39489d6e Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Fri, 15 Dec 2023 14:06:42 +0100 Subject: [PATCH] Fix pre-commit issues --- CHANGELOG.md | 2 ++ src/anomalib/cli/cli.py | 2 +- src/anomalib/deploy/export.py | 7 ++++--- src/anomalib/engine/engine.py | 11 ++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a31996bf07..7af5aec234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed +- Changed default inference device to AUTO in https://github.com/openvinotoolkit/anomalib/pull/1534 + ### Deprecated - Support only Python 3.10 and greater in https://github.com/openvinotoolkit/anomalib/pull/1299 diff --git a/src/anomalib/cli/cli.py b/src/anomalib/cli/cli.py index bcac9a8ea3..e1bbe93747 100644 --- a/src/anomalib/cli/cli.py +++ b/src/anomalib/cli/cli.py @@ -303,7 +303,7 @@ def train(self) -> Callable[..., _EVALUATE_OUTPUT]: return self.engine.train @property - def export(self) -> Callable[..., None]: + def export(self) -> Callable[..., Path | None]: """Export the model using engine's export method.""" return self.engine.export diff --git a/src/anomalib/deploy/export.py b/src/anomalib/deploy/export.py index 03c76f5beb..d9dbf26d9d 100644 --- a/src/anomalib/deploy/export.py +++ b/src/anomalib/deploy/export.py @@ -63,6 +63,7 @@ def export_to_torch( Albumentations. task (TaskType | None): Task type should be provided if transforms is of type dict or A.Compose object. Defaults to ``None``. + Returns: Path: Path to the exported pytorch model. @@ -245,9 +246,9 @@ def export_to_openvino( model = convert_model(model_path, **ov_args) serialize(model, ov_model_path) return ov_model_path - else: - logger.exception("Could not find OpenVINO methods. Please check OpenVINO installation.") - raise ModuleNotFoundError + + logger.exception("Could not find OpenVINO methods. Please check OpenVINO installation.") + raise ModuleNotFoundError def get_metadata( diff --git a/src/anomalib/engine/engine.py b/src/anomalib/engine/engine.py index f35704e792..96caef228f 100644 --- a/src/anomalib/engine/engine.py +++ b/src/anomalib/engine/engine.py @@ -461,7 +461,7 @@ def export( input_size: tuple[int, int] | None = None, ov_args: dict[str, Any] | None = None, ckpt_path: str | None = None, - ) -> Path: + ) -> Path | None: """Export the model in the specified format. Args: @@ -517,7 +517,7 @@ def export( if export_mode == ExportMode.TORCH: return export_to_torch(model=model, export_path=export_path, transform=transform, task=self.task) - elif export_mode == ExportMode.ONNX: + if export_mode == ExportMode.ONNX: assert input_size is not None, "input_size must be provided for ONNX export mode." return export_to_onnx( model=model, @@ -526,7 +526,7 @@ def export( transform=transform, task=self.task, ) - elif export_mode == ExportMode.OPENVINO: + if export_mode == ExportMode.OPENVINO: assert input_size is not None, "input_size must be provided for OpenVINO export mode." return export_to_openvino( model=model, @@ -536,5 +536,6 @@ def export( task=self.task, ov_args=ov_args, ) - else: - logging.error(f"Export mode {export_mode} is not supported yet.") + + logging.error(f"Export mode {export_mode} is not supported yet.") + return None