Skip to content

[WIP] cxx_pytree compatibility #1276

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: main
Choose a base branch
from
Open

[WIP] cxx_pytree compatibility #1276

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
32 changes: 20 additions & 12 deletions tensordict/_pytree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@
from tensordict.persistent import PersistentTensorDict
from tensordict.utils import _shape, implement_for

try:
from torch.utils._pytree import Context, MappingKey, register_pytree_node
except ImportError:
from torch.utils._pytree import (
_register_pytree_node as register_pytree_node,
Context,
)
from torch.utils._pytree import Context, MappingKey, register_pytree_node
from torch.utils._cxx_pytree import register_pytree_node as register_pytree_node_cxx


PYTREE_REGISTERED_TDS = (
_SubTensorDict,
Expand Down Expand Up @@ -83,7 +79,7 @@ def _str_to_tensordictdict(str_spec: str) -> Tuple[List[str], str]:


def _tensordict_flatten(d: TensorDict) -> Tuple[List[Any], Context]:
items = tuple(d.items())
items = tuple(d._tensordict.items())
if items:
keys, values = zip(*items)
keys = list(keys)
Expand Down Expand Up @@ -186,11 +182,17 @@ def _register_td_node(cls):

@implement_for("torch", "2.3")
def _register_td_node(cls): # noqa: F811
register_pytree_node(
# register_pytree_node(
# cls,
# _tensordict_flatten,
# _tensordict_unflatten,
# flatten_with_keys_fn=_td_flatten_with_keys,
# )
register_pytree_node_cxx(
cls,
_tensordict_flatten,
_tensordict_unflatten,
flatten_with_keys_fn=_td_flatten_with_keys,
# flatten_with_keys_fn=_td_flatten_with_keys,
)


Expand All @@ -205,11 +207,17 @@ def _register_lazy_td_node(cls):

@implement_for("torch", "2.3")
def _register_lazy_td_node(cls): # noqa: F811
register_pytree_node(
# register_pytree_node(
# cls,
# _lazy_tensordict_flatten,
# _lazy_tensordict_unflatten,
# flatten_with_keys_fn=_lazy_td_flatten_with_keys,
# )
register_pytree_node_cxx(
cls,
_lazy_tensordict_flatten,
_lazy_tensordict_unflatten,
flatten_with_keys_fn=_lazy_td_flatten_with_keys,
# flatten_with_keys_fn=_lazy_td_flatten_with_keys,
)


Expand Down
Loading