"git@developer.sourcefind.cn:OpenDAS/torchaudio.git" did not exist on "937d52f87de157aec6fbd5bccde962b468201ebb"
Commit 217bbabd authored by Miquel Jubert Hermoso's avatar Miquel Jubert Hermoso Committed by Facebook GitHub Bot
Browse files

Make OSS helper fb_overwrite into separate file and independent of other components

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

Reviewed By: wat3rBro

Differential Revision: D35928340

fbshipit-source-id: de740101e8bed9d1df84bbed438ea3611d2eb015
parent b3a9204c
...@@ -12,7 +12,7 @@ import torch ...@@ -12,7 +12,7 @@ import torch
from d2go.config import CfgNode from d2go.config import CfgNode
from d2go.data.dataset_mappers import build_dataset_mapper from d2go.data.dataset_mappers import build_dataset_mapper
from d2go.data.utils import ClipLengthGroupedDataset from d2go.data.utils import ClipLengthGroupedDataset
from d2go.utils.misc import fb_overwritable from d2go.utils.oss_helper import fb_overwritable
from detectron2.data import ( from detectron2.data import (
build_batch_data_loader, build_batch_data_loader,
build_detection_train_loader, build_detection_train_loader,
......
...@@ -9,7 +9,7 @@ import os ...@@ -9,7 +9,7 @@ import os
from collections import namedtuple from collections import namedtuple
from d2go.utils.helper import get_dir_path from d2go.utils.helper import get_dir_path
from d2go.utils.misc import fb_overwritable from d2go.utils.oss_helper import fb_overwritable
from detectron2.data import DatasetCatalog, MetadataCatalog from detectron2.data import DatasetCatalog, MetadataCatalog
from detectron2.utils.registry import Registry from detectron2.utils.registry import Registry
......
...@@ -8,11 +8,11 @@ import warnings ...@@ -8,11 +8,11 @@ import warnings
from contextlib import contextmanager from contextlib import contextmanager
from typing import Dict, Iterator from typing import Dict, Iterator
# @manual=//vision/fair/detectron2/detectron2:detectron2
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 detectron2.utils.file_io import PathManager from detectron2.utils.file_io import PathManager
from mobile_cv.common.misc.py import dynamic_import
from tabulate import tabulate from tabulate import tabulate
from .tensorboard_log_util import get_tensorboard_log_dir # noqa: forwarding from .tensorboard_log_util import get_tensorboard_log_dir # noqa: forwarding
...@@ -112,24 +112,3 @@ def _log_api_usage(identifier: str): ...@@ -112,24 +112,3 @@ def _log_api_usage(identifier: str):
inside facebook's infra. inside facebook's infra.
""" """
torch._C._log_api_usage_once("d2go." + identifier) torch._C._log_api_usage_once("d2go." + identifier)
def fb_overwritable():
"""Decorator on function that has alternative internal implementation"""
try:
import d2go.infra.fb # NOQA
is_oss = False
except ImportError:
is_oss = True
def deco(oss_func):
if is_oss:
return oss_func
else:
oss_module = oss_func.__module__
fb_module = oss_module + "_fb" # xxx.py -> xxx_fb.py
fb_func = dynamic_import("{}.{}".format(fb_module, oss_func.__name__))
return fb_func
return deco
#!/usr/bin/env python3
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
from mobile_cv.common.misc.py import dynamic_import
def fb_overwritable():
"""Decorator on function that has alternative internal implementation"""
try:
import d2go.utils.fb.open_source_canary # noqa
is_oss = False
except ImportError:
is_oss = True
def deco(oss_func):
if is_oss:
return oss_func
else:
oss_module = oss_func.__module__
fb_module = oss_module + "_fb" # xxx.py -> xxx_fb.py
fb_func = dynamic_import("{}.{}".format(fb_module, oss_func.__name__))
return fb_func
return deco
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