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

Jump to bottom

Improve layer output hook API #39

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Improve layer output hook API #39

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/fairseq2/models/w2vbert/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,14 @@ def layer_output_hook(
layer_output: Tensor,
layer_padding_mask: Optional[Tensor],
num_layers: int,
) -> None:
) -> bool:
nonlocal w2v2_layer_output

if layer_idx == num_layers - self.num_bert_encoder_layers - 1:
w2v2_layer_output = layer_output

return True

# TODO: Should we pad for fp16?
encoder_output, _ = self.w2v2_model.encoder(
seqs, padding_mask, layer_output_hook=layer_output_hook
Expand Down
13 changes: 10 additions & 3 deletions src/fairseq2/nn/transformer/decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,22 @@ def __call__(
layer_output: Tensor,
layer_padding_mask: Optional[Tensor],
num_layers: int,
) -> None:
) -> bool:
"""
:param layer_idx:
The index of the layer in the decoder stack.
:param layer_output:
The decoded output of the layer.
:param layer_padding_mask:
The padding mask of `layer_output`.
The padding mask of ``layer_output``.
:param num_layers:
The number of layers in the decoder stack.

:returns:
``True`` if the decoder should continue executing the remaining
layers in the stack; ``False`` if the decoder should stop executing
the remaining layers and treat this layer as the final layer in the
stack.
"""


Expand Down Expand Up @@ -202,7 +208,8 @@ def forward(
)

if layer_output_hook is not None:
layer_output_hook(layer_idx, seqs, padding_mask, num_layers)
if not layer_output_hook(layer_idx, seqs, padding_mask, num_layers):
break

if self.layer_norm is not None:
seqs = self.layer_norm(seqs)
Expand Down
13 changes: 10 additions & 3 deletions src/fairseq2/nn/transformer/encoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,22 @@ def __call__(
layer_output: Tensor,
layer_padding_mask: Optional[Tensor],
num_layers: int,
) -> None:
) -> bool:
"""
:param layer_idx:
The index of the layer in the encoder stack.
:param layer_output:
The encoded output of the layer.
:param layer_padding_mask:
The padding mask of `layer_output`.
The padding mask of ``layer_output``.
:param num_layers:
The number of layers in the encoder stack.

:returns:
``True`` if the encoder should continue executing the remaining
layers in the stack; ``False`` if the encoder should stop executing
the remaining layers and treat this layer as the final layer in the
stack.
"""


Expand Down Expand Up @@ -158,7 +164,8 @@ def forward(
seqs, padding_mask = layer(seqs, padding_mask)

if layer_output_hook is not None:
layer_output_hook(layer_idx, seqs, padding_mask, num_layers)
if not layer_output_hook(layer_idx, seqs, padding_mask, num_layers):
break

if self.layer_norm is not None:
seqs = self.layer_norm(seqs)
Expand Down