openvinotoolkit
diff --git a/‎.pre-commit-config.yaml
+15-13 b/‎.pre-commit-config.yaml
+15-13
diff --git a/‎otx/algorithms/classification/adapters/mmcls/data/datasets.py
+1-1 b/‎otx/algorithms/classification/adapters/mmcls/data/datasets.py
+1-1
diff --git a/‎otx/algorithms/classification/adapters/mmcls/models/classifiers/byol.py
+2-1 b/‎otx/algorithms/classification/adapters/mmcls/models/classifiers/byol.py
+2-1
diff --git a/‎otx/algorithms/classification/tasks/__init__.py
+1-2 b/‎otx/algorithms/classification/tasks/__init__.py
+1-2
diff --git a/‎otx/algorithms/classification/tasks/inference.py
+4-4 b/‎otx/algorithms/classification/tasks/inference.py
+4-4
diff --git a/‎otx/algorithms/classification/tasks/train.py
+1-1 b/‎otx/algorithms/classification/tasks/train.py
+1-1
diff --git a/‎otx/algorithms/common/adapters/mmcv/hooks.py
+1-1 b/‎otx/algorithms/common/adapters/mmcv/hooks.py
+1-1
diff --git a/‎otx/algorithms/common/adapters/mmcv/models/backbones/efficientnet.py
+2-1 b/‎otx/algorithms/common/adapters/mmcv/models/backbones/efficientnet.py
+2-1
diff --git a/‎otx/algorithms/common/adapters/mmcv/models/backbones/efficientnetv2.py
+2-1 b/‎otx/algorithms/common/adapters/mmcv/models/backbones/efficientnetv2.py
+2-1
diff --git a/‎otx/algorithms/common/adapters/mmcv/models/backbones/mobilenetv3.py
+2-1 b/‎otx/algorithms/common/adapters/mmcv/models/backbones/mobilenetv3.py
+2-1
diff --git a/‎otx/algorithms/common/tasks/training_base.py
+5-5 b/‎otx/algorithms/common/tasks/training_base.py
+5-5
diff --git a/‎otx/algorithms/detection/adapters/mmdet/utils/config_utils.py
+1-1 b/‎otx/algorithms/detection/adapters/mmdet/utils/config_utils.py
+1-1
diff --git a/‎otx/algorithms/detection/configs/detection/cspdarknet_yolox/semisl/data_pipeline.py
+1-1 b/‎otx/algorithms/detection/configs/detection/cspdarknet_yolox/semisl/data_pipeline.py
+1-1
diff --git a/‎otx/algorithms/detection/configs/detection/mobilenetv2_atss/semisl/data_pipeline.py
+1-1 b/‎otx/algorithms/detection/configs/detection/mobilenetv2_atss/semisl/data_pipeline.py
+1-1
diff --git a/‎otx/algorithms/detection/configs/detection/mobilenetv2_ssd/semisl/data_pipeline.py
+1-1 b/‎otx/algorithms/detection/configs/detection/mobilenetv2_ssd/semisl/data_pipeline.py
+1-1
diff --git a/‎otx/algorithms/detection/tasks/__init__.py
+1-2 b/‎otx/algorithms/detection/tasks/__init__.py
+1-2
diff --git a/‎otx/algorithms/detection/tasks/inference.py
+3-3 b/‎otx/algorithms/detection/tasks/inference.py
+3-3
diff --git a/‎otx/algorithms/detection/tasks/nncf.py
+2-2 b/‎otx/algorithms/detection/tasks/nncf.py
+2-2
diff --git a/‎otx/algorithms/detection/tasks/openvino.py
+1-1 b/‎otx/algorithms/detection/tasks/openvino.py
+1-1
diff --git a/‎otx/algorithms/detection/tasks/train.py
+1-1 b/‎otx/algorithms/detection/tasks/train.py
+1-1
diff --git a/‎otx/algorithms/segmentation/tasks/__init__.py
+1-2 b/‎otx/algorithms/segmentation/tasks/__init__.py
+1-2
diff --git a/‎otx/algorithms/segmentation/tasks/inference.py
+3-3 b/‎otx/algorithms/segmentation/tasks/inference.py
+3-3
diff --git a/‎otx/algorithms/segmentation/tasks/nncf.py
+1-1 b/‎otx/algorithms/segmentation/tasks/nncf.py
+1-1
diff --git a/‎otx/algorithms/segmentation/tasks/openvino.py
+1-1 b/‎otx/algorithms/segmentation/tasks/openvino.py
+1-1
@@ -26,38 +26,40 @@ repos:
         name: "flake8"
         files: '^(otx|tests)/.*\.py'
         args: ["--config", ".flake8", "--max-complexity", "20"]
-        exclude: "^(.*/protobuf|tests/ote_cli)"
+        exclude: "^(.*/protobuf|tests/ote_cli)|otx/mpa|otx/recipes"
 
   # yaml formatting
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.7.1
     hooks:
       - id: prettier
-        exclude: "external"
+        exclude: "external|otx/mpa|otx/recipes"
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: "v0.971"
     hooks:
       - id: mypy
         files: '^(otx)/.*\.py'
         additional_dependencies:
-          - numpy==1.19.5
-          - types-PyYAML
-          - attrs==21.2.*
-          - types-requests
-          - types-Deprecated
-          - types-docutils
-          - types_futures
-          - types-python-dateutil
-        exclude: "^otx/algorithms/anomaly/tests"
+          [
+            numpy==1.19.5,
+            types-PyYAML,
+            attrs==21.2.*,
+            types-requests,
+            types-Deprecated,
+            types-docutils,
+            types_futures,
+            types-python-dateutil,
+          ]
+        exclude: "^otx/algorithms/anomaly/tests|otx/recipes|otx/mpa"
 
   - repo: https://github.com/PyCQA/pylint
     rev: "v2.14.5"
     hooks:
       - id: pylint
         name: "pylint"
         files: '^(otx)/.*\.py'
-        exclude: "tests"
+        exclude: "tests|otx/mpa|otx/recipes"
         entry: pylint
         language: system
         types: [python]
@@ -73,7 +75,7 @@ repos:
         language: python
         types: [python]
         files: '^otx/.*\.py'
-        exclude: "otx/algorithms/anomaly/tests|external/anomaly/tests|otx/cli/utils/tests.py"
+        exclude: "otx/algorithms/anomaly/tests|external/anomaly/tests|otx/cli/utils/tests.py|otx/mpa|otx/recipes"
 
     # Will use rst
     # - repo: https://github.com/jumanjihouse/pre-commit-hooks
 
@@ -12,11 +12,11 @@
 from mmcls.datasets.builder import DATASETS, PIPELINES
 from mmcls.datasets.pipelines import Compose
 from mmcv.utils.registry import build_from_cfg
-from mpa.utils.logger import get_logger
 from sklearn.metrics import confusion_matrix as sklearn_confusion_matrix
 from torch.utils.data import Dataset
 
 from otx.algorithms.common.utils import get_cls_img_indices, get_old_new_img_indices
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
 
 
@@ -14,9 +14,10 @@
 import torch
 import torch.distributed as dist
 from mmcls.models.builder import CLASSIFIERS, build_backbone, build_head, build_neck
-from mpa.utils.logger import get_logger
 from torch import nn
 
+from otx.mpa.utils.logger import get_logger
+
 logger = get_logger()
 
 
 
@@ -14,10 +14,9 @@
 # See the License for the specific language governing permissions
 # and limitations under the License.
 
-import mpa.cls as MPAClassification
-
 import otx.algorithms.classification.adapters.mmcls as MPAData
 import otx.algorithms.common.adapters.mmcv.models as OTXBackbones
+import otx.mpa.cls as MPAClassification
 
 from .inference import ClassificationInferenceTask
 from .nncf import OTXClassificationNNCFTask
 
@@ -9,10 +9,6 @@
 
 import numpy as np
 from mmcv.utils import ConfigDict
-from mpa import MPAConstants
-from mpa.stage import Stage
-from mpa.utils.config_utils import MPAConfig
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.classification.configs import ClassificationConfig
 from otx.algorithms.classification.utils import (
@@ -46,6 +42,10 @@
 from otx.api.usecases.tasks.interfaces.unload_interface import IUnload
 from otx.api.utils.dataset_utils import add_saliency_maps_to_dataset_item
 from otx.api.utils.labels_utils import get_empty_label
+from otx.mpa import MPAConstants
+from otx.mpa.stage import Stage
+from otx.mpa.utils.config_utils import MPAConfig
+from otx.mpa.utils.logger import get_logger
 
 # pylint: disable=invalid-name
 
 
@@ -12,7 +12,6 @@
 
 import torch
 from mmcv.utils import ConfigDict
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.classification.configs import ClassificationConfig
 from otx.algorithms.common.adapters.mmcv import OTXLoggerHook
@@ -36,6 +35,7 @@
     default_progress_callback as train_default_progress_callback,
 )
 from otx.api.serialization.label_mapper import label_schema_to_bytes
+from otx.mpa.utils.logger import get_logger
 
 from .inference import ClassificationInferenceTask
 
 
@@ -25,10 +25,10 @@
 from mmcv.runner.dist_utils import master_only
 from mmcv.runner.hooks import HOOKS, Hook, LoggerHook, LrUpdaterHook
 from mmcv.utils import print_log
-from mpa.utils.logger import get_logger
 
 from otx.api.usecases.reporting.time_monitor_callback import TimeMonitorCallback
 from otx.api.utils.argument_checks import check_input_parameters_type
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
 
 
@@ -18,10 +18,11 @@
 from mmcv.cnn import build_activation_layer
 from mmcv.cnn.bricks import ConvModule
 from mmcv.runner import load_checkpoint
-from mpa.utils.logger import get_logger
 from torch import nn
 from torch.nn import init
 
+from otx.mpa.utils.logger import get_logger
+
 from ..builder import BACKBONES
 
 logger = get_logger()
 
@@ -15,9 +15,10 @@
 
 import timm
 from mmcv.runner import load_checkpoint
-from mpa.utils.logger import get_logger
 from torch import nn
 
+from otx.mpa.utils.logger import get_logger
+
 from ..builder import BACKBONES
 
 logger = get_logger()
 
@@ -17,9 +17,10 @@
 import torch.nn.functional as F
 from mmcls.models.utils import make_divisible
 from mmcv.runner import load_checkpoint
-from mpa.utils.logger import get_logger
 from torch import nn
 
+from otx.mpa.utils.logger import get_logger
+
 from ..builder import BACKBONES
 
 logger = get_logger()
 
@@ -25,11 +25,6 @@
 import numpy as np
 import torch
 from mmcv.utils.config import Config, ConfigDict
-from mpa.builder import build
-from mpa.modules.hooks.cancel_interface_hook import CancelInterfaceHook
-from mpa.stage import Stage
-from mpa.utils.config_utils import remove_custom_hook, update_or_add_custom_hook
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.common.adapters.mmcv.hooks import OTXLoggerHook
 from otx.algorithms.common.configs import TrainType
@@ -44,6 +39,11 @@
 from otx.api.usecases.tasks.interfaces.inference_interface import IInferenceTask
 from otx.api.usecases.tasks.interfaces.unload_interface import IUnload
 from otx.api.utils.argument_checks import check_input_parameters_type
+from otx.mpa.builder import build
+from otx.mpa.modules.hooks.cancel_interface_hook import CancelInterfaceHook
+from otx.mpa.stage import Stage
+from otx.mpa.utils.config_utils import remove_custom_hook, update_or_add_custom_hook
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
 
 
@@ -21,7 +21,6 @@
 import torch
 from mmcv import Config, ConfigDict
 from mmdet.models.detectors import BaseDetector
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.common.adapters.mmcv.utils import (
     get_meta_keys,
@@ -44,6 +43,7 @@
     DirectoryPathCheck,
     check_input_parameters_type,
 )
+from otx.mpa.utils.logger import get_logger
 
 try:
     from sklearn.cluster import KMeans
 
@@ -16,7 +16,7 @@
 
 # pylint: disable=invalid-name
 
-# This is from mpa/recipes/stages/_base_/data/pipelines/ubt.py
+# This is from otx/mpa/recipes/stages/_base_/data/pipelines/ubt.py
 # This could be needed sync with incr-learning's data pipeline
 __img_scale = (992, 736)
 __img_norm_cfg = dict(mean=[0, 0, 0], std=[255, 255, 255], to_rgb=True)
 
@@ -16,7 +16,7 @@
 
 # pylint: disable=invalid-name
 
-# This is from mpa/recipes/stages/_base_/data/pipelines/ubt.py
+# This is from otx/mpa/recipes/stages/_base_/data/pipelines/ubt.py
 # This could be needed sync with incr-learning's data pipeline
 __img_scale = (992, 736)
 __img_norm_cfg = dict(mean=[0, 0, 0], std=[255, 255, 255], to_rgb=True)
 
@@ -16,7 +16,7 @@
 
 # pylint: disable=invalid-name
 
-# This is from mpa/recipes/stages/_base_/data/pipelines/ubt.py
+# This is from otx/mpa/recipes/stages/_base_/data/pipelines/ubt.py
 # This could be needed sync with incr-learning's data pipeline
 __img_scale = (864, 864)
 __img_norm_cfg = dict(mean=[0, 0, 0], std=[255, 255, 255], to_rgb=True)
 
@@ -14,9 +14,8 @@
 # See the License for the specific language governing permissions
 # and limitations under the License.
 
-import mpa.det as MPADetection
-
 import otx.algorithms.common.adapters.mmcv.models as OTXBackbones
+import otx.mpa.det as MPADetection
 
 from .inference import DetectionInferenceTask
 from .nncf import DetectionNNCFTask
 
@@ -20,9 +20,6 @@
 import cv2
 import numpy as np
 from mmcv.utils import ConfigDict
-from mpa import MPAConstants
-from mpa.utils.config_utils import MPAConfig
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.common.adapters.mmcv.utils import patch_data_pipeline
 from otx.algorithms.common.configs.training_base import TrainType
@@ -65,6 +62,9 @@
     check_input_parameters_type,
 )
 from otx.api.utils.dataset_utils import add_saliency_maps_to_dataset_item
+from otx.mpa import MPAConstants
+from otx.mpa.utils.config_utils import MPAConfig
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
 
 
@@ -36,8 +36,6 @@
 )
 from mmdet.integration.nncf.config import compose_nncf_config
 from mmdet.models import build_detector
-from mpa.utils.config_utils import remove_custom_hook
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.common.adapters.mmcv.hooks import OTXLoggerHook
 from otx.algorithms.common.adapters.mmcv.utils import remove_from_config
@@ -75,6 +73,8 @@
     DatasetParamTypeCheck,
     check_input_parameters_type,
 )
+from otx.mpa.utils.config_utils import remove_custom_hook
+from otx.mpa.utils.logger import get_logger
 
 from .inference import DetectionInferenceTask
 
 
@@ -32,7 +32,6 @@
 from compression.graph import load_model, save_model
 from compression.graph.model_utils import compress_model_weights, get_nodes_by_type
 from compression.pipeline.initializer import create_pipeline
-from mpa.utils.logger import get_logger
 from openvino.model_zoo.model_api.adapters import OpenvinoAdapter, create_core
 from openvino.model_zoo.model_api.models import Model
 
@@ -83,6 +82,7 @@
 )
 from otx.api.utils.dataset_utils import add_saliency_maps_to_dataset_item
 from otx.api.utils.detection_utils import detection2array
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
 
 
@@ -20,7 +20,6 @@
 import numpy as np
 import torch
 from mmcv.utils import ConfigDict
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.common.adapters.mmcv.hooks import OTXLoggerHook
 from otx.algorithms.common.utils.callback import TrainingProgressCallback
@@ -46,6 +45,7 @@
 from otx.api.serialization.label_mapper import label_schema_to_bytes
 from otx.api.usecases.evaluation.metrics_helper import MetricsHelper
 from otx.api.usecases.tasks.interfaces.training_interface import ITrainingTask
+from otx.mpa.utils.logger import get_logger
 
 from .inference import DetectionInferenceTask
 
 
@@ -14,9 +14,8 @@
 # See the License for the specific language governing permissions
 # and limitations under the License.
 
-import mpa.seg as MPASegmentation
-
 import otx.algorithms.common.adapters.mmcv.models as OTXBackbones
+import otx.mpa.seg as MPASegmentation
 
 from .inference import SegmentationInferenceTask
 from .nncf import SegmentationNNCFTask
 
@@ -19,9 +19,6 @@
 
 import numpy as np
 from mmcv.utils import ConfigDict
-from mpa import MPAConstants
-from mpa.utils.config_utils import MPAConfig
-from mpa.utils.logger import get_logger
 
 from otx.algorithms.common.adapters.mmcv.utils import (
     patch_data_pipeline,
@@ -64,6 +61,9 @@
     create_annotation_from_segmentation_map,
     create_hard_prediction_from_soft_prediction,
 )
+from otx.mpa import MPAConstants
+from otx.mpa.utils.config_utils import MPAConfig
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
 
 
@@ -36,7 +36,6 @@
 )
 from mmseg.integration.nncf.config import compose_nncf_config
 from mmseg.models import build_segmentor
-from mpa.utils.config_utils import remove_custom_hook
 
 from otx.algorithms.common.adapters.mmcv.hooks import OTXLoggerHook
 from otx.algorithms.common.utils.callback import OptimizationProgressCallback
@@ -71,6 +70,7 @@
     DatasetParamTypeCheck,
     check_input_parameters_type,
 )
+from otx.mpa.utils.config_utils import remove_custom_hook
 
 logger = logging.getLogger(__name__)
 
 
@@ -29,7 +29,6 @@
 from compression.graph import load_model, save_model
 from compression.graph.model_utils import compress_model_weights, get_nodes_by_type
 from compression.pipeline.initializer import create_pipeline
-from mpa.utils.logger import get_logger
 from openvino.model_zoo.model_api.adapters import OpenvinoAdapter, create_core
 from openvino.model_zoo.model_api.models import Model
 
@@ -76,6 +75,7 @@
     DatasetParamTypeCheck,
     check_input_parameters_type,
 )
+from otx.mpa.utils.logger import get_logger
 
 logger = get_logger()
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@`
`36`	`36`	`)`
`37`	`37`	`from mmdet.integration.nncf.config import compose_nncf_config`
`38`	`38`	`from mmdet.models import build_detector`
`39`		`-from mpa.utils.config_utils import remove_custom_hook`
`40`		`-from mpa.utils.logger import get_logger`
`41`	`39`
`42`	`40`	`from otx.algorithms.common.adapters.mmcv.hooks import OTXLoggerHook`
`43`	`41`	`from otx.algorithms.common.adapters.mmcv.utils import remove_from_config`
`@@ -75,6 +73,8 @@`
`75`	`73`	`DatasetParamTypeCheck,`
`76`	`74`	`check_input_parameters_type,`
`77`	`75`	`)`
	`76`	`+from otx.mpa.utils.config_utils import remove_custom_hook`
	`77`	`+from otx.mpa.utils.logger import get_logger`
`78`	`78`
`79`	`79`	`from .inference import DetectionInferenceTask`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`)`
`37`	`37`	`from mmseg.integration.nncf.config import compose_nncf_config`
`38`	`38`	`from mmseg.models import build_segmentor`
`39`		`-from mpa.utils.config_utils import remove_custom_hook`
`40`	`39`
`41`	`40`	`from otx.algorithms.common.adapters.mmcv.hooks import OTXLoggerHook`
`42`	`41`	`from otx.algorithms.common.utils.callback import OptimizationProgressCallback`
`@@ -71,6 +70,7 @@`
`71`	`70`	`DatasetParamTypeCheck,`
`72`	`71`	`check_input_parameters_type,`
`73`	`72`	`)`
	`73`	`+from otx.mpa.utils.config_utils import remove_custom_hook`
`74`	`74`
`75`	`75`	`logger = logging.getLogger(__name__)`
`76`	`76`