Skip to content

TF: future proof our keras imports #20317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gante merged 2 commits into from
Nov 18, 2022
Merged

TF: future proof our keras imports #20317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
544610c
future proof our tf code
gante Nov 18, 2022
600d561
parse tf versions
gante Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/transformers/modeling_tf_pytorch_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,13 @@ def load_pytorch_state_dict_in_tf2_model(
tf_model, pt_state_dict, tf_inputs=None, allow_missing_keys=False, output_loading_info=False
):
"""Load a pytorch state_dict in a TF 2.0 model."""
from tensorflow.python.keras import backend as K
import tensorflow as tf
from packaging.version import parse

if parse(tf.__version__) >= parse("2.11.0"):
from keras import backend as K
else:
from tensorflow.python.keras import backend as K

if tf_inputs is None:
tf_inputs = tf_model.dummy_inputs
Expand Down
20 changes: 14 additions & 6 deletions src/transformers/modeling_tf_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,9 @@
import h5py
import numpy as np
import tensorflow as tf
from tensorflow.python.keras import backend as K
from tensorflow.python.keras.engine import data_adapter
from tensorflow.python.keras.engine.keras_tensor import KerasTensor
from tensorflow.python.keras.saving import hdf5_format
from packaging.version import parse

from huggingface_hub import Repository, list_repo_files
from keras.saving.hdf5_format import save_attributes_to_hdf5_group
from transformers.utils.hub import convert_file_size_to_int, get_checkpoint_shard_files

from . import DataCollatorWithPadding, DefaultDataCollator
Expand Down Expand Up @@ -68,6 +64,18 @@
)


if parse(tf.__version__) >= parse("2.11.0"):
from keras import backend as K
from keras.engine import data_adapter
from keras.engine.keras_tensor import KerasTensor
from keras.saving.legacy import hdf5_format
else:
from tensorflow.python.keras import backend as K
from tensorflow.python.keras.engine import data_adapter
from tensorflow.python.keras.engine.keras_tensor import KerasTensor
from tensorflow.python.keras.saving import hdf5_format


if is_safetensors_available():
from safetensors import safe_open
from safetensors.tensorflow import load_file as safe_load_file
Expand Down Expand Up @@ -2310,7 +2318,7 @@ def save_pretrained(
)
param_dset[:] = layer.numpy()
layers.append(layer_name.encode("utf8"))
save_attributes_to_hdf5_group(shard_file, "layer_names", layers)
hdf5_format.save_attributes_to_hdf5_group(shard_file, "layer_names", layers)

if push_to_hub:
self._upload_modified_files(
Expand Down