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

Fix object_registration_test. #787

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Fix object_registration_test. #787

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
48 changes: 28 additions & 20 deletions tf_keras/saving/object_registration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,30 +58,24 @@ def __init__(self, value):
def get_config(self):
return {"value": self._value}

@classmethod
def from_config(cls, config):
return cls(**config)

serialized_name = "Custom>TestClass"
inst = TestClass(value=10)
class_name = object_registration._GLOBAL_CUSTOM_NAMES[TestClass]
self.assertEqual(serialized_name, class_name)
config = serialization_lib.serialize_keras_object(inst)
self.assertEqual(class_name, config["class_name"])
if tf.__internal__.tf2.enabled():
self.assertEqual(class_name, config["registered_name"])
else:
self.assertEqual(class_name, config["class_name"])
new_inst = serialization_lib.deserialize_keras_object(config)
self.assertIsNot(inst, new_inst)
self.assertIsInstance(new_inst, TestClass)
self.assertEqual(10, new_inst._value)

# Make sure registering a new class with same name will fail.
with self.assertRaisesRegex(
ValueError, ".*has already been registered.*"
):

@object_registration.register_keras_serializable()
class TestClass:
def __init__(self, value):
self._value = value

def get_config(self):
return {"value": self._value}

def test_serialize_custom_class_with_custom_name(self):
@object_registration.register_keras_serializable(
"TestPackage", "CustomName"
Expand All @@ -93,6 +87,10 @@ def __init__(self, val):
def get_config(self):
return {"val": self._val}

@classmethod
def from_config(cls, config):
return cls(**config)

serialized_name = "TestPackage>CustomName"
inst = OtherTestClass(val=5)
class_name = object_registration._GLOBAL_CUSTOM_NAMES[OtherTestClass]
Expand All @@ -103,9 +101,12 @@ def get_config(self):
cls = object_registration.get_registered_object(fn_class_name)
self.assertEqual(OtherTestClass, cls)

config = keras.utils.serialization.serialize_keras_object(inst)
self.assertEqual(class_name, config["class_name"])
new_inst = keras.utils.serialization.deserialize_keras_object(config)
config = serialization_lib.serialize_keras_object(inst)
if tf.__internal__.tf2.enabled():
self.assertEqual(class_name, config["registered_name"])
else:
self.assertEqual(class_name, config["class_name"])
new_inst = serialization_lib.deserialize_keras_object(config)
self.assertIsNot(inst, new_inst)
self.assertIsInstance(new_inst, OtherTestClass)
self.assertEqual(5, new_inst._val)
Expand All @@ -121,9 +122,12 @@ def my_fn():
fn_class_name = object_registration.get_registered_name(my_fn)
self.assertEqual(fn_class_name, class_name)

config = keras.utils.serialization.serialize_keras_object(my_fn)
self.assertEqual(class_name, config)
fn = keras.utils.serialization.deserialize_keras_object(config)
config = serialization_lib.serialize_keras_object(my_fn)
if tf.__internal__.tf2.enabled():
self.assertEqual("my_fn", config["config"])
else:
self.assertEqual(class_name, config)
fn = serialization_lib.deserialize_keras_object(config)
self.assertEqual(42, fn())

fn_2 = object_registration.get_registered_object(fn_class_name)
Expand All @@ -141,3 +145,7 @@ def test_serialize_custom_class_without_get_config_fails(self):
class TestClass:
def __init__(self, value):
self._value = value


if __name__ == "__main__":
tf.test.main()
Loading