Skip to content

Commit 2da0fb7

Browse files
committed
fix: remove stale capture else/code fragments causing brace mismatch
1 parent e253067 commit 2da0fb7

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

src/llama-context.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,20 +2139,13 @@ llm_graph_result * llama_context::process_ubatch(const llama_ubatch & ubatch, ll
21392139
if (res->t_logits) ggml_backend_sched_set_tensor_backend(sched.get(), res->t_logits, be);
21402140
if (res->t_embd) ggml_backend_sched_set_tensor_backend(sched.get(), res->t_embd, be);
21412141

2142-
// 3. Hijack tensor->data to static GPU addresses
2143-
h2_hijack.scan_and_hijack(phase2_gf);
2142+
h2_hijack.scan_and_hijack(phase2_gf);
21442143
res->set_inputs(&ubatch);
21452144
void* st = ggml_backend_cuda_get_stream_ptr(gpu, 0);
21462145
h2_hijack.copy_data_to_static(st);
21472146
ggml_backend_sched_synchronize(sched.get());
21482147
auto s = graph_compute(phase2_gf, ubatch.n_tokens > 1);
21492148
if (s != GGML_STATUS_SUCCESS) { ret = s; return nullptr; }
2150-
} else {
2151-
fprintf(stderr, "cuda: beginCapture fail, using normal compute\n");
2152-
auto s = graph_compute(phase2_gf, false);
2153-
if (s != GGML_STATUS_SUCCESS) { ret = s; return nullptr; }
2154-
}
2155-
}
21562149
} else {
21572150
res->set_inputs(&ubatch);
21582151
ggml_backend_sched_synchronize(sched.get());

0 commit comments

Comments
 (0)