Skip to content

speculative : fix batch sizes at initialization #9963

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

Merged
merged 3 commits into from
Oct 21, 2024
Merged

speculative : fix batch sizes at initialization #9963

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bb241
speculative : fix batch sizes at initialization
ggerganov Oct 20, 2024
67d1849
speculative : handle params.n_predict == -1
ggerganov Oct 20, 2024
90ab8a1
speculative : limit batch size to llama_n_batch
ggerganov Oct 20, 2024
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
11 changes: 8 additions & 3 deletions examples/speculative/speculative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ int main(int argc, char ** argv) {
return 1;
}

if (params.n_predict < -1) {
LOG_ERR("%s: --n-predict must be >= -1\n", __func__);
return 1;
}

common_init();

if (params.model_draft.empty()) {
Expand Down Expand Up @@ -190,8 +195,8 @@ int main(int argc, char ** argv) {
drafts[s].smpl = common_sampler_init(model_dft, params.sparams);
}

llama_batch batch_dft = llama_batch_init(params.n_ctx, 0, 1);
llama_batch batch_tgt = llama_batch_init(params.n_ctx, 0, n_seq_dft);
llama_batch batch_dft = llama_batch_init(llama_n_batch(ctx_dft), 0, 1);
llama_batch batch_tgt = llama_batch_init(llama_n_batch(ctx_tgt), 0, n_seq_dft);

const auto t_dec_start = ggml_time_us();

Expand Down Expand Up @@ -441,7 +446,7 @@ int main(int argc, char ** argv) {
++n_past_dft;
}

if (n_predict > params.n_predict || has_eos) {
if ((params.n_predict >= 0 && n_predict > params.n_predict) || has_eos) {
break;
}

Expand Down
Loading