Skip to content

get rid of unncessary fx wrap in regrouping #2882

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

Closed
wants to merge 1 commit into from
Closed

get rid of unncessary fx wrap in regrouping #2882

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
23 changes: 9 additions & 14 deletions torchrec/modules/regroup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,6 @@ def _permuted_values(
return torch.cat(values, dim=dim)


@torch.fx.wrap
def _build_dict(
keys: List[str],
values: Union[torch.Tensor, List[torch.Tensor]],
splits: List[int],
dim: int,
) -> Dict[str, torch.Tensor]:
if isinstance(values, torch.Tensor):
return dict(zip(keys, torch.split(values, splits, dim=dim)))
else:
return dict(zip(keys, values))


@torch.fx.wrap
def module_init(module: "KTRegroupAsDict", keyed_tensors: List[KeyedTensor]) -> None:
assert len(keyed_tensors) > 0, "Empty list provided"
Expand Down Expand Up @@ -115,6 +102,12 @@ def forward(self, values: List[torch.Tensor]) -> List[torch.Tensor]:
)


def _to_tensor_dict(
keys: List[str], values: Union[List[torch.Tensor], Tuple[torch.Tensor, ...]]
) -> Dict[str, torch.Tensor]:
return {key: values[i] for i, key in enumerate(keys)}


class KTRegroupAsDict(torch.nn.Module, CacheMixin):
"""
KTRegroupAsDict is a nn.Module that mirrors beahvior of static method KeyedTensor.regroup_as_dict()
Expand Down Expand Up @@ -204,11 +197,13 @@ def forward(self, keyed_tensors: List[KeyedTensor]) -> Dict[str, torch.Tensor]:
if self._use_fbgemm_regroup:
values = _get_kts_values(keyed_tensors)
permuted_values = self._permute_pooled_embs_impl(values)
return _to_tensor_dict(self._keys, permuted_values)
else:
permuted_values = _permuted_values(
keyed_tensors, self._idx_key_pairs, self._dim
)
return _build_dict(self._keys, permuted_values, self._splits, self._dim)
splitted_values = torch.split(permuted_values, self._splits, dim=self._dim)
return _to_tensor_dict(self._keys, splitted_values)

def clear_cache(self) -> None:
self._is_inited = False
Loading