Skip to content
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

Jump to bottom

Switches Keras object serialization to new logic and changes public API for deserialize_keras_object/serialize_keras_object to the new functions. #1016

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

Switches Keras object serialization to new logic and changes public API for deserialize_keras_object/serialize_keras_object to the new functions. #1016

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 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 @@ -366,7 +366,6 @@ def testSerialization(self):

quantize_config_from_config = deserialize_keras_object(
serialized_quantize_config,
module_objects=globals(),
custom_objects=default_8bit_quantize_registry._types_dict())

self.assertEqual(quantize_config, quantize_config_from_config)
Expand Down Expand Up @@ -482,7 +481,6 @@ def testSerialization(self):

quantize_config_from_config = deserialize_keras_object(
serialized_quantize_config,
module_objects=globals(),
custom_objects=default_8bit_quantize_registry._types_dict())

self.assertEqual(self.quantize_config, quantize_config_from_config)
Expand Down
8 changes: 2 additions & 6 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 @@ -372,9 +372,7 @@ def testSerialization(self):
self.assertEqual(expected_config, serialized_quantize_config)

quantize_config_from_config = deserialize_keras_object(
serialized_quantize_config,
module_objects=globals(),
custom_objects=n_bit_registry._types_dict())
serialized_quantize_config, custom_objects=n_bit_registry._types_dict())

self.assertEqual(quantize_config, quantize_config_from_config)

Expand Down Expand Up @@ -491,9 +489,7 @@ def testSerialization(self):
self.assertEqual(expected_config, serialized_quantize_config)

quantize_config_from_config = deserialize_keras_object(
serialized_quantize_config,
module_objects=globals(),
custom_objects=n_bit_registry._types_dict())
serialized_quantize_config, custom_objects=n_bit_registry._types_dict())

self.assertEqual(self.quantize_config, quantize_config_from_config)

Expand Down
4 changes: 1 addition & 3 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 @@ -108,9 +108,7 @@ def from_config(cls, config):
config = config.copy()

quantize_config = deserialize_keras_object(
config.pop('quantize_config'),
module_objects=globals(),
custom_objects=None)
config.pop('quantize_config'), custom_objects=None)

layer = tf.keras.layers.deserialize(config.pop('layer'))

Expand Down
4 changes: 1 addition & 3 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 @@ -93,8 +93,6 @@ def from_config(cls, config):

# Deserialization code should ensure Quantizer is in keras scope.
quantizer = deserialize_keras_object(
config.pop('quantizer'),
module_objects=globals(),
custom_objects=None)
config.pop('quantizer'), custom_objects=None)

return cls(quantizer=quantizer, **config)
4 changes: 1 addition & 3 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 @@ -197,9 +197,7 @@ def from_config(cls, config):
# The deserialization code should ensure the QuantizeConfig is in keras
# serialization scope.
quantize_config = deserialize_keras_object(
config.pop('quantize_config'),
module_objects=globals(),
custom_objects=None)
config.pop('quantize_config'), custom_objects=None)

layer = tf.keras.layers.deserialize(config.pop('layer'))

Expand Down
4 changes: 1 addition & 3 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 @@ -97,9 +97,7 @@ def testSerialization(self, quantizer_type):
self.assertEqual(expected_config, serialized_quantizer)

quantizer_from_config = deserialize_keras_object(
serialized_quantizer,
module_objects=globals(),
custom_objects=quantizers._types_dict())
serialized_quantizer, custom_objects=quantizers._types_dict())

self.assertEqual(quantizer, quantizer_from_config)

Expand Down
4 changes: 1 addition & 3 deletions 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 @@ -324,9 +324,7 @@ def from_config(cls, config):
'PolynomialDecay': pruning_sched.PolynomialDecay
}
config['pruning_schedule'] = deserialize_keras_object(
pruning_schedule,
module_objects=globals(),
custom_objects=custom_objects)
pruning_schedule, custom_objects=custom_objects)

layer = keras.layers.deserialize(config.pop('layer'))
config['layer'] = layer
Expand Down