"docker/vscode:/vscode.git/clone" did not exist on "29e7a1e1834f331a4916853ecd58549ed78235d6"
Unverified Commit 633e5e89 authored by Arthur's avatar Arthur Committed by GitHub
Browse files

[Refactor] Relative imports wherever we can (#21880)

* initial commit

* update

* second batch

* style

* fix imports

* fix relative import on pipeline
parent 43299c63
...@@ -18,9 +18,6 @@ from typing import Dict, List, Optional, Union ...@@ -18,9 +18,6 @@ from typing import Dict, List, Optional, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import center_crop, normalize, rescale, resize, to_channel_dimension_format from ...image_transforms import center_crop, normalize, rescale, resize, to_channel_dimension_format
from ...image_utils import ( from ...image_utils import (
...@@ -33,7 +30,7 @@ from ...image_utils import ( ...@@ -33,7 +30,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, is_vision_available, logging
if is_vision_available(): if is_vision_available():
......
...@@ -22,8 +22,8 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Un ...@@ -22,8 +22,8 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Un
import numpy as np import numpy as np
from transformers.image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from transformers.image_transforms import ( from ...image_transforms import (
PaddingMode, PaddingMode,
center_to_corners_format, center_to_corners_format,
corners_to_center_format, corners_to_center_format,
...@@ -35,7 +35,7 @@ from transformers.image_transforms import ( ...@@ -35,7 +35,7 @@ from transformers.image_transforms import (
rgb_to_id, rgb_to_id,
to_channel_dimension_format, to_channel_dimension_format,
) )
from transformers.image_utils import ( from ...image_utils import (
IMAGENET_DEFAULT_MEAN, IMAGENET_DEFAULT_MEAN,
IMAGENET_DEFAULT_STD, IMAGENET_DEFAULT_STD,
ChannelDimension, ChannelDimension,
...@@ -49,7 +49,9 @@ from transformers.image_utils import ( ...@@ -49,7 +49,9 @@ from transformers.image_utils import (
valid_coco_panoptic_annotations, valid_coco_panoptic_annotations,
valid_images, valid_images,
) )
from transformers.utils import ( from ...utils import (
ExplicitEnum,
TensorType,
is_flax_available, is_flax_available,
is_jax_tensor, is_jax_tensor,
is_scipy_available, is_scipy_available,
...@@ -59,7 +61,6 @@ from transformers.utils import ( ...@@ -59,7 +61,6 @@ from transformers.utils import (
is_torch_tensor, is_torch_tensor,
is_vision_available, is_vision_available,
) )
from transformers.utils.generic import ExplicitEnum, TensorType
if is_torch_available(): if is_torch_available():
......
...@@ -27,9 +27,8 @@ import torch ...@@ -27,9 +27,8 @@ import torch
from torch import nn from torch import nn
from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss
from transformers.configuration_utils import PretrainedConfig
from ...activations import get_activation from ...activations import get_activation
from ...configuration_utils import PretrainedConfig
from ...deepspeed import is_deepspeed_zero3_enabled from ...deepspeed import is_deepspeed_zero3_enabled
from ...modeling_outputs import ( from ...modeling_outputs import (
BaseModelOutput, BaseModelOutput,
......
...@@ -19,9 +19,6 @@ from typing import Dict, Iterable, List, Optional, Tuple, Union ...@@ -19,9 +19,6 @@ from typing import Dict, Iterable, List, Optional, Tuple, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import normalize, rescale, resize, to_channel_dimension_format from ...image_transforms import normalize, rescale, resize, to_channel_dimension_format
from ...image_utils import ( from ...image_utils import (
...@@ -37,7 +34,7 @@ from ...image_utils import ( ...@@ -37,7 +34,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, is_vision_available, logging
if is_torch_available(): if is_torch_available():
......
...@@ -18,8 +18,6 @@ from typing import Dict, List, Optional, Union ...@@ -18,8 +18,6 @@ from typing import Dict, List, Optional, Union
import numpy as np import numpy as np
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import ( from ...image_transforms import (
center_crop, center_crop,
...@@ -39,7 +37,7 @@ from ...image_utils import ( ...@@ -39,7 +37,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, logging
logger = logging.get_logger(__name__) logger = logging.get_logger(__name__)
......
...@@ -18,9 +18,6 @@ from typing import Dict, List, Optional, Union ...@@ -18,9 +18,6 @@ from typing import Dict, List, Optional, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import center_crop, normalize, rescale, resize, to_channel_dimension_format from ...image_transforms import center_crop, normalize, rescale, resize, to_channel_dimension_format
from ...image_utils import ( from ...image_utils import (
...@@ -33,7 +30,7 @@ from ...image_utils import ( ...@@ -33,7 +30,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, is_vision_available, logging
if is_vision_available(): if is_vision_available():
......
...@@ -21,9 +21,6 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple, Union ...@@ -21,9 +21,6 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import center_crop, normalize, rescale, resize, to_channel_dimension_format from ...image_transforms import center_crop, normalize, rescale, resize, to_channel_dimension_format
from ...image_utils import ( from ...image_utils import (
...@@ -36,7 +33,7 @@ from ...image_utils import ( ...@@ -36,7 +33,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, is_vision_available, logging
if is_vision_available(): if is_vision_available():
......
...@@ -24,13 +24,12 @@ import torch ...@@ -24,13 +24,12 @@ import torch
import torch.utils.checkpoint import torch.utils.checkpoint
from torch import nn from torch import nn
from transformers.utils.doc import add_code_sample_docstrings
from ...activations import ACT2FN from ...activations import ACT2FN
from ...modeling_outputs import BaseModelOutput, BaseModelOutputWithPooling from ...modeling_outputs import BaseModelOutput, BaseModelOutputWithPooling
from ...modeling_utils import PreTrainedModel, find_pruneable_heads_and_indices, prune_linear_layer from ...modeling_utils import PreTrainedModel, find_pruneable_heads_and_indices, prune_linear_layer
from ...utils import ( from ...utils import (
ModelOutput, ModelOutput,
add_code_sample_docstrings,
add_start_docstrings, add_start_docstrings,
add_start_docstrings_to_model_forward, add_start_docstrings_to_model_forward,
logging, logging,
......
...@@ -19,13 +19,17 @@ from typing import List, Optional, Union ...@@ -19,13 +19,17 @@ from typing import List, Optional, Union
import numpy as np import numpy as np
import PIL.Image import PIL.Image
from transformers.image_utils import PILImageResampling
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature from ...image_processing_utils import BaseImageProcessor, BatchFeature
from ...image_transforms import rescale, resize, to_channel_dimension_format from ...image_transforms import rescale, resize, to_channel_dimension_format
from ...image_utils import ChannelDimension, get_image_size, make_list_of_images, to_numpy_array, valid_images from ...image_utils import (
from ...utils import logging ChannelDimension,
PILImageResampling,
get_image_size,
make_list_of_images,
to_numpy_array,
valid_images,
)
from ...utils import TensorType, logging
logger = logging.get_logger(__name__) logger = logging.get_logger(__name__)
......
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
from collections import OrderedDict from collections import OrderedDict
from typing import Any, List, Mapping, Optional from typing import Any, List, Mapping, Optional
from transformers import PreTrainedTokenizer, TensorType, is_torch_available from ... import PreTrainedTokenizer, TensorType, is_torch_available
from ...configuration_utils import PretrainedConfig from ...configuration_utils import PretrainedConfig
from ...onnx import OnnxConfigWithPast, PatchingSpec from ...onnx import OnnxConfigWithPast, PatchingSpec
from ...utils import logging from ...utils import logging
......
...@@ -23,9 +23,8 @@ import torch.utils.checkpoint ...@@ -23,9 +23,8 @@ import torch.utils.checkpoint
from torch import nn from torch import nn
from torch.nn import CrossEntropyLoss from torch.nn import CrossEntropyLoss
from transformers.deepspeed import is_deepspeed_zero3_enabled
from ...activations import ACT2FN from ...activations import ACT2FN
from ...deepspeed import is_deepspeed_zero3_enabled
from ...modeling_outputs import BaseModelOutput, CausalLMOutput, SequenceClassifierOutput from ...modeling_outputs import BaseModelOutput, CausalLMOutput, SequenceClassifierOutput
from ...modeling_utils import PreTrainedModel from ...modeling_utils import PreTrainedModel
from ...pytorch_utils import torch_int_div from ...pytorch_utils import torch_int_div
......
...@@ -18,9 +18,8 @@ ...@@ -18,9 +18,8 @@
from collections import OrderedDict from collections import OrderedDict
from typing import Mapping from typing import Mapping
from transformers.onnx import OnnxConfig
from ...configuration_utils import PretrainedConfig from ...configuration_utils import PretrainedConfig
from ...onnx import OnnxConfig
from ...utils import logging from ...utils import logging
......
...@@ -18,9 +18,6 @@ from typing import Dict, List, Optional, Union ...@@ -18,9 +18,6 @@ from typing import Dict, List, Optional, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import rescale, resize, to_channel_dimension_format from ...image_transforms import rescale, resize, to_channel_dimension_format
from ...image_utils import ( from ...image_utils import (
...@@ -31,7 +28,7 @@ from ...image_utils import ( ...@@ -31,7 +28,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, is_vision_available, logging
if is_vision_available(): if is_vision_available():
......
...@@ -25,11 +25,10 @@ from typing import Any, Dict, List, Optional, Tuple, Union ...@@ -25,11 +25,10 @@ from typing import Any, Dict, List, Optional, Tuple, Union
import numpy as np import numpy as np
import regex import regex
from transformers.utils.generic import _is_jax, _is_numpy
from ...tokenization_utils import AddedToken, PreTrainedTokenizer from ...tokenization_utils import AddedToken, PreTrainedTokenizer
from ...tokenization_utils_base import BatchEncoding from ...tokenization_utils_base import BatchEncoding
from ...utils import TensorType, is_flax_available, is_tf_available, is_torch_available, logging from ...utils import TensorType, is_flax_available, is_tf_available, is_torch_available, logging
from ...utils.generic import _is_jax, _is_numpy
logger = logging.get_logger(__name__) logger = logging.get_logger(__name__)
......
...@@ -16,11 +16,9 @@ ...@@ -16,11 +16,9 @@
from collections import OrderedDict from collections import OrderedDict
from typing import Any, List, Mapping, Optional from typing import Any, List, Mapping, Optional
from transformers import PretrainedConfig, PreTrainedTokenizer, TensorType from ... import PretrainedConfig, PreTrainedTokenizer
from ... import is_torch_available
from ...onnx import OnnxConfig, PatchingSpec from ...onnx import OnnxConfig, PatchingSpec
from ...utils import logging from ...utils import TensorType, is_torch_available, logging
logger = logging.get_logger(__name__) logger = logging.get_logger(__name__)
......
...@@ -18,9 +18,6 @@ from typing import Dict, Optional, Union ...@@ -18,9 +18,6 @@ from typing import Dict, Optional, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import resize, to_channel_dimension_format, to_pil_image from ...image_transforms import resize, to_channel_dimension_format, to_pil_image
from ...image_utils import ( from ...image_utils import (
...@@ -32,7 +29,7 @@ from ...image_utils import ( ...@@ -32,7 +29,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import is_pytesseract_available, logging, requires_backends from ...utils import TensorType, is_pytesseract_available, is_vision_available, logging, requires_backends
if is_vision_available(): if is_vision_available():
......
...@@ -18,9 +18,6 @@ from typing import Dict, Iterable, Optional, Union ...@@ -18,9 +18,6 @@ from typing import Dict, Iterable, Optional, Union
import numpy as np import numpy as np
from transformers.utils import is_vision_available
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import normalize, rescale, resize, to_channel_dimension_format, to_pil_image from ...image_transforms import normalize, rescale, resize, to_channel_dimension_format, to_pil_image
from ...image_utils import ( from ...image_utils import (
...@@ -34,7 +31,7 @@ from ...image_utils import ( ...@@ -34,7 +31,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import is_pytesseract_available, logging, requires_backends from ...utils import TensorType, is_pytesseract_available, is_vision_available, logging, requires_backends
if is_vision_available(): if is_vision_available():
......
...@@ -24,18 +24,16 @@ import torch.nn.functional as F ...@@ -24,18 +24,16 @@ import torch.nn.functional as F
import torch.utils.checkpoint import torch.utils.checkpoint
from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss from torch.nn import BCEWithLogitsLoss, CrossEntropyLoss, MSELoss
from transformers import apply_chunking_to_forward from ...activations import ACT2FN
from transformers.modeling_outputs import ( from ...modeling_outputs import (
BaseModelOutput, BaseModelOutput,
QuestionAnsweringModelOutput, QuestionAnsweringModelOutput,
SequenceClassifierOutput, SequenceClassifierOutput,
TokenClassifierOutput, TokenClassifierOutput,
) )
from transformers.modeling_utils import PreTrainedModel from ...modeling_utils import PreTrainedModel
from transformers.utils import logging from ...pytorch_utils import apply_chunking_to_forward
from ...utils import add_start_docstrings, add_start_docstrings_to_model_forward, logging, replace_return_docstrings
from ...activations import ACT2FN
from ...utils import add_start_docstrings, add_start_docstrings_to_model_forward, replace_return_docstrings
from .configuration_layoutlmv3 import LayoutLMv3Config from .configuration_layoutlmv3 import LayoutLMv3Config
......
...@@ -18,8 +18,6 @@ from typing import Dict, Iterable, List, Optional, Union ...@@ -18,8 +18,6 @@ from typing import Dict, Iterable, List, Optional, Union
import numpy as np import numpy as np
from transformers.utils.generic import TensorType
from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict from ...image_processing_utils import BaseImageProcessor, BatchFeature, get_size_dict
from ...image_transforms import ( from ...image_transforms import (
center_crop, center_crop,
...@@ -39,7 +37,7 @@ from ...image_utils import ( ...@@ -39,7 +37,7 @@ from ...image_utils import (
to_numpy_array, to_numpy_array,
valid_images, valid_images,
) )
from ...utils import logging from ...utils import TensorType, logging
logger = logging.get_logger(__name__) logger = logging.get_logger(__name__)
......
...@@ -23,8 +23,6 @@ from typing import Dict, Optional, Tuple, Union ...@@ -23,8 +23,6 @@ from typing import Dict, Optional, Tuple, Union
import numpy as np import numpy as np
import tensorflow as tf import tensorflow as tf
from transformers.tf_utils import stable_softmax
from ...activations_tf import get_tf_activation from ...activations_tf import get_tf_activation
from ...modeling_tf_utils import ( from ...modeling_tf_utils import (
TFModelInputType, TFModelInputType,
...@@ -34,6 +32,7 @@ from ...modeling_tf_utils import ( ...@@ -34,6 +32,7 @@ from ...modeling_tf_utils import (
shape_list, shape_list,
unpack_inputs, unpack_inputs,
) )
from ...tf_utils import stable_softmax
from ...utils import ( from ...utils import (
ModelOutput, ModelOutput,
add_code_sample_docstrings, add_code_sample_docstrings,
......
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