[OTX] Rebase latest changes for MPA merge

.gitignore

@@ -4,11 +4,12 @@ __pycache__
 .vscode/
 *.iml
 
-venv
+*venv*/
 env
 otx-workspace*
 .env
 .tox
+results/
 
 data/*
 .coverage

.pre-commit-config.yaml

@@ -11,18 +11,6 @@ repos:
         files: '^(otx|tests)/.*\.py'
         exclude: "tests/ote_cli"
 
-      # NOTE: ote-sdk and ote-cli will be deprecated. The following config
-      # is to be removed.
-      - id: isort
-        alias: isort_ote_sdk
-        name: "isort - legacy (ote_sdk)"
-        files: '^ote_sdk/.*\.py'
-      - id: isort
-        alias: isort_rest
-        name: "isort (ote_cli|external)"
-        files: '^(ote_cli|external/anomaly|external/model-preparation-algorithm)/.*\.py'
-        exclude: "tests/"
-
   - repo: https://github.com/psf/black
     rev: 22.6.0
     hooks:
@@ -31,32 +19,21 @@ repos:
         files: '^(otx|tests)/.*\.py'
         exclude: "tests/ote_cli"
 
-      # NOTE: ote-sdk and ote-cli will be deprecated. The following config
-      # is to be removed.
-      - id: black
-        name: "black - legacy (ote_sdk|ote_cli)"
-        args: [--line-length, "88"]
-        files: '^(ote_sdk|ote_cli)/.*\.py'
-      - id: black
-        name: "black - legacy (rest)"
-        args: [--line-length, "120"]
-        files: '^(external/anomaly|external/model-preparation-algorithm)/.*\.py'
-
   - repo: https://github.com/PyCQA/flake8
     rev: "5.0.3"
     hooks:
       - id: flake8
         name: "flake8"
-        files: '^(ote_sdk|ote_cli|external/anomaly|external/model-preparation-algorithm)/.*\.py'
+        files: '^(otx|tests)/.*\.py'
         args: ["--config", ".flake8", "--max-complexity", "20"]
-        exclude: ".*/protobuf"
+        exclude: "^(.*/protobuf|tests/ote_cli)"
 
   # yaml formatting
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.7.1
     hooks:
       - id: prettier
-        exclude: "external/deep-object-reid|otx/mpa|otx/recipes"
+        exclude: "external|otx/mpa|otx/recipes"
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: "v0.971"
@@ -76,35 +53,6 @@ repos:
           ]
         exclude: "^otx/algorithms/anomaly/tests|otx/recipes|otx/mpa"
 
-      # NOTE: ote-sdk and ote-cli will be deprecated. The following config
-      # is to be removed.
-      - id: mypy
-        alias: mypy_ote_sdk
-        name: "mypy - legacy (ote_sdk)"
-        files: '^ote_sdk/.*\.py'
-        additional_dependencies:
-          [
-            numpy==1.19.5,
-            types-PyYAML,
-            attrs==21.2.*,
-            types-requests,
-            types-Deprecated,
-            types-docutils,
-            types_futures,
-            types-python-dateutil,
-          ]
-      - id: mypy
-        alias: mypy_ote_cli
-        name: "mypy - legacy (ote_cli)"
-        files: '^ote_cli/.*\.py'
-        additional_dependencies: [types-PyYAML]
-      - id: mypy
-        alias: mypy_anomaly
-        name: "mypy (anomaly)"
-        files: '^external/anomaly/.*\.py'
-        additional_dependencies: [attrs==21.2.*, types-PyYAML]
-        exclude: "^external/anomaly/tests"
-
   - repo: https://github.com/PyCQA/pylint
     rev: "v2.14.5"
     hooks:
@@ -117,17 +65,6 @@ repos:
         types: [python]
         args: ["--score=no"]
 
-      # NOTE: ote-sdk and ote-cli will be deprecated. The following config
-      # is to be removed.
-      - id: pylint
-        name: "pylint - legacy"
-        files: '^(ote_sdk|ote_cli|external/anomaly)/.*\.py'
-        entry: pylint
-        language: system
-        types: [python]
-        args: ["--score=no"]
-        exclude: "tests"
-
   - repo: https://github.com/PyCQA/pydocstyle
     rev: 6.1.1
     hooks:
@@ -140,12 +77,13 @@ repos:
         files: '^otx/.*\.py'
         exclude: "otx/algorithms/anomaly/tests|external/anomaly/tests|otx/cli/utils/tests.py|otx/mpa|otx/recipes"
 
-  - repo: https://github.com/jumanjihouse/pre-commit-hooks
-    rev: 2.1.6
-    hooks:
-      - id: markdownlint
-        # TODO: Check all files even tests after migration to otx is complete
-        exclude: "^(ote_sdk|tests|.github)"
+    # Will use rst
+    # - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    #   rev: 2.1.6
+    #   hooks:
+    #     - id: markdownlint
+    #       # TODO: Check all files even tests after migration to otx is complete
+    #       exclude: "^(ote_sdk|tests|.github|external)"
 
   - repo: https://github.com/AleksaC/hadolint-py
     rev: v2.10.0

CHANGELOG.md

@@ -2,6 +2,44 @@
 
 All notable changes to this project will be documented in this file.
 
+## \[v0.4.0\]
+
+### Added
+
+- Model Preparation Algorithm (MPA)
+  - Better saliency map support
+    - Replace current saliency map generation with Recipro-CAM for cls (<https://github.com/openvinotoolkit/training_extensions/pull/1363>)
+    - Class-wise saliency map generation for the detection task (<https://github.com/openvinotoolkit/training_extensions/pull/1402>)
+  - Improve object counting algorithm for high-res images via image tiling
+    - Add Tiling Module (<https://github.com/openvinotoolkit/training_extensions/pull/1200>)
+    - Fliter object less than 1 pixel (<https://github.com/openvinotoolkit/training_extensions/pull/1305>)
+    - Tiling deployment (<https://github.com/openvinotoolkit/training_extensions/pull/1387>)
+    - Enable tiling oriented detection for v0.4.0/geti1.1.0 (<https://github.com/openvinotoolkit/training_extensions/pull/1427>)
+
+### Fixed
+
+- Hot-fix for Detection fix two stage error (<https://github.com/openvinotoolkit/training_extensions/pull/1433>)
+- Some minor issues
+
+## \[v0.3.1\]
+
+### Fixed
+
+- Neural Network Compression Framework (NNCF)
+
+  - Fix CUDA OOM for NNCF optimization model MaskRCNN-EfficientNetB2B (<https://github.com/openvinotoolkit/training_extensions/pull/1319>)
+
+- Model Preparation Algorithm (MPA)
+  - Fix 'Shape out of bounds' error when accepting AI predictions for detection oriented (<https://github.com/openvinotoolkit/training_extensions/pull/1326>)
+  - Fix weird confidence behaviour issue on predictions for hierarchical classification (<https://github.com/openvinotoolkit/training_extensions/pull/1332>)
+  - Fix training failure issue for hierarchical classification (<https://github.com/openvinotoolkit/training_extensions/pull/1329>)
+  - Fix training failure issues for segmentation and instance segmentation during inference process (<https://github.com/openvinotoolkit/training_extensions/pull/1338>)
+  - Some minor issues
+
+### Security
+
+- Update vulnerable Python dependencies in OTE (<https://github.com/openvinotoolkit/training_extensions/pull/1303>)
+
 ## \[v0.3.0\]
 
 ### Added