Skip to content

Commit

Permalink
llama-cli : resolve conflict
Browse files Browse the repository at this point in the history
ggml-ci
  • Loading branch information
ggerganov committed Aug 30, 2024
1 parent 584ef0e commit 6420268
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions examples/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,6 @@ int main(int argc, char ** argv) {
}

llama_attach_threadpool(ctx, threadpool, threadpool_batch);
if (ctx_guidance) {
llama_attach_threadpool(ctx_guidance, threadpool, threadpool_batch);
}

const int n_ctx_train = llama_n_ctx_train(model);
const int n_ctx = llama_n_ctx(ctx);
Expand Down

0 comments on commit 6420268

Please sign in to comment.