Update anomalib version and requirements (#163)

* renamed download-progress-bar as download * added new download functions to init * Added Btech data module * Added btech tests * Move split functions into a util module * Modified mvtec * added btech to get-datamodule * fix typo in btech docstring * update docstring * cleanedup dataset download utils * Address mypy * modify config files and update readme.md * Fix dataset path * WiP: Created make_dataset function * Renamed folder dataset into custom * Added custom dataset tests * updated config.yaml file to show custom dataset is available * Added custom dataset to get_datamodule * Address PR comments * fix dataset path * Debugging the ci * Fixed folder dataset tests * Added code quality checks back to the ci * Added code coverage back to pre-merge tests * Do not import openvino at the top level. Cause some import issues when openvino is not install * Move nncf to openvino-requirements.txt * Move opencv to base requirements.txt/ * Added extension as an option when saving the result images. * Added an extension check * python verion 3.7 * Added opencv contrib python * reverted visualizer callback * Convert bmp images to png after downloading btech dataset. * pylint * ignore arguments differ * Version to 0.2.5 * Ignore arguments-differ * loosen pandas version * import openvino with absolute import
openvinotoolkit · Mar 25, 2022 · 6829739 · 6829739
1 parent 3b85ce4
commit 6829739
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -29,7 +29,7 @@ authors:
     family-names: Genc
     email: utku.genc@intel.com
     affiliation: Intel
-version: 0.2.4
+version: 0.2.5
 doi: https://doi.org/10.48550/arXiv.2202.08341
 date-released: 2022-02-18
 references:

diff --git a/anomalib/__init__.py b/anomalib/__init__.py
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions
 # and limitations under the License.
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"
diff --git a/anomalib/utils/callbacks/__init__.py b/anomalib/utils/callbacks/__init__.py
@@ -25,13 +25,11 @@
 from .cdf_normalization import CdfNormalizationCallback
 from .min_max_normalization import MinMaxNormalizationCallback
 from .model_loader import LoadModelCallback
-from .openvino import OpenVINOCallback
 from .save_to_csv import SaveToCSVCallback
 from .timer import TimerCallback
 from .visualizer_callback import VisualizerCallback
 
 __all__ = [
-    "OpenVINOCallback",
     "LoadModelCallback",
     "TimerCallback",
     "VisualizerCallback",
@@ -97,6 +95,10 @@ def get_callbacks(config: Union[ListConfig, DictConfig]) -> List[Callback]:
                 )
             )
         if "openvino" in config.optimization and config.optimization.openvino.apply:
+            from .openvino import (  # pylint: disable=import-outside-toplevel
+                OpenVINOCallback,
+            )
+
             callbacks.append(
                 OpenVINOCallback(
                     input_size=config.model.input_size,

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -7,9 +7,11 @@ kornia==0.5.6
 lxml==4.6.5
 matplotlib==3.4.3
 networkx~=2.5
-nncf@ git+https://github.com/openvinotoolkit/nncf@37a830a412e60ec2fd2d84d7f00e2524e5f62777#egg=nncf
 numpy~=1.19.5
 omegaconf==2.1.1
+opencv-python>=4.5.3.56
+opencv-contrib-python==4.5.5.62
+pandas~=1.1.5
 pillow==9.0.0
 pytorch-lightning==1.5.9
 torch==1.8.1

diff --git a/requirements/openvino.txt b/requirements/openvino.txt
@@ -1,6 +1,6 @@
 defusedxml==0.7.1
 requests==2.26.0
 networkx~=2.5
+nncf@ git+https://github.com/openvinotoolkit/nncf@37a830a412e60ec2fd2d84d7f00e2524e5f62777#egg=nncf
 onnx==1.10.1
-opencv-python==4.5.3.56
 openvino-dev==2021.4.2
diff --git a/setup.py b/setup.py
@@ -86,15 +86,15 @@ def get_required_packages(requirement_files: List[str]) -> List[str]:
 setup(
     name="anomalib",
     # TODO: https://github.com/openvinotoolkit/anomalib/issues/36
-    version="0.2.4",
+    version="0.2.5",
     author="Intel OpenVINO",
     author_email="help@openvino.intel.com",
     description="anomalib - Anomaly Detection Library",
     url="",
     license="Copyright (c) Intel - All Rights Reserved. "
     'Licensed under the Apache License, Version 2.0 (the "License")'
     "See LICENSE file for more details.",
-    python_requires=">=3.8",
+    python_requires=">=3.7",
     packages=find_packages("."),
     install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRE,

diff --git a/tests/pre_merge/utils/callbacks/openvino_callback/test_openvino.py b/tests/pre_merge/utils/callbacks/openvino_callback/test_openvino.py
@@ -5,7 +5,7 @@
 from pytorch_lightning.callbacks.early_stopping import EarlyStopping
 
 from anomalib.config import get_configurable_parameters
-from anomalib.utils.callbacks import OpenVINOCallback
+from anomalib.utils.callbacks.openvino import OpenVINOCallback
 from tests.pre_merge.utils.callbacks.openvino_callback.dummy_lightning_model import (
     DummyLightningModule,
     FakeDataModule,