Skip to content

llava: Fix cpu-only clip image encoding sefault #12907

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
Apr 12, 2025
Merged

llava: Fix cpu-only clip image encoding sefault #12907

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7fb802
llava: Fix cpu-only clip image encoding
mattjcly Apr 11, 2025
afb1eaf
clip : no smart ptr for ggml_backend_t
ngxson Apr 11, 2025
676dc0c
Fix for backend_ptr push_back
mattjcly Apr 11, 2025
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
9 changes: 6 additions & 3 deletions examples/llava/clip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ struct clip_ctx {
? ggml_backend_init_by_type(GGML_BACKEND_DEVICE_TYPE_GPU, nullptr)
: nullptr);

ggml_backend_t backend_cpu_raw_ptr = backend_cpu.get();
if (backend) {
LOG_INF("%s: CLIP using %s backend\n", __func__, ggml_backend_name(backend.get()));
backend_ptrs.push_back(backend.get());
Expand All @@ -346,8 +347,8 @@ struct clip_ctx {
LOG_INF("%s: CLIP using CPU backend\n", __func__);
}

backend_ptrs.push_back(backend_cpu.get());
backend_buft.push_back(ggml_backend_get_default_buffer_type(backend_cpu.get()));
backend_ptrs.push_back(backend_cpu_raw_ptr);
backend_buft.push_back(ggml_backend_get_default_buffer_type(backend_cpu_raw_ptr));

sched.reset(
ggml_backend_sched_new(backend_ptrs.data(), backend_buft.data(), backend_ptrs.size(), 8192, false)
Expand Down Expand Up @@ -2610,7 +2611,9 @@ bool clip_image_batch_encode(clip_ctx * ctx, const int n_threads, const clip_ima
}
}

ggml_backend_cpu_set_n_threads(ctx->backend_cpu.get(), n_threads);
ggml_backend_t cpu_backend_raw_ptr =
ggml_backend_is_cpu(ctx->backend.get()) ? ctx->backend.get() : ctx->backend_cpu.get();
ggml_backend_cpu_set_n_threads(cpu_backend_raw_ptr, n_threads);

auto status = ggml_backend_sched_graph_compute(ctx->sched.get(), gf);
if (status != GGML_STATUS_SUCCESS) {
Expand Down
Loading