diff --git a/src/transformers/__init__.py b/src/transformers/__init__.py index 1c88b0bcee5c..cd5852924ee0 100644 --- a/src/transformers/__init__.py +++ b/src/transformers/__init__.py @@ -1431,7 +1431,6 @@ "WhisperTimeStampLogitsProcessor", ] ) - _import_structure["generation_utils"] = [] _import_structure["modeling_outputs"] = [] _import_structure["modeling_utils"] = ["PreTrainedModel"] @@ -3869,7 +3868,6 @@ "TFTopPLogitsWarper", ] ) - _import_structure["generation_tf_utils"] = [] _import_structure["keras_callbacks"] = ["KerasMetricCallback", "PushToHubCallback"] _import_structure["modeling_tf_outputs"] = [] _import_structure["modeling_tf_utils"] = [ @@ -4636,7 +4634,6 @@ "FlaxWhisperTimeStampLogitsProcessor", ] ) - _import_structure["generation_flax_utils"] = [] _import_structure["modeling_flax_outputs"] = [] _import_structure["modeling_flax_utils"] = ["FlaxPreTrainedModel"] _import_structure["models.albert"].extend( diff --git a/src/transformers/generation_flax_utils.py b/src/transformers/generation_flax_utils.py deleted file mode 100644 index 6e96a1ac5ad2..000000000000 --- a/src/transformers/generation_flax_utils.py +++ /dev/null @@ -1,28 +0,0 @@ -# coding=utf-8 -# Copyright 2021 The Google AI Flax Team Authors, and The HuggingFace Inc. team. -# Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import warnings - -from .generation import FlaxGenerationMixin - - -class FlaxGenerationMixin(FlaxGenerationMixin): - # warning at import time - warnings.warn( - "Importing `FlaxGenerationMixin` from `src/transformers/generation_flax_utils.py` is deprecated and will " - "be removed in Transformers v4.40. Import as `from transformers import FlaxGenerationMixin` instead.", - FutureWarning, - ) diff --git a/src/transformers/generation_tf_utils.py b/src/transformers/generation_tf_utils.py deleted file mode 100644 index cf7cb2e32047..000000000000 --- a/src/transformers/generation_tf_utils.py +++ /dev/null @@ -1,28 +0,0 @@ -# coding=utf-8 -# Copyright 2018 The Google AI Language Team Authors and The HuggingFace Inc. team. -# Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import warnings - -from .generation import TFGenerationMixin - - -class TFGenerationMixin(TFGenerationMixin): - # warning at import time - warnings.warn( - "Importing `TFGenerationMixin` from `src/transformers/generation_tf_utils.py` is deprecated and will " - "be removed in Transformers v4.40. Import as `from transformers import TFGenerationMixin` instead.", - FutureWarning, - ) diff --git a/src/transformers/generation_utils.py b/src/transformers/generation_utils.py deleted file mode 100644 index cc269ee77b05..000000000000 --- a/src/transformers/generation_utils.py +++ /dev/null @@ -1,28 +0,0 @@ -# coding=utf-8 -# Copyright 2020 The Google AI Language Team Authors, Facebook AI Research authors and The HuggingFace Inc. team. -# Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import warnings - -from .generation import GenerationMixin - - -class GenerationMixin(GenerationMixin): - # warning at import time - warnings.warn( - "Importing `GenerationMixin` from `src/transformers/generation_utils.py` is deprecated and will " - "be removed in Transformers v4.40. Import as `from transformers import GenerationMixin` instead.", - FutureWarning, - )