"git@developer.sourcefind.cn:renzhc/diffusers_dcu.git" did not exist on "b0550a66cc3c882a1b88470df7e26103208b13de"
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
from .api import is_distributed_checkpoint from d2go.checkpoint.api import is_distributed_checkpoint
from .fsdp_checkpoint import FSDPCheckpointer from d2go.checkpoint.fsdp_checkpoint import FSDPCheckpointer
__all__ = [ __all__ = [
"is_distributed_checkpoint", "is_distributed_checkpoint",
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# forward the namespace to avoid `d2go.config.config` # forward the namespace to avoid `d2go.config.config`
from .config import ( from d2go.config.config import (
auto_scale_world_size, auto_scale_world_size,
CfgNode, CfgNode,
CONFIG_CUSTOM_PARSE_REGISTRY, CONFIG_CUSTOM_PARSE_REGISTRY,
......
...@@ -8,11 +8,10 @@ from typing import List ...@@ -8,11 +8,10 @@ from typing import List
import mock import mock
import yaml import yaml
from d2go.config.utils import reroute_config_path, resolve_default_config
from detectron2.config import CfgNode as _CfgNode from detectron2.config import CfgNode as _CfgNode
from fvcore.common.registry import Registry from fvcore.common.registry import Registry
from .utils import reroute_config_path, resolve_default_config
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
CONFIG_CUSTOM_PARSE_REGISTRY = Registry("CONFIG_CUSTOM_PARSE") CONFIG_CUSTOM_PARSE_REGISTRY = Registry("CONFIG_CUSTOM_PARSE")
......
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
# 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 # isort:skip # noqa # @fb-only: from d2go.data.dataset_mappers import fb # isort:skip # noqa
from .build import build_dataset_mapper, D2GO_DATA_MAPPER_REGISTRY # noqa from d2go.data.dataset_mappers.build import ( # noqa
from .d2go_dataset_mapper import D2GoDatasetMapper # noqa build_dataset_mapper,
from .rotated_dataset_mapper import RotatedDatasetMapper # noqa D2GO_DATA_MAPPER_REGISTRY,
)
from d2go.data.dataset_mappers.d2go_dataset_mapper import D2GoDatasetMapper # noqa
from d2go.data.dataset_mappers.rotated_dataset_mapper import ( # noqa
RotatedDatasetMapper,
)
...@@ -7,6 +7,7 @@ import logging ...@@ -7,6 +7,7 @@ import logging
import numpy as np import numpy as np
import torch import torch
from d2go.data.dataset_mappers.build import D2GO_DATA_MAPPER_REGISTRY
from d2go.data.dataset_mappers.data_reading import ( from d2go.data.dataset_mappers.data_reading import (
read_image_with_prefetch, read_image_with_prefetch,
read_sem_seg_file_with_prefetch, read_sem_seg_file_with_prefetch,
...@@ -15,8 +16,6 @@ from d2go.utils.helper import retryable ...@@ -15,8 +16,6 @@ from d2go.utils.helper import retryable
from detectron2.data import detection_utils as utils, transforms as T from detectron2.data import detection_utils as utils, transforms as T
from detectron2.data.transforms.augmentation import AugInput, AugmentationList from detectron2.data.transforms.augmentation import AugInput, AugmentationList
from .build import D2GO_DATA_MAPPER_REGISTRY
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
PREFETCHED_FILE_NAME = "prefetch_image" PREFETCHED_FILE_NAME = "prefetch_image"
......
...@@ -7,12 +7,11 @@ import logging ...@@ -7,12 +7,11 @@ import logging
import numpy as np import numpy as np
import torch import torch
from d2go.data.dataset_mappers.build import D2GO_DATA_MAPPER_REGISTRY
from d2go.data.dataset_mappers.d2go_dataset_mapper import D2GoDatasetMapper from d2go.data.dataset_mappers.d2go_dataset_mapper import D2GoDatasetMapper
from detectron2.data import detection_utils as utils, transforms as T from detectron2.data import detection_utils as utils, transforms as T
from detectron2.structures import BoxMode, Instances, RotatedBoxes from detectron2.structures import BoxMode, Instances, RotatedBoxes
from .build import D2GO_DATA_MAPPER_REGISTRY
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
...@@ -8,15 +8,14 @@ import logging ...@@ -8,15 +8,14 @@ import logging
import os import os
from collections import namedtuple from collections import namedtuple
from d2go.data.extended_coco import coco_text_load, extended_coco_load
from d2go.data.extended_lvis import extended_lvis_load
from d2go.data.keypoint_metadata_registry import get_keypoint_metadata
from d2go.utils.helper import get_dir_path from d2go.utils.helper import get_dir_path
from detectron2.data import DatasetCatalog, MetadataCatalog from detectron2.data import DatasetCatalog, MetadataCatalog
from detectron2.utils.registry import Registry from detectron2.utils.registry import Registry
from mobile_cv.common.misc.oss_utils import fb_overwritable from mobile_cv.common.misc.oss_utils import fb_overwritable
from .extended_coco import coco_text_load, extended_coco_load
from .extended_lvis import extended_lvis_load
from .keypoint_metadata_registry import get_keypoint_metadata
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
...@@ -11,13 +11,12 @@ from collections import defaultdict ...@@ -11,13 +11,12 @@ from collections import defaultdict
from typing import Callable, Dict, List, Optional from typing import Callable, Dict, List, Optional
import detectron2.utils.comm as comm import detectron2.utils.comm as comm
from d2go.data.cache_util import _cache_json_file
from detectron2.data import MetadataCatalog from detectron2.data import MetadataCatalog
from detectron2.structures import BoxMode from detectron2.structures import BoxMode
from detectron2.utils.file_io import PathManager from detectron2.utils.file_io import PathManager
from pycocotools.coco import COCO from pycocotools.coco import COCO
from .cache_util import _cache_json_file
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
import logging import logging
import os import os
from d2go.data.extended_coco import _cache_json_file
from detectron2.data import MetadataCatalog from detectron2.data import MetadataCatalog
from detectron2.structures import BoxMode from detectron2.structures import BoxMode
from fvcore.common.timer import Timer from fvcore.common.timer import Timer
from .extended_coco import _cache_json_file
""" """
This file contains functions to parse LVIS-format annotations into dicts in the This file contains functions to parse LVIS-format annotations into dicts in the
"Detectron2 format". "Detectron2 format".
......
...@@ -3,5 +3,13 @@ ...@@ -3,5 +3,13 @@
# import all modules to make sure Registry works # import all modules to make sure Registry works
# @fb-only: from . import fb # isort:skip # noqa # @fb-only: from d2go.data.transforms import fb # isort:skip # noqa
from . import affine, auto_aug, blur, box_utils, color_yuv, crop, d2_native # noqa from d2go.data.transforms import ( # noqa
affine,
auto_aug,
blur,
box_utils,
color_yuv,
crop,
d2_native,
)
...@@ -9,10 +9,11 @@ from typing import List, Optional, Tuple ...@@ -9,10 +9,11 @@ from typing import List, Optional, Tuple
import cv2 import cv2
import numpy as np import numpy as np
import torchvision.transforms as T import torchvision.transforms as T
from d2go.data.transforms.build import TRANSFORM_OP_REGISTRY
from detectron2.config import CfgNode from detectron2.config import CfgNode
from detectron2.data.transforms import NoOpTransform, Transform, TransformGen
from .build import TRANSFORM_OP_REGISTRY from detectron2.data.transforms.augmentation import TransformGen
from fvcore.transforms.transform import NoOpTransform, Transform
class AffineTransform(Transform): class AffineTransform(Transform):
......
...@@ -7,12 +7,12 @@ from typing import List, Optional, Union ...@@ -7,12 +7,12 @@ from typing import List, Optional, Union
import detectron2.data.transforms.augmentation as aug import detectron2.data.transforms.augmentation as aug
import numpy as np import numpy as np
import torchvision.transforms as tvtf import torchvision.transforms as tvtf
from d2go.data.transforms.build import _json_load, TRANSFORM_OP_REGISTRY
from d2go.data.transforms.tensor import Array2Tensor, Tensor2Array from d2go.data.transforms.tensor import Array2Tensor, Tensor2Array
from detectron2.config import CfgNode from detectron2.config import CfgNode
from fvcore.transforms.transform import Transform from fvcore.transforms.transform import Transform
from .build import _json_load, TRANSFORM_OP_REGISTRY
class ToTensorWrapper: class ToTensorWrapper:
def __init__(self, transform): def __init__(self, transform):
......
...@@ -8,10 +8,10 @@ import cv2 ...@@ -8,10 +8,10 @@ import cv2
import detectron2.data.transforms.augmentation as aug import detectron2.data.transforms.augmentation as aug
import numpy as np import numpy as np
from d2go.data.transforms.build import _json_load, TRANSFORM_OP_REGISTRY
from detectron2.config import CfgNode from detectron2.config import CfgNode
from detectron2.data.transforms import NoOpTransform, Transform
from .build import _json_load, TRANSFORM_OP_REGISTRY from fvcore.transforms.transform import NoOpTransform, Transform
class LocalizedBoxMotionBlurTransform(Transform): class LocalizedBoxMotionBlurTransform(Transform):
......
...@@ -7,12 +7,11 @@ from typing import Any, List, Tuple, Union ...@@ -7,12 +7,11 @@ from typing import Any, List, Tuple, Union
import detectron2.data.transforms.augmentation as aug import detectron2.data.transforms.augmentation as aug
import numpy as np import numpy as np
import torch import torch
from d2go.data.transforms.build import _json_load, TRANSFORM_OP_REGISTRY
from detectron2.config import CfgNode from detectron2.config import CfgNode
from detectron2.data.transforms.transform import Transform from detectron2.data.transforms.transform import Transform
from detectron2.structures.boxes import Boxes from detectron2.structures.boxes import Boxes
from .build import _json_load, TRANSFORM_OP_REGISTRY
def get_box_union(boxes: Boxes): def get_box_union(boxes: Boxes):
"""Merge all boxes into a single box""" """Merge all boxes into a single box"""
......
...@@ -6,13 +6,12 @@ from typing import Callable, List, Union ...@@ -6,13 +6,12 @@ from typing import Callable, List, Union
import detectron2.data.transforms.augmentation as aug import detectron2.data.transforms.augmentation as aug
import numpy as np import numpy as np
from d2go.data.transforms.build import _json_load, TRANSFORM_OP_REGISTRY
from detectron2.config import CfgNode from detectron2.config import CfgNode
from detectron2.data import detection_utils as du from detectron2.data import detection_utils as du
from detectron2.data.transforms.transform import Transform from detectron2.data.transforms.transform import Transform
from fvcore.transforms.transform import BlendTransform from fvcore.transforms.transform import BlendTransform
from .build import _json_load, TRANSFORM_OP_REGISTRY
class InvertibleColorTransform(Transform): class InvertibleColorTransform(Transform):
""" """
......
...@@ -5,16 +5,15 @@ ...@@ -5,16 +5,15 @@
import math import math
from typing import Any, List, Optional, Tuple, Union from typing import Any, List, Optional, Tuple, Union
import d2go.data.transforms.box_utils as bu
import detectron2.data.transforms.augmentation as aug import detectron2.data.transforms.augmentation as aug
import numpy as np import numpy as np
from d2go.data.transforms.build import _json_load, TRANSFORM_OP_REGISTRY
from detectron2.config import CfgNode from detectron2.config import CfgNode
from detectron2.data.transforms import ExtentTransform from detectron2.data.transforms.transform import ExtentTransform
from detectron2.structures import BoxMode from detectron2.structures import BoxMode
from fvcore.transforms.transform import CropTransform, NoOpTransform, Transform from fvcore.transforms.transform import CropTransform, NoOpTransform, Transform
from . import box_utils as bu
from .build import _json_load, TRANSFORM_OP_REGISTRY
class CropBoundary(aug.Augmentation): class CropBoundary(aug.Augmentation):
"""Crop the boundary of the image by `count` pixel on each side""" """Crop the boundary of the image by `count` pixel on each side"""
......
...@@ -6,12 +6,11 @@ import logging ...@@ -6,12 +6,11 @@ import logging
from typing import List, Optional, Union from typing import List, Optional, Union
import detectron2.data.transforms.augmentation as aug import detectron2.data.transforms.augmentation as aug
from d2go.data.transforms.build import _json_load, TRANSFORM_OP_REGISTRY
from detectron2.config import CfgNode from detectron2.config import CfgNode
from detectron2.data import transforms as d2T from detectron2.data import transforms as d2T
from detectron2.projects.point_rend import ColorAugSSDTransform from detectron2.projects.point_rend import ColorAugSSDTransform
from .build import _json_load, TRANSFORM_OP_REGISTRY
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# 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 # noqa # @fb-only: from d2go.evaluation import fb # noqa
from .prediction_count_evaluation import PredictionCountEvaluator # noqa from d2go.evaluation.prediction_count_evaluation import PredictionCountEvaluator # noqa
__all__ = [k for k in globals().keys() if not k.startswith("_")] __all__ = [k for k in globals().keys() if not k.startswith("_")]
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
# enable registry # enable registry
from . import torchscript # noqa from d2go.export import torchscript # noqa
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
# NOTE: making necessary imports to register with Registery # NOTE: making necessary imports to register with Registery
from . import backbone, meta_arch, modeldef # noqa # noqa # noqa from d2go.modeling import backbone, meta_arch, modeldef # noqa # noqa # noqa
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