Skip to content

Commit f3b5820

Browse files
dstaay-fbfacebook-github-bot
authored andcommitted
add NJT/TD support for EBC and pipeline benchmark (#2581)
Summary: # Documents * [TorchRec NJT Work Items](https://fburl.com/gdoc/gcqq6luv) * [KJT <> TensorDict](https://docs.google.com/document/d/1zqJL5AESnoKeIt5VZ6K1289fh_1QcSwu76yo0nB4Ecw/edit?tab=t.0#heading=h.bn9zwvg79) {F1949248817} # Context * As depicted above, we are extending TorchRec input data type from KJT (KeyedJaggedTensor) to TD (TensorDict) * Basically we can support TensorDict in both **eager mode** and **distributed (sharded) mode**: `Input (Union[KJT, TD]) ==> EBC ==> Output (KT)` * In eager mode, we directly call `td_to_kjt` in the forward function to convert TD to KJT. * In distributed mode, we do the conversion inside the `ShardedEmbeddingBagCollection`, specifically in the `input_dist`, where the input sparse features are prepared (permuted) for the `KJTAllToAll` communication. * In the KJT scenario, the input KJT would be permuted (and partially duplicated in some cases), followed by the `KJTAllToAll` communication. While in the TD scenario, the input TD will directly be converted to the permuted KJT ready for the following `KJTAllToAll` communication. * ref: D63436011 # Details * `td_to_kjt` implemented in python, which has cpu perf regression. But it's not on the training critical path so it has a minimal impact on the overall training QPS (see test plan benchmark results) * Currently only support EBC use case WARNING: `TensorDict` does **NOT** support weighted jagged tensor, **Nor** variable batch_size neither. NOTE: All the following comparisons are between the **`KJT.permute`** in the KJT input scenario and the **`TD-KJT conversion`** in the TD input scenario. * Both `KJT.permute` and `TD-KJT conversion` are correctly marked in the `TrainPipelineBase` traces `TD-KJT conversion` has more real executions in CPU, but the heavy-lifting computation is in GPU, which is delayed/blocked by the backward pass of the previous batch. GPU runtime has a small difference ~10%. {F1949366822} * For the `Copy-Batch-To-GPU` part, TD has more fragmented `HtoD` comms while KJT has a single contiguous `HtoD` comm Runtime-wise they are similar ~10% {F1949374305} * In the most commonly used `TrainPipelineSparseDist`, where the `Copy-Batch-To-GPU` and the cpu runtime are not on the critical path, we do observe very similar training QPS in the pipeline benchmark ~1% {F1949390271} ``` TrainPipelineSparseDist | Runtime (P90): 26.737 s | Memory (P90): 34.801 GB (TD) TrainPipelineSparseDist | Runtime (P90): 26.539 s | Memory (P90): 34.765 GB (KJT) ``` * increased data size, GPU runtime is 4x {F1949386106} # Conclusion 1. [Enablement] With this approach (replacing the `KJT permute` with `TD-KJT conversion`), the EBC can now take `TensorDict` as the module input in both single-GPU and multi-GPU (sharded) scenarios, tested with TrainPipelineBase, TrainPipelineSparseDist, TrainPipelineSemiSync, and TrainPipelinePrefetch. 2. [Performance] The TD host-to-device data transfer might not necessarily be a concern/blocker for the most commonly used train pipeline (TrainPipelineSparseDist). 2. [Feature Support] In order to become production-ready, the TensorDict needs to (1) integrate the `KJT.weights` data, and (2) to support the variable batch size, which are almost used in all the production models. 3. [Improvement] There are two major operations we can improve: (1) move TensorDict from host to device, and (2) convert TD to KJT. Currently they are both in the vanilla state. Since we are not sure how the real traces would be like with production models, we can't tell if these improvements are needed/helpful. Differential Revision: D65103519
1 parent af4cb11 commit f3b5820

File tree

4 files changed

+81
-37
lines changed

4 files changed

+81
-37
lines changed

torchrec/distributed/embeddingbag.py

+44-21
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import torch
2929
from fbgemm_gpu.permute_pooled_embedding_modules import PermutePooledEmbeddings
30+
from tensordict import TensorDict
3031
from torch import distributed as dist, nn, Tensor
3132
from torch.autograd.profiler import record_function
3233
from torch.distributed._tensor import DTensor
@@ -90,7 +91,12 @@
9091
)
9192
from torchrec.optim.fused import EmptyFusedOptimizer, FusedOptimizerModule
9293
from torchrec.optim.keyed import CombinedOptimizer, KeyedOptimizer
93-
from torchrec.sparse.jagged_tensor import _to_offsets, KeyedJaggedTensor, KeyedTensor
94+
from torchrec.sparse.jagged_tensor import (
95+
_to_offsets,
96+
KeyedJaggedTensor,
97+
KeyedTensor,
98+
td_to_kjt,
99+
)
94100

95101
try:
96102
torch.ops.load_library("//deeplearning/fbgemm/fbgemm_gpu:sparse_ops")
@@ -99,13 +105,6 @@
99105
except OSError:
100106
pass
101107

102-
try:
103-
from tensordict import TensorDict
104-
except ImportError:
105-
106-
class TensorDict:
107-
pass
108-
109108

110109
def _pin_and_move(tensor: torch.Tensor, device: torch.device) -> torch.Tensor:
111110
return (
@@ -662,9 +661,7 @@ def __init__(
662661
self._inverse_indices_permute_indices: Optional[torch.Tensor] = None
663662
# to support mean pooling callback hook
664663
self._has_mean_pooling_callback: bool = (
665-
True
666-
if PoolingType.MEAN.value in self._pooling_type_to_rs_features
667-
else False
664+
PoolingType.MEAN.value in self._pooling_type_to_rs_features
668665
)
669666
self._dim_per_key: Optional[torch.Tensor] = None
670667
self._kjt_key_indices: Dict[str, int] = {}
@@ -1171,26 +1168,37 @@ def _create_inverse_indices_permute_indices(
11711168

11721169
# pyre-ignore [14]
11731170
def input_dist(
1174-
self, ctx: EmbeddingBagCollectionContext, features: KeyedJaggedTensor
1171+
self,
1172+
ctx: EmbeddingBagCollectionContext,
1173+
features: Union[KeyedJaggedTensor, TensorDict],
11751174
) -> Awaitable[Awaitable[KJTList]]:
1176-
ctx.variable_batch_per_feature = features.variable_stride_per_key()
1177-
ctx.inverse_indices = features.inverse_indices_or_none()
1175+
if isinstance(features, KeyedJaggedTensor):
1176+
ctx.variable_batch_per_feature = features.variable_stride_per_key()
1177+
ctx.inverse_indices = features.inverse_indices_or_none()
1178+
feature_keys = features.keys()
1179+
else: # features is TensorDict
1180+
ctx.variable_batch_per_feature = False # TD does not support variable batch
1181+
ctx.inverse_indices = None
1182+
feature_keys = list(features.keys()) # pyre-ignore[6]
11781183
if self._has_uninitialized_input_dist:
1179-
self._create_input_dist(features.keys())
1184+
self._create_input_dist(feature_keys)
11801185
self._has_uninitialized_input_dist = False
11811186
if ctx.variable_batch_per_feature:
11821187
self._create_inverse_indices_permute_indices(ctx.inverse_indices)
11831188
if self._has_mean_pooling_callback:
1184-
self._init_mean_pooling_callback(features.keys(), ctx.inverse_indices)
1189+
self._init_mean_pooling_callback(feature_keys, ctx.inverse_indices)
11851190
with torch.no_grad():
1186-
if self._has_features_permute:
1191+
if isinstance(features, KeyedJaggedTensor) and self._has_features_permute:
11871192
features = features.permute(
11881193
self._features_order,
11891194
# pyre-fixme[6]: For 2nd argument expected `Optional[Tensor]`
11901195
# but got `Union[Module, Tensor]`.
11911196
self._features_order_tensor,
11921197
)
1193-
if self._has_mean_pooling_callback:
1198+
if (
1199+
isinstance(features, KeyedJaggedTensor)
1200+
and self._has_mean_pooling_callback
1201+
):
11941202
ctx.divisor = _create_mean_pooling_divisor(
11951203
lengths=features.lengths(),
11961204
stride=features.stride(),
@@ -1209,9 +1217,24 @@ def input_dist(
12091217
weights=features.weights_or_none(),
12101218
)
12111219

1212-
features_by_shards = features.split(
1213-
self._feature_splits,
1214-
)
1220+
if isinstance(features, KeyedJaggedTensor):
1221+
features_by_shards = features.split(
1222+
self._feature_splits,
1223+
)
1224+
else:
1225+
feature_names = [feature_keys[i] for i in self._features_order]
1226+
feature_name_by_sharding_types: List[List[str]] = []
1227+
start = 0
1228+
for length in self._feature_splits:
1229+
feature_name_by_sharding_types.append(
1230+
feature_names[start : start + length]
1231+
)
1232+
start += length
1233+
features_by_shards = [
1234+
td_to_kjt(features, names)
1235+
for names in feature_name_by_sharding_types
1236+
]
1237+
12151238
awaitables = []
12161239
for input_dist, features_by_shard, sharding_type in zip(
12171240
self._input_dists,

torchrec/distributed/train_pipeline/tests/pipeline_benchmarks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def main(
160160

161161
tables = [
162162
EmbeddingBagConfig(
163-
num_embeddings=(i + 1) * 1000,
163+
num_embeddings=max(i + 1, 100) * 1000,
164164
embedding_dim=dim_emb,
165165
name="table_" + str(i),
166166
feature_names=["feature_" + str(i)],
@@ -169,7 +169,7 @@ def main(
169169
]
170170
weighted_tables = [
171171
EmbeddingBagConfig(
172-
num_embeddings=(i + 1) * 1000,
172+
num_embeddings=max(i + 1, 100) * 1000,
173173
embedding_dim=dim_emb,
174174
name="weighted_table_" + str(i),
175175
feature_names=["weighted_feature_" + str(i)],

torchrec/modules/embedding_modules.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@
1212

1313
import torch
1414
import torch.nn as nn
15+
from tensordict import TensorDict
1516
from torchrec.modules.embedding_configs import (
1617
DataType,
1718
EmbeddingBagConfig,
1819
EmbeddingConfig,
1920
pooling_type_to_str,
2021
)
21-
from torchrec.sparse.jagged_tensor import JaggedTensor, KeyedJaggedTensor, KeyedTensor
22-
23-
24-
try:
25-
from tensordict import TensorDict
26-
except ImportError:
27-
28-
class TensorDict:
29-
pass
22+
from torchrec.sparse.jagged_tensor import (
23+
JaggedTensor,
24+
KeyedJaggedTensor,
25+
KeyedTensor,
26+
td_to_kjt,
27+
)
3028

3129

3230
@torch.fx.wrap
@@ -226,7 +224,7 @@ def __init__(
226224
self._feature_names: List[List[str]] = [table.feature_names for table in tables]
227225
self.reset_parameters()
228226

229-
def forward(self, features: KeyedJaggedTensor) -> KeyedTensor:
227+
def forward(self, features: Union[KeyedJaggedTensor, TensorDict]) -> KeyedTensor:
230228
"""
231229
Run the EmbeddingBagCollection forward pass. This method takes in a `KeyedJaggedTensor`
232230
and returns a `KeyedTensor`, which is the result of pooling the embeddings for each feature.
@@ -237,6 +235,8 @@ def forward(self, features: KeyedJaggedTensor) -> KeyedTensor:
237235
KeyedTensor
238236
"""
239237
flat_feature_names: List[str] = []
238+
if isinstance(features, TensorDict):
239+
features = td_to_kjt(features)
240240
for names in self._feature_names:
241241
flat_feature_names.extend(names)
242242
inverse_indices = reorder_inverse_indices(

torchrec/sparse/jagged_tensor.py

+25-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from typing import Any, Callable, Dict, List, Optional, Tuple, Union
1616

1717
import torch
18+
from tensordict import TensorDict
1819
from torch.autograd.profiler import record_function
1920
from torch.fx._pytree import register_pytree_flatten_spec, TreeSpec
2021
from torch.utils._pytree import GetAttrKey, KeyEntry, register_pytree_node
@@ -49,11 +50,9 @@
4950

5051
# OSS
5152
try:
52-
from tensordict import TensorDict
53+
pass
5354
except ImportError:
54-
55-
class TensorDict:
56-
pass
55+
pass
5756

5857

5958
logger: logging.Logger = logging.getLogger()
@@ -3027,6 +3026,28 @@ def dist_init(
30273026
return kjt.sync()
30283027

30293028

3029+
def td_to_kjt(td: TensorDict, keys: Optional[List[str]] = None) -> KeyedJaggedTensor:
3030+
if keys is None:
3031+
keys = list(td.keys()) # pyre-ignore[6]
3032+
values = torch.cat([td[key]._values for key in keys], dim=0)
3033+
lengths = torch.cat(
3034+
[
3035+
(
3036+
(td[key]._lengths)
3037+
if td[key]._lengths is not None
3038+
else torch.diff(td[key]._offsets)
3039+
)
3040+
for key in keys
3041+
],
3042+
dim=0,
3043+
)
3044+
return KeyedJaggedTensor(
3045+
keys=keys,
3046+
values=values,
3047+
lengths=lengths,
3048+
)
3049+
3050+
30303051
def _kjt_flatten(
30313052
t: KeyedJaggedTensor,
30323053
) -> Tuple[List[Optional[torch.Tensor]], List[str]]:

0 commit comments

Comments
 (0)