Skip to content

Commit 41a551e

Browse files
authored
Merge branch 'openvinotoolkit:main' into feature/mlflow-logger
2 parents 4021705 + 09cbade commit 41a551e

34 files changed

+98
-335
lines changed

.ci/Dockerfile

+3-9
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,11 @@ RUN conda install python=3.10
5959
## Anomalib Development Env
6060
#########################################################
6161

62-
FROM python_base_cuda11.4 as anomalib_development_env
62+
FROM python_base_cuda as anomalib_development_env
6363

6464
# Install all anomalib requirements
65-
COPY ./requirements/installer.txt /tmp/anomalib/requirements/installer.txt
66-
RUN pip install --no-cache-dir -r /tmp/anomalib/requirements/installer.txt
65+
COPY ./pyproject.toml /tmp/anomalib/pyproject.toml
66+
RUN pip install --no-cache-dir .[full]
6767

68-
COPY ./requirements/openvino.txt /tmp/anomalib/requirements/openvino.txt
69-
RUN pip install --no-cache-dir -r /tmp/anomalib/requirements/openvino.txt
70-
71-
# Install other requirements related to development
72-
COPY ./requirements/dev.txt /tmp/anomalib/requirements/dev.txt
73-
RUN pip install --no-cache-dir -r /tmp/anomalib/requirements/dev.txt
7468

7569
WORKDIR /home/user

.github/CODEOWNERS

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
# CI/CD
99
/.ci/ @ashwinvaidya17
10-
/.devcontainer @ashwinvaidya17 @yunchu
11-
/.github @ashwinvaidya17 @yunchu
10+
/.devcontainer @ashwinvaidya17
11+
/.github @ashwinvaidya17
1212
/.dockerignore @ashwinvaidya17
1313

1414
# Docs
@@ -19,7 +19,7 @@
1919
/notebooks/100_datamodules @djdameln
2020
/notebooks/200_models @samet-akcay
2121
/notebooks/300_benchmarking @ashwinvaidya17
22-
/notebooks/400_openvino @samet-akcay @paularamo
22+
/notebooks/400_openvino @samet-akcay
2323
/notebooks/500_use_cases @paularamo
2424
/notebooks/README.md @samet-akcay
2525

@@ -71,11 +71,11 @@
7171
/tests/ @samet-akcay @ashwinvaidya17
7272

7373
# Misc
74-
/pyproject.toml @samet-akcay @yunchu
74+
/pyproject.toml @samet-akcay
7575
/README.md @samet-akcay @ashwinvaidya17 @djdameln
76-
/setup.py @samet-akcay @yunchu
76+
/setup.py @samet-akcay
7777
/third-party-programs.txt @samet-akcay @ashwinvaidya17 @djdameln
78-
/tox.ini @samet-akcay @yunchu
78+
/tox.ini @samet-akcay
7979

8080
# Tools
8181
/tools/benchmarking @ashwinvaidya17

.github/labeler.yml

-65
This file was deleted.

.github/workflows/labeler.yml

-14
This file was deleted.

.readthedocs.yaml

+2-5
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ formats:
2929
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
3030
python:
3131
install:
32-
- requirements: docs/requirements.txt
33-
- requirements: requirements/core.txt
34-
- requirements: requirements/loggers.txt
35-
- requirements: requirements/notebooks.txt
36-
- requirements: requirements/openvino.txt
3732
- method: pip
3833
path: .
34+
extra_requirements:
35+
- dev

CONTRIBUTING.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,24 @@ Set up your development environment to start contributing. This involves install
4646
conda activate anomalib_dev
4747
```
4848

49-
2. Install the base and development requirements:
49+
2. Install the development requirements:
5050

5151
```bash
52-
pip install -r requirements/installer.txt -r requirements/dev.txt
53-
anomalib install -v
52+
# Option I: Via anomalib install
53+
anomalib install --option dev
54+
55+
#Option II: Via pip install
56+
pip install -e .[dev]
5457
```
5558

5659
Optionally, for a full installation with all dependencies:
5760

5861
```bash
59-
pip install -e .[all]
62+
# Option I: via anomalib install
63+
anomalib install --option full
64+
65+
# Option II: via pip install
66+
pip install -e .[full]
6067
```
6168

6269
3. Install and configure pre-commit hooks:

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Installing the library with pip is the easiest way to get started with anomalib.
5252
pip install anomalib
5353
```
5454

55-
This will install Anomalib CLI using the [installer](requirements/installer.txt) dependencies. Anomalib CLI is a command line interface for training, inference, benchmarking, and hyperparameter optimization. If you want to use the library as a Python package, you can install the library with the following command:
55+
This will install Anomalib CLI using the [dependencies](/pyproject.toml) in the `pyproject.toml` file. Anomalib CLI is a command line interface for training, inference, benchmarking, and hyperparameter optimization. If you want to use the library as a Python package, you can install the library with the following command:
5656

5757
```bash
5858
# Get help for the installation arguments
@@ -92,7 +92,7 @@ cd anomalib
9292
pip install -e .
9393
```
9494

95-
This will install Anomalib CLI using the [installer](requirements/installer.txt) dependencies. Anomalib CLI is a command line interface for training, inference, benchmarking, and hyperparameter optimization. If you want to use the library as a Python package, you can install the library with the following command:
95+
This will install Anomalib CLI using the [dependencies](/pyproject.toml) in the `pyproject.toml` file. Anomalib CLI is a command line interface for training, inference, benchmarking, and hyperparameter optimization. If you want to use the library as a Python package, you can install the library with the following command:
9696

9797
```bash
9898
# Get help for the installation arguments

docs/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ This is the source code for the Anomalib documentation. It is built using sphinx
66

77
## Installation
88

9-
To install the dependencies, run the following command:
9+
To install the dependencies, run the following command from the project root:
1010

1111
```bash
12-
pip install -r requirements.txt
12+
pip install .[docs]
1313
```
1414

1515
## Build
1616

1717
To build the documentation, run the following command:
1818

1919
```bash
20+
cd docs
2021
sphinx-build -b html source build
2122
```

docs/source/markdown/guides/developer/contributing.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,24 @@ Set up your development environment to start contributing. This involves install
2222
conda activate anomalib_dev
2323
```
2424

25-
Install the base and development requirements:
25+
Install the development requirements:
2626

2727
```bash
28-
pip install -r requirements/installer.txt -r requirements/dev.txt
29-
anomalib install -v
28+
# Option I: Via anomalib install
29+
anomalib install --option dev
30+
31+
#Option II: Via pip install
32+
pip install -e .[dev]
3033
```
3134

3235
Optionally, for a full installation with all dependencies:
3336

3437
```bash
35-
pip install -e .[all]
38+
# Option I: via anomalib install
39+
anomalib install --option full
40+
41+
# Option II: via pip install
42+
pip install -e .[full]
3643
```
3744

3845
2. Install and configure pre-commit hooks:

pyproject.toml

+16-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ authors = [{ name = "Intel OpenVINO" }]
1818
dependencies = [
1919
"omegaconf>=2.1.1",
2020
"rich>=13.5.2",
21-
"jsonargparse==4.27.7",
21+
"jsonargparse[all]>=4.27.7",
2222
"docstring_parser", # CLI help-formatter
2323
"rich_argparse", # CLI help-formatter
2424
]
@@ -29,13 +29,13 @@ core = [
2929
"einops>=0.3.2",
3030
"freia>=0.2",
3131
"imgaug==0.4.0",
32-
"kornia>=0.6.6,<0.6.10",
32+
"kornia>=0.6.6",
3333
"matplotlib>=3.4.3",
3434
"opencv-python>=4.5.3.56",
3535
"pandas>=1.1.0",
3636
"timm>=0.5.4,<=0.9.16",
37-
"lightning>2,<2.2.0",
38-
"torch>=2,<2.2.0",
37+
"lightning>=2.2",
38+
"torch>=2",
3939
"torchmetrics>=1.3.2",
4040
"open-clip-torch>=2.23.0",
4141
]
@@ -48,7 +48,17 @@ loggers = [
4848
"mlflow >=1.0.0",
4949
]
5050
notebooks = ["gitpython", "ipykernel", "ipywidgets", "notebook"]
51-
dev = [
51+
docs = [
52+
"myst-parser",
53+
"nbsphinx",
54+
"pandoc",
55+
"sphinx<8.0", # 7.0 breaks readthedocs builds.
56+
"sphinx_autodoc_typehints",
57+
"sphinx_book_theme",
58+
"sphinx-copybutton",
59+
"sphinx_design",
60+
]
61+
test = [
5262
"pre-commit",
5363
"pytest",
5464
"pytest-cov",
@@ -59,6 +69,7 @@ dev = [
5969
"tox",
6070
]
6171
full = ["anomalib[core,openvino,loggers,notebooks]"]
72+
dev = ["anomalib[full,docs,test]"]
6273

6374
[project.scripts]
6475
anomalib = "anomalib.cli.cli:main"

requirements/core.txt

-13
This file was deleted.

requirements/dev.txt

-8
This file was deleted.

requirements/installer.txt

-5
This file was deleted.

requirements/notebooks.txt

-4
This file was deleted.

requirements/openvino.txt

-3
This file was deleted.

0 commit comments

Comments
 (0)