Skip to content

Changes external references to keras.utils.serialize_keras_object/deserialize_keras_object to legacy serialization API in preparation for switching all of Keras to new serialization format. #1036

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes external references to keras.utils.serialize_keras_object/deserialize_keras_object to legacy serialization API in preparation for switching all of Keras to new serialization format. #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...zation/python/core/quantization/keras/default_8bit/default_8bit_quantize_registry_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
K = tf.keras.backend
l = tf.keras.layers

deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object


class _TestHelper(object):
Expand Down
4 changes: 2 additions & 2 deletions ...ore/quantization/keras/experimental/default_n_bit/default_n_bit_quantize_registry_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
K = tf.keras.backend
l = tf.keras.layers

deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object


class _TestHelper(object):
Expand Down
12 changes: 7 additions & 5 deletions tensorflow_model_optimization/python/core/quantization/keras/quantize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ def _wrap_fixed_range(
'init_min': init_min,
'init_max': init_max,
'narrow_range': narrow_range})
return tf.keras.utils.serialize_keras_object(config)
return tf.keras.utils.legacy.serialize_keras_object(config)


def _is_serialized_node_data(nested):
Expand Down Expand Up @@ -601,8 +601,9 @@ def fix_input_output_range(
init_min=input_min,
init_max=input_max,
narrow_range=narrow_range)
serialized_fixed_input_quantizer = tf.keras.utils.serialize_keras_object(
fixed_input_quantizer)
serialized_fixed_input_quantizer = (
tf.keras.utils.legacy.serialize_keras_object(fixed_input_quantizer)
)

if _is_functional_model(model):
input_layer_list = _nested_to_flatten_node_data_list(config['input_layers'])
Expand Down Expand Up @@ -685,8 +686,9 @@ def remove_input_range(model):
"""
config = model.get_config()
no_input_quantizer = quantizers.NoQuantizer()
serialized_input_quantizer = tf.keras.utils.serialize_keras_object(
no_input_quantizer)
serialized_input_quantizer = tf.keras.utils.legacy.serialize_keras_object(
no_input_quantizer
)

if _is_functional_model(model):
input_layer_list = _nested_to_flatten_node_data_list(config['input_layers'])
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_model_optimization/python/core/quantization/keras/quantize_annotate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

import tensorflow as tf

deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object


class QuantizeAnnotate(tf.keras.layers.Wrapper):
Expand Down
4 changes: 2 additions & 2 deletions ...rflow_model_optimization/python/core/quantization/keras/quantize_aware_activation_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
keras = tf.keras
activations = tf.keras.activations
K = tf.keras.backend
deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object

QuantizeAwareActivation = quantize_aware_activation.QuantizeAwareActivation
MovingAverageQuantizer = quantizers.MovingAverageQuantizer
Expand Down
9 changes: 6 additions & 3 deletions tensorflow_model_optimization/python/core/quantization/keras/quantize_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,16 @@ def get_output_quantizers(self, layer):

def get_config(self):
return {
'config': tf.keras.utils.serialize_keras_object(self.config),
'config': tf.keras.utils.legacy.serialize_keras_object(self.config),
'num_bits': self.num_bits,
'init_min': self.init_min,
'init_max': self.init_max,
'narrow_range': self.narrow_range}
'narrow_range': self.narrow_range,
}

@classmethod
def from_config(cls, config):
config['config'] = tf.keras.utils.deserialize_keras_object(config['config'])
config['config'] = tf.keras.utils.legacy.deserialize_keras_object(
config['config']
)
return cls(**config)
4 changes: 2 additions & 2 deletions tensorflow_model_optimization/python/core/quantization/keras/quantize_layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

from tensorflow_model_optimization.python.core.quantization.keras import quantizers

serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object


class QuantizeLayer(tf.keras.layers.Layer):
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_model_optimization/python/core/quantization/keras/quantize_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
from tensorflow_model_optimization.python.core.keras import utils
from tensorflow_model_optimization.python.core.quantization.keras import quantize_aware_activation

deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object


class QuantizeWrapper(tf.keras.layers.Wrapper):
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_model_optimization/python/core/quantization/keras/quantizers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
from tensorflow_model_optimization.python.core.keras import compat
from tensorflow_model_optimization.python.core.quantization.keras import quantizers

deserialize_keras_object = tf.keras.utils.deserialize_keras_object
serialize_keras_object = tf.keras.utils.serialize_keras_object
deserialize_keras_object = tf.keras.utils.legacy.deserialize_keras_object
serialize_keras_object = tf.keras.utils.legacy.serialize_keras_object


@parameterized.parameters(
Expand Down
14 changes: 8 additions & 6 deletions tensorflow_model_optimization/python/core/sparsity/keras/pruning_schedule_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,13 @@ def testSerializeDeserialize(self):
sparsity = pruning_schedule.ConstantSparsity(0.7, 10, 20, 10)

config = sparsity.get_config()
sparsity_deserialized = tf.keras.utils.deserialize_keras_object(
sparsity_deserialized = tf.keras.utils.legacy.deserialize_keras_object(
config,
custom_objects={
'ConstantSparsity': pruning_schedule.ConstantSparsity,
'PolynomialDecay': pruning_schedule.PolynomialDecay
})
'PolynomialDecay': pruning_schedule.PolynomialDecay,
},
)

self.assertEqual(sparsity.__dict__, sparsity_deserialized.__dict__)

Expand Down Expand Up @@ -278,12 +279,13 @@ def testSerializeDeserialize(self):
sparsity = pruning_schedule.PolynomialDecay(0.2, 0.6, 10, 20, 5, 10)

config = sparsity.get_config()
sparsity_deserialized = tf.keras.utils.deserialize_keras_object(
sparsity_deserialized = tf.keras.utils.legacy.deserialize_keras_object(
config,
custom_objects={
'ConstantSparsity': pruning_schedule.ConstantSparsity,
'PolynomialDecay': pruning_schedule.PolynomialDecay
})
'PolynomialDecay': pruning_schedule.PolynomialDecay,
},
)

self.assertEqual(sparsity.__dict__, sparsity_deserialized.__dict__)

Expand Down
2 changes: 1 addition & 1 deletion tensorflow_model_optimization/python/core/sparsity/keras/pruning_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def from_config(cls, config):
config = config.copy()

pruning_schedule = config.pop('pruning_schedule')
deserialize_keras_object = keras.utils.deserialize_keras_object # pylint: disable=g-import-not-at-top
deserialize_keras_object = keras.utils.legacy.deserialize_keras_object # pylint: disable=g-import-not-at-top
# TODO(pulkitb): This should ideally be fetched from pruning_schedule,
# which should maintain a list of all the pruning_schedules.
custom_objects = {
Expand Down