Skip to content

Commit 6420268

Browse files
committed
llama-cli : resolve conflict
ggml-ci
1 parent 584ef0e commit 6420268

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

Diff for: examples/main/main.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@ int main(int argc, char ** argv) {
243243
}
244244

245245
llama_attach_threadpool(ctx, threadpool, threadpool_batch);
246-
if (ctx_guidance) {
247-
llama_attach_threadpool(ctx_guidance, threadpool, threadpool_batch);
248-
}
249246

250247
const int n_ctx_train = llama_n_ctx_train(model);
251248
const int n_ctx = llama_n_ctx(ctx);

0 commit comments

Comments
 (0)