Skip to content

Commit d9ec6ad

Browse files
JihwanEomyunchueunwoosh
authored
Move utils to OTX common & adapter (#1931)
* [CI] Updated daily workflow (#1904) Updated daily workflow - remove if statement to allow running on any branch by manually * [FIX] re-bugfix: ATSS head loss (#1907) re bugfix * Added security.md Added the security related notification. * Update security.md fix prettier issue * Move utils * Fix typo --------- Co-authored-by: Yunchu Lee <[email protected]> Co-authored-by: Eunwoo Shin <[email protected]>
1 parent 72fc455 commit d9ec6ad

File tree

143 files changed

+543
-420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+543
-420
lines changed

otx/algorithms/classification/adapters/mmcls/datasets/otx_datasets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
from torch.utils.data import Dataset
1919

2020
from otx.algorithms.common.utils import get_cls_img_indices, get_old_new_img_indices
21+
from otx.algorithms.common.utils.logger import get_logger
2122
from otx.api.entities.datasets import DatasetEntity
2223
from otx.api.entities.label import LabelEntity
2324
from otx.api.utils.argument_checks import (
2425
DatasetParamTypeCheck,
2526
check_input_parameters_type,
2627
)
27-
from otx.mpa.utils.logger import get_logger
2828

2929
logger = get_logger()
3030

otx/algorithms/classification/adapters/mmcls/models/classifiers/byol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from mmcls.models.builder import CLASSIFIERS, build_backbone, build_head, build_neck
1919
from torch import nn
2020

21-
from otx.mpa.utils.logger import get_logger
21+
from otx.algorithms.common.utils.logger import get_logger
2222

2323
logger = get_logger()
2424

otx/algorithms/classification/adapters/mmcls/models/classifiers/sam_classifier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from mmcls.models.classifiers.image import ImageClassifier
99

1010
from otx.algorithms.common.adapters.mmdeploy.utils import is_mmdeploy_enabled
11-
from otx.mpa.modules.utils.task_adapt import map_class_names
12-
from otx.mpa.utils.logger import get_logger
11+
from otx.algorithms.common.utils.logger import get_logger
12+
from otx.algorithms.common.utils.task_adapt import map_class_names
1313

1414
from .sam_classifier_mixin import SAMClassifierMixin
1515

otx/algorithms/classification/adapters/mmcls/models/classifiers/semisl_classifier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import torch
77
from mmcls.models.builder import CLASSIFIERS
88

9-
from otx.mpa.utils.logger import get_logger
9+
from otx.algorithms.common.utils.logger import get_logger
1010

1111
from .sam_classifier import SAMImageClassifier
1212

otx/algorithms/classification/adapters/mmcls/models/classifiers/semisl_multilabel_classifier.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from mmcls.models.builder import CLASSIFIERS
77

8-
from otx.mpa.utils.logger import get_logger
8+
from otx.algorithms.common.utils.logger import get_logger
99

1010
from .sam_classifier import SAMImageClassifier
1111

otx/algorithms/classification/adapters/mmcls/utils/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from mmcv.runner import load_checkpoint
1111
from mmcv.utils import Config, ConfigDict, get_logger
1212

13-
from otx.mpa.utils.logger import LEVEL
13+
from otx.algorithms.common.utils.logger import LEVEL
1414

1515
logger = get_logger("mmcls")
1616

otx/algorithms/classification/adapters/mmcls/utils/config_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
get_meta_keys,
2525
patch_color_conversion,
2626
)
27+
from otx.algorithms.common.utils.logger import get_logger
2728
from otx.api.entities.label import Domain
2829
from otx.api.utils.argument_checks import check_input_parameters_type
29-
from otx.mpa.utils.logger import get_logger
3030

3131
logger = get_logger()
3232

otx/algorithms/classification/tasks/inference.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
patch_default_config,
3131
patch_runner,
3232
)
33+
from otx.algorithms.common.adapters.mmcv.utils.config_utils import MPAConfig
3334
from otx.algorithms.common.configs import TrainType
3435
from otx.algorithms.common.tasks import BaseTask
3536
from otx.algorithms.common.utils import embed_ir_model_data
37+
from otx.algorithms.common.utils.logger import get_logger
3638
from otx.api.entities.datasets import DatasetEntity
3739
from otx.api.entities.inference_parameters import (
3840
InferenceParameters,
@@ -62,8 +64,6 @@
6264
)
6365
from otx.api.utils.dataset_utils import add_saliency_maps_to_dataset_item
6466
from otx.api.utils.labels_utils import get_empty_label
65-
from otx.mpa.utils.config_utils import MPAConfig
66-
from otx.mpa.utils.logger import get_logger
6767

6868
# pylint: disable=invalid-name
6969

otx/algorithms/classification/tasks/nncf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
build_nncf_classifier,
2424
)
2525
from otx.algorithms.common.tasks.nncf_base import NNCFBaseTask
26+
from otx.algorithms.common.utils.logger import get_logger
2627
from otx.api.entities.datasets import DatasetEntity
2728
from otx.api.entities.metrics import (
2829
CurveMetric,
@@ -34,7 +35,6 @@
3435
)
3536
from otx.api.entities.model import ModelEntity # ModelStatus
3637
from otx.api.entities.optimization_parameters import OptimizationParameters
37-
from otx.mpa.utils.logger import get_logger
3838

3939
from .inference import ClassificationInferenceTask
4040

otx/algorithms/classification/tasks/train.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from otx.algorithms.classification.configs import ClassificationConfig
1616
from otx.algorithms.common.utils.callback import TrainingProgressCallback
1717
from otx.algorithms.common.utils.data import get_dataset
18+
from otx.algorithms.common.utils.logger import get_logger
1819
from otx.api.configuration import cfg_helper
1920
from otx.api.configuration.helper.utils import ids_to_strings
2021
from otx.api.entities.datasets import DatasetEntity
@@ -37,7 +38,6 @@
3738
DatasetParamTypeCheck,
3839
check_input_parameters_type,
3940
)
40-
from otx.mpa.utils.logger import get_logger
4141

4242
from .inference import ClassificationInferenceTask
4343

0 commit comments

Comments
 (0)