Commit 2526b053 authored by Ajinkya Deogade's avatar Ajinkya Deogade Committed by Facebook GitHub Bot
Browse files

Expand relative imports to absolute versions

Summary:
Pull Request resolved: https://github.com/facebookresearch/d2go/pull/545

Expanding the relative imports to absolute ones helps the autodeps down the stack.

Reviewed By: tglik

Differential Revision: D45912074

fbshipit-source-id: d42c9756dde731504ee6fd0f93cf549d71157489
parent 20e18edc
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# @fb-only: from . import fb, fbnet_v2 # noqa # @fb-only: from d2go.modeling.backbone import fb, fbnet_v2 # noqa
# Explicitly expose all registry-based modules # Explicitly expose all registry-based modules
......
...@@ -9,6 +9,14 @@ from typing import List ...@@ -9,6 +9,14 @@ from typing import List
import torch import torch
import torch.nn as nn import torch.nn as nn
from d2go.modeling.backbone.modules import (
KeypointRCNNConvUpsamplePredictorNoUpscale,
KeypointRCNNIRFPredictorNoUpscale,
KeypointRCNNPredictor,
KeypointRCNNPredictorNoUpscale,
MaskRCNNConv1x1Predictor,
RPNHeadConvRegressor,
)
from d2go.modeling.modeldef.fbnet_modeldef_registry import FBNetV2ModelArch from d2go.modeling.modeldef.fbnet_modeldef_registry import FBNetV2ModelArch
from detectron2.layers import ShapeSpec from detectron2.layers import ShapeSpec
from detectron2.modeling import ( from detectron2.modeling import (
...@@ -23,15 +31,6 @@ from detectron2.utils.logger import log_first_n ...@@ -23,15 +31,6 @@ from detectron2.utils.logger import log_first_n
from mobile_cv.arch.fbnet_v2 import fbnet_builder as mbuilder from mobile_cv.arch.fbnet_v2 import fbnet_builder as mbuilder
from mobile_cv.arch.utils.helper import format_dict_expanding_list_values from mobile_cv.arch.utils.helper import format_dict_expanding_list_values
from .modules import (
KeypointRCNNConvUpsamplePredictorNoUpscale,
KeypointRCNNIRFPredictorNoUpscale,
KeypointRCNNPredictor,
KeypointRCNNPredictorNoUpscale,
MaskRCNNConv1x1Predictor,
RPNHeadConvRegressor,
)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
...@@ -2,5 +2,11 @@ ...@@ -2,5 +2,11 @@
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# NOTE: making necessary imports to register with Registry # NOTE: making necessary imports to register with Registry
# @fb-only: from . import fb # isort:skip # noqa # @fb-only: from d2go.modeling.meta_arch import fb # isort:skip # noqa
from . import fcos, panoptic_fpn, rcnn, retinanet, semantic_seg # noqa from d2go.modeling.meta_arch import ( # noqa
fcos,
panoptic_fpn,
rcnn,
retinanet,
semantic_seg,
)
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
This is the centralized place to define modeldef for all projects under D2Go. This is the centralized place to define modeldef for all projects under D2Go.
""" """
# @fb-only: from . import fb # isort:skip # noqa # @fb-only: from d2go.modeling.modeldef import fb # isort:skip # noqa
from . import modeldef # noqa from d2go.modeling import modeldef # noqa
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
from .build import build_optimizer_mapper from d2go.optimizer.build import build_optimizer_mapper
__all__ = ["build_optimizer_mapper"] __all__ = ["build_optimizer_mapper"]
...@@ -10,16 +10,18 @@ from typing import Tuple ...@@ -10,16 +10,18 @@ from typing import Tuple
import detectron2.utils.comm as comm import detectron2.utils.comm as comm
import torch import torch
from d2go.quantization import learnable_qat from d2go.quantization import learnable_qat
from d2go.quantization.fx import get_convert_fx_fn, get_prepare_fx_fn
from d2go.quantization.qconfig import (
set_backend_and_create_qconfig,
smart_decode_backend,
)
from detectron2.checkpoint import DetectionCheckpointer from detectron2.checkpoint import DetectionCheckpointer
from detectron2.engine import HookBase, SimpleTrainer from detectron2.engine.train_loop import HookBase, SimpleTrainer
from detectron2.utils.file_io import PathManager from detectron2.utils.file_io import PathManager
from mobile_cv.arch.quantization.observer import update_stat as observer_update_stat from mobile_cv.arch.quantization.observer import update_stat as observer_update_stat
from mobile_cv.arch.utils import fuse_utils from mobile_cv.arch.utils import fuse_utils
from mobile_cv.common.misc.iter_utils import recursive_iterate from mobile_cv.common.misc.iter_utils import recursive_iterate
from .fx import get_convert_fx_fn, get_prepare_fx_fn
from .qconfig import set_backend_and_create_qconfig, smart_decode_backend
TORCH_VERSION: Tuple[int, ...] = tuple(int(x) for x in torch.__version__.split(".")[:2]) TORCH_VERSION: Tuple[int, ...] = tuple(int(x) for x in torch.__version__.split(".")[:2])
if TORCH_VERSION > (1, 10): if TORCH_VERSION > (1, 10):
from torch.ao.quantization import convert from torch.ao.quantization import convert
......
...@@ -5,11 +5,14 @@ ...@@ -5,11 +5,14 @@
import importlib import importlib
from typing import Optional, Type, Union from typing import Optional, Type, Union
from .api import RunnerV2Mixin from d2go.runner.api import RunnerV2Mixin
from .default_runner import BaseRunner, Detectron2GoRunner, GeneralizedRCNNRunner from d2go.runner.default_runner import (
from .lightning_task import DefaultTask BaseRunner,
from .training_hooks import TRAINER_HOOKS_REGISTRY Detectron2GoRunner,
GeneralizedRCNNRunner,
)
from d2go.runner.lightning_task import DefaultTask
from d2go.runner.training_hooks import TRAINER_HOOKS_REGISTRY
__all__ = [ __all__ = [
"RunnerV2Mixin", "RunnerV2Mixin",
......
...@@ -54,7 +54,8 @@ from detectron2.data import ( ...@@ -54,7 +54,8 @@ from detectron2.data import (
build_detection_train_loader as d2_build_detection_train_loader, build_detection_train_loader as d2_build_detection_train_loader,
MetadataCatalog, MetadataCatalog,
) )
from detectron2.engine import AMPTrainer, hooks, SimpleTrainer from detectron2.engine import hooks
from detectron2.engine.train_loop import AMPTrainer, SimpleTrainer
from detectron2.evaluation import ( from detectron2.evaluation import (
COCOEvaluator, COCOEvaluator,
DatasetEvaluators, DatasetEvaluators,
......
...@@ -7,7 +7,7 @@ from d2go.config import CfgNode ...@@ -7,7 +7,7 @@ from d2go.config import CfgNode
from d2go.utils.gpu_memory_profiler import log_memory_snapshot, record_memory_history from d2go.utils.gpu_memory_profiler import log_memory_snapshot, record_memory_history
from detectron2.engine import HookBase from detectron2.engine.train_loop import HookBase
from detectron2.utils.registry import Registry from detectron2.utils.registry import Registry
......
...@@ -23,7 +23,8 @@ from d2go.distributed import ( ...@@ -23,7 +23,8 @@ from d2go.distributed import (
get_local_rank, get_local_rank,
get_num_processes_per_machine, get_num_processes_per_machine,
) )
from d2go.runner import BaseRunner, DefaultTask, import_runner, RunnerV2Mixin from d2go.runner import BaseRunner, import_runner, RunnerV2Mixin
from d2go.runner.lightning_task import DefaultTask
from d2go.utils.helper import run_once from d2go.utils.helper import run_once
from d2go.utils.launch_environment import get_launch_environment from d2go.utils.launch_environment import get_launch_environment
from d2go.utils.logging import initialize_logging, replace_print_with_logging from d2go.utils.logging import initialize_logging, replace_print_with_logging
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
# import to make sure Registry works # import to make sure Registry works
# usort does not respect the `fb-only` tag so use isort:skip here # usort does not respect the `fb-only` tag so use isort:skip here
# @fb-only: from . import fb # isort:skip # noqa # @fb-only: from d2go.utils import fb # isort:skip # noqa
from . import flop_calculator # noqa from d2go.utils import flop_calculator # noqa
...@@ -12,11 +12,10 @@ from typing import Any, Callable, Dict, Iterator, Optional ...@@ -12,11 +12,10 @@ from typing import Any, Callable, Dict, Iterator, Optional
import detectron2.utils.comm as comm import detectron2.utils.comm as comm
import torch import torch
from d2go.config import CfgNode from d2go.config import CfgNode
from d2go.utils.tensorboard_log_util import get_tensorboard_log_dir # noqa: forwarding
from detectron2.utils.file_io import PathManager from detectron2.utils.file_io import PathManager
from tabulate import tabulate from tabulate import tabulate
from .tensorboard_log_util import get_tensorboard_log_dir # noqa: forwarding
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Subdirectory with model configurations dumped by the training binary. # Subdirectory with model configurations dumped by the training binary.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment