Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify logger usage #2612

Merged
merged 12 commits into from
Nov 8, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from mmaction.datasets.ava_dataset import AVADataset
from mmaction.datasets.builder import DATASETS
from mmaction.datasets.pipelines import Compose
from mmaction.utils import get_root_logger
from mmcv.utils import print_log

from otx.algorithms.action.adapters.mmaction.data.pipelines import RawFrameDecode
Expand All @@ -36,8 +35,9 @@
from otx.api.entities.label import LabelEntity
from otx.api.entities.metadata import VideoMetadata
from otx.api.utils.shape_factory import ShapeFactory
from otx.utils.logger import get_logger

root_logger = get_root_logger()
root_logger = get_logger()


# pylint: disable=too-many-instance-attributes, too-many-arguments, too-many-locals, super-init-not-called
Expand Down
2 changes: 1 addition & 1 deletion src/otx/algorithms/action/adapters/mmaction/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
from otx.algorithms.common.configs.configuration_enums import BatchSizeAdaptType
from otx.algorithms.common.utils import append_dist_rank_suffix
from otx.algorithms.common.utils.data import get_dataset
from otx.algorithms.common.utils.logger import get_logger
from otx.api.entities.datasets import DatasetEntity
from otx.api.entities.inference_parameters import InferenceParameters
from otx.api.entities.model import ModelPrecision
Expand All @@ -66,6 +65,7 @@
from otx.api.entities.task_environment import TaskEnvironment
from otx.api.usecases.tasks.interfaces.export_interface import ExportType
from otx.core.data import caching
from otx.utils.logger import get_logger

logger = get_logger()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# See the License for the specific language governing permissions
# and limitations under the License.

import logging
import time
from collections import defaultdict

Expand All @@ -25,6 +24,10 @@
from mmaction.core.evaluation.ava_evaluation import standard_fields
from mmaction.core.evaluation.ava_utils import print_time, read_exclusions

from otx.utils.logger import get_logger

logger = get_logger()


# pylint: disable=too-many-locals, too-many-branches
def det_eval(predictions, result_type, labels, video_infos, exclude_file, verbose=True, custom_classes=None):
Expand Down Expand Up @@ -62,7 +65,7 @@ def det_eval(predictions, result_type, labels, video_infos, exclude_file, verbos
start = time.time()
for image_key in gt_boxes:
if verbose and image_key in excluded_keys:
logging.info("Found excluded timestamp in detections: %s. It will be ignored.", image_key)
logger.info("Found excluded timestamp in detections: %s. It will be ignored.", image_key)
continue
pascal_evaluator.add_single_ground_truth_image_info(
image_key,
Expand All @@ -77,7 +80,7 @@ def det_eval(predictions, result_type, labels, video_infos, exclude_file, verbos
start = time.time()
for image_key in boxes:
if verbose and image_key in excluded_keys:
logging.info("Found excluded timestamp in detections: %s. It will be ignored.", image_key)
logger.info("Found excluded timestamp in detections: %s. It will be ignored.", image_key)
continue
pascal_evaluator.add_single_detected_image_info(
image_key,
Expand Down
4 changes: 2 additions & 2 deletions src/otx/algorithms/action/adapters/openvino/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import io
import json
import logging
import os
import random
import tempfile
Expand Down Expand Up @@ -72,8 +71,9 @@
IOptimizationTask,
OptimizationType,
)
from otx.utils.logger import get_logger

logger = logging.getLogger(__name__)
logger = get_logger()


# TODO: refactoring to Sphinx style.
Expand Down
2 changes: 1 addition & 1 deletion src/otx/algorithms/action/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
InferenceProgressCallback,
TrainingProgressCallback,
)
from otx.algorithms.common.utils.logger import get_logger
from otx.api.configuration import cfg_helper
from otx.api.configuration.helper.utils import config_to_bytes, ids_to_strings
from otx.api.entities.annotation import Annotation
Expand Down Expand Up @@ -66,6 +65,7 @@
from otx.api.usecases.tasks.interfaces.export_interface import ExportType
from otx.api.utils.vis_utils import get_actmap
from otx.cli.utils.multi_gpu import is_multigpu_child_process
from otx.utils.logger import get_logger

logger = get_logger()

Expand Down
5 changes: 2 additions & 3 deletions src/otx/algorithms/action/tools/sample_classification.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

os.environ["FEATURE_FLAGS_OTX_ACTION_TASKS"] = "1"

from mmcv.utils import get_logger

from otx.algorithms.common.utils import get_task_class
from otx.api.configuration.helper import create
from otx.api.entities.inference_parameters import InferenceParameters
Expand All @@ -36,8 +34,9 @@
from otx.api.usecases.tasks.interfaces.export_interface import ExportType
from otx.api.usecases.tasks.interfaces.optimization_interface import OptimizationType
from otx.core.data.adapter import get_dataset_adapter
from otx.utils.logger import get_logger

logger = get_logger(name="sample")
logger = get_logger()


def parse_args():
Expand Down
5 changes: 2 additions & 3 deletions src/otx/algorithms/action/tools/sample_detection.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

os.environ["FEATURE_FLAGS_OTX_ACTION_TASKS"] = "1"

from mmcv.utils import get_logger

from otx.algorithms.common.utils import get_task_class
from otx.api.configuration.helper import create
from otx.api.entities.inference_parameters import InferenceParameters
Expand All @@ -34,8 +32,9 @@
from otx.api.entities.task_environment import TaskEnvironment
from otx.api.usecases.tasks.interfaces.export_interface import ExportType
from otx.core.data.adapter import get_dataset_adapter
from otx.utils.logger import get_logger

logger = get_logger(name="sample")
logger = get_logger()


def parse_args():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from pytorch_lightning.callbacks import Callback
from torch import Tensor

from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.api.entities.annotation import Annotation
from otx.api.entities.datasets import DatasetEntity
from otx.api.entities.label import LabelEntity
Expand All @@ -32,8 +31,9 @@
from otx.api.entities.scored_label import ScoredLabel
from otx.api.entities.shapes.rectangle import Rectangle
from otx.api.utils.segmentation_utils import create_annotation_from_segmentation_map
from otx.utils.logger import get_logger

logger = get_logger(__name__)
logger = get_logger()


class AnomalyInferenceCallback(Callback):
Expand Down
4 changes: 2 additions & 2 deletions src/otx/algorithms/anomaly/adapters/anomalib/data/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
from torch import Tensor
from torch.utils.data import DataLoader, Dataset

from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.api.entities.datasets import DatasetEntity
from otx.api.entities.model_template import TaskType
from otx.api.entities.shapes.polygon import Polygon
Expand All @@ -36,8 +35,9 @@
split_local_global_dataset,
)
from otx.api.utils.segmentation_utils import mask_from_dataset_item
from otx.utils.logger import get_logger

logger = get_logger(__name__)
logger = get_logger()


class OTXAnomalyDataset(Dataset):
Expand Down
85 changes: 0 additions & 85 deletions src/otx/algorithms/anomaly/adapters/anomalib/logger/logger.py

This file was deleted.

4 changes: 2 additions & 2 deletions src/otx/algorithms/anomaly/tasks/inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
)
from otx.algorithms.anomaly.adapters.anomalib.config import get_anomalib_config
from otx.algorithms.anomaly.adapters.anomalib.data import OTXAnomalyDataModule
from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.algorithms.anomaly.configs.base.configuration import BaseAnomalyConfig
from otx.algorithms.common.utils import embed_ir_model_data
from otx.algorithms.common.utils.utils import embed_onnx_model_data
Expand All @@ -69,8 +68,9 @@
from otx.api.usecases.tasks.interfaces.export_interface import ExportType, IExportTask
from otx.api.usecases.tasks.interfaces.inference_interface import IInferenceTask
from otx.api.usecases.tasks.interfaces.unload_interface import IUnload
from otx.utils.logger import get_logger

logger = get_logger(__name__)
logger = get_logger()


# pylint: disable=too-many-instance-attributes
Expand Down
4 changes: 2 additions & 2 deletions src/otx/algorithms/anomaly/tasks/nncf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

from otx.algorithms.anomaly.adapters.anomalib.callbacks import ProgressCallback
from otx.algorithms.anomaly.adapters.anomalib.data import OTXAnomalyDataModule
from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.api.entities.datasets import DatasetEntity
from otx.api.entities.model import (
ModelEntity,
Expand All @@ -56,10 +55,11 @@
IOptimizationTask,
OptimizationType,
)
from otx.utils.logger import get_logger

from .inference import InferenceTask

logger = get_logger(__name__)
logger = get_logger()


class NNCFTask(InferenceTask, IOptimizationTask):
Expand Down
4 changes: 2 additions & 2 deletions src/otx/algorithms/anomaly/tasks/openvino.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from openvino.model_api.models import AnomalyDetection, AnomalyResult

from otx.algorithms.anomaly.adapters.anomalib.config import get_anomalib_config
from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.algorithms.anomaly.configs.base.configuration import BaseAnomalyConfig
from otx.algorithms.common.utils import embed_ir_model_data
from otx.algorithms.common.utils.ir import check_if_quantized
Expand Down Expand Up @@ -71,8 +70,9 @@
)
from otx.api.utils.anomaly_utils import create_detection_annotation_from_anomaly_heatmap
from otx.api.utils.segmentation_utils import create_annotation_from_segmentation_map
from otx.utils.logger import get_logger

logger = get_logger(__name__)
logger = get_logger()


class OTXNNCFAnomalyDataloader:
Expand Down
4 changes: 2 additions & 2 deletions src/otx/algorithms/anomaly/tasks/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@

from otx.algorithms.anomaly.adapters.anomalib.callbacks import ProgressCallback
from otx.algorithms.anomaly.adapters.anomalib.data import OTXAnomalyDataModule
from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.api.entities.datasets import DatasetEntity
from otx.api.entities.model import ModelEntity
from otx.api.entities.train_parameters import TrainParameters
from otx.api.usecases.tasks.interfaces.training_interface import ITrainingTask
from otx.utils.logger import get_logger

from .inference import InferenceTask

logger = get_logger(__name__)
logger = get_logger()


class TrainingTask(InferenceTask, ITrainingTask):
Expand Down
4 changes: 2 additions & 2 deletions src/otx/algorithms/anomaly/tools/sample.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
AnomalyDetectionDataset,
AnomalySegmentationDataset,
)
from otx.algorithms.anomaly.adapters.anomalib.logger import get_logger
from otx.algorithms.anomaly.tasks import NNCFTask, OpenVINOTask
from otx.api.configuration.helper import create as create_hyper_parameters
from otx.api.entities.inference_parameters import InferenceParameters
Expand All @@ -46,8 +45,9 @@
from otx.api.usecases.tasks.interfaces.export_interface import ExportType
from otx.api.usecases.tasks.interfaces.inference_interface import IInferenceTask
from otx.api.usecases.tasks.interfaces.optimization_interface import OptimizationType
from otx.utils.logger import get_logger

logger = get_logger(__name__)
logger = get_logger()


# pylint: disable=too-many-instance-attributes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
recursively_update_cfg,
update_or_add_custom_hook,
)
from otx.algorithms.common.utils.logger import get_logger
from otx.utils.logger import get_logger

logger = get_logger()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
from torch.utils.data import Dataset

from otx.algorithms.common.utils import get_cls_img_indices, get_old_new_img_indices
from otx.algorithms.common.utils.logger import get_logger
from otx.api.entities.datasets import DatasetEntity
from otx.api.entities.id import ID
from otx.api.entities.label import LabelEntity
from otx.utils.logger import get_logger

logger = get_logger()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from mmcls.models.builder import CLASSIFIERS, build_backbone, build_head, build_neck
from torch import nn

from otx.algorithms.common.utils.logger import get_logger
from otx.utils.logger import get_logger

logger = get_logger()

Expand Down
Loading