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

Catch optree exception when changing backends #20886

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+36 −22
Open

Catch optree exception when changing backends #20886

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
f90a7a4
catch optree exception when changing backends
t-kalinowski Feb 9, 2025
6cba7d0
format
t-kalinowski Feb 9, 2025
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
43 changes: 24 additions & 19 deletions keras/src/tree/optree_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,31 @@ def register_tree_node_class(cls):
from tensorflow.python.trackable.data_structures import ListWrapper
from tensorflow.python.trackable.data_structures import _DictWrapper

optree.register_pytree_node(
ListWrapper,
lambda x: (x, None),
lambda metadata, children: ListWrapper(list(children)),
namespace="keras",
)
try:
optree.register_pytree_node(
ListWrapper,
lambda x: (x, None),
lambda metadata, children: ListWrapper(list(children)),
namespace="keras",
)

def sorted_keys_and_values(d):
keys = sorted(list(d.keys()))
values = [d[k] for k in keys]
return values, keys, keys

optree.register_pytree_node(
_DictWrapper,
sorted_keys_and_values,
lambda metadata, children: _DictWrapper(
{key: child for key, child in zip(metadata, children)}
),
namespace="keras",
)
def sorted_keys_and_values(d):
keys = sorted(list(d.keys()))
values = [d[k] for k in keys]
return values, keys, keys

optree.register_pytree_node(
_DictWrapper,
sorted_keys_and_values,
lambda metadata, children: _DictWrapper(
{key: child for key, child in zip(metadata, children)}
),
namespace="keras",
)
except ValueError:
# optree raises a ValueError if the class is already registered.
# Triggered if config.set_backend() is called multiple times.
pass


def is_nested(structure):
Expand Down
15 changes: 12 additions & 3 deletions keras/src/utils/tracking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ def wrapper(*args, **kwargs):
return wrapper


def safe_register_tree_node_class(cls):
try:
return tree.register_tree_node_class(cls)
except ValueError:
# optree raises a ValueError if the class is already registered.
# Triggered if config.set_backend() is called multiple times.
return cls


class Tracker:
"""Attribute tracker, used for e.g. Variable tracking.

Expand Down Expand Up @@ -133,7 +142,7 @@ def replace_tracked_value(self, store_name, old_value, new_value):
self.stored_ids[store_name].add(id(new_value))


@tree.register_tree_node_class
@safe_register_tree_node_class
class TrackedList(list):
def __init__(self, values=None, tracker=None):
self.tracker = tracker
Expand Down Expand Up @@ -194,7 +203,7 @@ def tree_unflatten(cls, metadata, children):
return cls(children)


@tree.register_tree_node_class
@safe_register_tree_node_class
class TrackedDict(dict):
def __init__(self, values=None, tracker=None):
self.tracker = tracker
Expand Down Expand Up @@ -245,7 +254,7 @@ def tree_unflatten(cls, keys, values):
return cls(zip(keys, values))


@tree.register_tree_node_class
@safe_register_tree_node_class
class TrackedSet(set):
def __init__(self, values=None, tracker=None):
self.tracker = tracker
Expand Down