Skip to content

Commit

Permalink
rename convert_mmdet_test_pipeline to adapt_mmdet_pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben-Louis committed Mar 12, 2023
1 parent 74b44c5 commit 102c5f2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions demo/topdown_demo_with_mmdet.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from mmpose.evaluation.functional import nms
from mmpose.registry import VISUALIZERS
from mmpose.structures import merge_data_samples, split_instances
from mmpose.utils import convert_mmdet_test_pipeline
from mmpose.utils import adapt_mmdet_pipeline

try:
from mmdet.apis import inference_detector, init_detector
Expand Down Expand Up @@ -146,7 +146,7 @@ def main():
# build detector
detector = init_detector(
args.det_config, args.det_checkpoint, device=args.device)
detector.cfg = convert_mmdet_test_pipeline(detector.cfg)
detector.cfg = adapt_mmdet_pipeline(detector.cfg)

# build pose estimator
pose_estimator = init_pose_estimator(
Expand Down
4 changes: 2 additions & 2 deletions mmpose/apis/webcam/nodes/model_nodes/detector_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import numpy as np

from mmpose.utils import convert_mmdet_test_pipeline
from mmpose.utils import adapt_mmdet_pipeline
from ...utils import get_config_path
from ..node import Node
from ..registry import NODES
Expand Down Expand Up @@ -92,7 +92,7 @@ def __init__(self,
# Init model
self.model = init_detector(
self.model_config, self.model_checkpoint, device=self.device)
self.model.cfg = convert_mmdet_test_pipeline(self.model.cfg)
self.model.cfg = adapt_mmdet_pipeline(self.model.cfg)

# Register buffers
self.register_input_buffer(input_buffer, 'input', trigger=True)
Expand Down
4 changes: 2 additions & 2 deletions mmpose/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Copyright (c) OpenMMLab. All rights reserved.
from .camera import SimpleCamera, SimpleCameraTorch
from .collect_env import collect_env
from .config_utils import convert_mmdet_test_pipeline
from .config_utils import adapt_mmdet_pipeline
from .logger import get_root_logger
from .setup_env import register_all_modules, setup_multi_processes
from .timer import StopWatch

__all__ = [
'get_root_logger', 'collect_env', 'StopWatch', 'setup_multi_processes',
'register_all_modules', 'SimpleCamera', 'SimpleCameraTorch',
'convert_mmdet_test_pipeline'
'adapt_mmdet_pipeline'
]
2 changes: 1 addition & 1 deletion mmpose/utils/config_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from mmpose.utils.typing import ConfigDict


def convert_mmdet_test_pipeline(cfg: ConfigDict) -> ConfigDict:
def adapt_mmdet_pipeline(cfg: ConfigDict) -> ConfigDict:
"""Converts pipeline types in MMDetection's test dataloader to use the
'mmdet' namespace.
Expand Down

0 comments on commit 102c5f2

Please sign in to comment.