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

Fix regression of perf after mistral dev #1622

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Fix regression of perf after mistral dev #1622

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
14 changes: 7 additions & 7 deletions src/layers/transformer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ namespace ctranslate2 {
}

for (size_t i = 0; i < layer_ins.size(); ++i) {
auto layer_in_chunk = layer_ins[i];
StorageView* layer_in_chunk = &layer_ins[i];
for (size_t l = 0; l < _layers.size(); ++l) {
StorageView* cached_self_attn_keys = nullptr;
StorageView* cached_self_attn_values = nullptr;
Expand All @@ -583,22 +583,22 @@ namespace ctranslate2 {
dim_t offset = _sliding_window * i + step;
offset = offset < 0 ? 0 : offset;
if (i > 0) {
auto max_tokens = _sliding_window + layer_in_chunk.dim(1);
StorageView tmp_lengths = StorageView(Shape{layer_in_chunk.dim(0)}, int32_t(max_tokens), device);
auto max_tokens = _sliding_window + layer_in_chunk->dim(1);
StorageView tmp_lengths = StorageView(Shape{layer_in_chunk->dim(0)}, int32_t(max_tokens), device);
StorageView lengths_mask = layers::MultiHeadAttention::prepare_length_mask(
tmp_lengths,
_num_heads,
max_tokens,
/*mask_future=*/true,
multi_query);

const ops::Slide slide_lengths_op(2, _sliding_window, layer_in_chunk.dim(1));
const ops::Slide slide_lengths_op(2, _sliding_window, layer_in_chunk->dim(1));
// reuse tmp_lengths
slide_lengths_op(lengths_mask, tmp_lengths);
input_lengths_mask = std::make_unique<StorageView>(std::move(tmp_lengths));
}

(*_layers[l])(layer_in_chunk,
(*_layers[l])(*layer_in_chunk,
input_lengths_mask.get(),
memory,
memory_lengths_mask.get(),
Expand All @@ -613,14 +613,14 @@ namespace ctranslate2 {
return_normalized_attention(),
&position_bias,
offset);
layer_in_chunk = std::move(layer_out);
*layer_in_chunk = std::move(layer_out);

if (layer_attention) {
alignment_heads.emplace_back(dtype, device);
ops::Gather(1, 1)(*layer_attention, *heads_to_select, alignment_heads.back());
}
}
layer_in = std::move(layer_in_chunk);
layer_in = std::move(*layer_in_chunk);
}

if (step == 0) {
Expand Down
Loading