🚀 Remove pl dependency from Anomalib CLI & Add install subcommand (#1748

) * Remove pl dependency from anomalib CLI Signed-off-by: Kang, Harim <harim.kang@intel.com> * Add CHANGELOG.md Signed-off-by: Kang, Harim <harim.kang@intel.com> * Remove blank in requirement txt Signed-off-by: Kang, Harim <harim.kang@intel.com> * Add Missing arguments Signed-off-by: Kang, Harim <harim.kang@intel.com> * Reflect some comments Signed-off-by: Kang, Harim <harim.kang@intel.com> * Fix verbosity level Signed-off-by: Kang, Harim <harim.kang@intel.com> * Add pytest-mock in tox Signed-off-by: Kang, Harim <harim.kang@intel.com> --------- Signed-off-by: Kang, Harim <harim.kang@intel.com>
openvinotoolkit · Feb 21, 2024 · 8c6a4fa · 8c6a4fa
1 parent 84ee0b7
commit 8c6a4fa
Show file tree

Hide file tree

Showing 18 changed files with 1,041 additions and 207 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -30,7 +30,7 @@ repos:
     rev: "v1.7.0"
     hooks:
       - id: mypy
-        additional_dependencies: [types-PyYAML]
+        additional_dependencies: [types-PyYAML, types-setuptools]
         exclude: "tests"
 
   # add bandit for security checks

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 🔒 Address checkmarx issues. by @samet-akcay in https://github.com/openvinotoolkit/anomalib/pull/1672
 - 📚 Update contribution guidelines by @samet-akcay in https://github.com/openvinotoolkit/anomalib/pull/1677
 - 🔨 Refactor Visualisation by @ashwinvaidya17 in https://github.com/openvinotoolkit/anomalib/pull/1693
+- 🔨 Remove Lightning dependencies from the CLI and Add `anomalib install` subcommand by @harimkang in https://github.com/openvinotoolkit/anomalib/pull/1748
 
 ### Deprecated
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -49,7 +49,8 @@ Set up your development environment to start contributing. This involves install
 2. Install the base and development requirements:
 
    ```bash
-   pip install -r requirements/base.txt -r requirements/dev.txt
+   pip install -r requirements/installer.txt -r requirements/dev.txt
+   anomalib install -v
    ```
 
    Optionally, for a full installation with all dependencies:

diff --git a/docs/source/markdown/guides/developer/contributing.md b/docs/source/markdown/guides/developer/contributing.md
@@ -25,7 +25,8 @@ Set up your development environment to start contributing. This involves install
    Install the base and development requirements:
 
    ```bash
-   pip install -r requirements/base.txt -r requirements/dev.txt
+   pip install -r requirements/installer.txt -r requirements/dev.txt
+   anomalib install -v
    ```
 
    Optionally, for a full installation with all dependencies:

diff --git a/requirements/base.txt → requirements/core.txt b/requirements/base.txt → requirements/core.txt
@@ -3,16 +3,12 @@ av>=10.0.0
 einops>=0.3.2
 freia>=0.2
 imgaug==0.4.0
-jsonargparse[signatures]>=4.3
 kornia>=0.6.6,<0.6.10
 matplotlib>=3.4.3
-omegaconf>=2.1.1
 opencv-python>=4.5.3.56
 pandas>=1.1.0
-lightning>2,<2.2.0 # We need to sort out the compatibility with the latest version of Lightning
-setuptools>=41.0.0
 timm>=0.5.4,<=0.6.13
+lightning>2,<2.2.0 # We need to sort out the compatibility with the latest version of Lightning
 torch>=2,<2.2.0 # rkde export fails even with ONNX 17 (latest) with torch 2.2.0. TODO(ashwinvaidya17): revisit
 torchmetrics==0.10.3
-rich-argparse
 open-clip-torch>=2.23.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -3,5 +3,6 @@ pytest
 pytest-cov
 pytest-sugar
 pytest-xdist
+pytest-mock
 coverage[toml]
 tox
diff --git a/requirements/installer.txt b/requirements/installer.txt
@@ -0,0 +1,5 @@
+jsonargparse[signatures]>=4.3
+omegaconf>=2.1.1
+rich>=13.5.2
+setuptools>=41.0.0
+rich-argparse
diff --git a/setup.py b/setup.py
@@ -78,9 +78,10 @@ def get_required_packages(requirement_files: list[str]) -> list[str]:
 
 VERSION = get_version()
 LONG_DESCRIPTION = (Path(__file__).parent / "README.md").read_text(encoding="utf8")
-INSTALL_REQUIRES = get_required_packages(requirement_files=["base"])
+INSTALL_REQUIRES = get_required_packages(requirement_files=["installer"])
 EXTRAS_REQUIRE = {
     "loggers": get_required_packages(requirement_files=["loggers"]),
+    "core": get_required_packages(requirement_files=["core"]),
     "notebooks": get_required_packages(requirement_files=["notebooks"]),
     "openvino": get_required_packages(requirement_files=["openvino"]),
     "full": get_required_packages(requirement_files=["loggers", "notebooks", "openvino"]),