Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/core/ggml_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,18 @@ ggml_backend_t GGMLRunner::backend_for_weight(const ggml_tensor* tensor) const {
}

static bool backend_can_allocate_op(ggml_backend_t backend, const ggml_tensor* node) {
// Vulkan reports a preferred allocation chunk size, not a hard tensor limit.
if (sd_backend_is(backend, "Vulkan")) {
return true;
}
auto buft = ggml_backend_get_default_buffer_type(backend);
size_t alignment = ggml_backend_buft_get_alignment(buft);
size_t max_size = ggml_backend_buft_get_max_size(buft);
max_size -= max_size % alignment;
if (ggml_backend_buft_get_alloc_size(buft, node) > max_size) {
return false;
}
// Cross-backend copies must also fit the destination's allocation limit.
for (auto src : node->src) {
if (src != nullptr && ggml_backend_buft_get_alloc_size(buft, src) > max_size) {
return false;
Expand Down Expand Up @@ -251,8 +256,6 @@ void GGMLRunner::pin_multi_device_nodes(ggml_backend_sched_t sched, ggml_cgraph*
node->op == GGML_OP_PERMUTE || node->op == GGML_OP_TRANSPOSE) {
continue;
}
// Operation support can allow tensors larger than the backend's allocation limit.
// Check inputs too, since cross-backend copies must also fit a single allocation.
if (!backend_can_allocate_op(current, node)) {
auto cpu = workspace_.cpu_backend();
if (cpu != nullptr && ggml_backend_supports_op(cpu, node)) {
Expand Down
23 changes: 12 additions & 11 deletions src/model/diffusion/minimax_h3.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,14 @@ namespace MiniMaxH3 {

int64_t chunk_size = x->ne[1];
if (ctx->backend != nullptr) {
auto buft = ggml_backend_get_default_buffer_type(ctx->backend);
size_t alignment = ggml_backend_buft_get_alignment(buft);
size_t max_size = ggml_backend_buft_get_max_size(buft);
max_size -= max_size % alignment;
// Matmul outputs are F32 even for quantized weights. Split before fc1
// so its expanded activation never needs an oversized backend buffer.
auto buft = ggml_backend_get_default_buffer_type(ctx->backend);
size_t alignment = ggml_backend_buft_get_alignment(buft);
size_t chunk_budget = ggml_backend_buft_get_max_size(buft);
chunk_budget -= chunk_budget % alignment;
// Use the backend's preferred allocation size as a conservative chunk budget.
// Matmul outputs are F32 even for quantized weights.
size_t token_bytes = ggml_row_size(GGML_TYPE_F32, std::max(x->ne[0], 2 * ffn_hidden_size)) * x->ne[2] * x->ne[3];
chunk_size = static_cast<int64_t>(std::min<size_t>(chunk_size, std::max<size_t>(1, max_size / token_bytes)));
chunk_size = static_cast<int64_t>(std::min<size_t>(chunk_size, std::max<size_t>(1, chunk_budget / token_bytes)));
}
if (chunk_size == x->ne[1]) {
return forward_chunk(x);
Expand Down Expand Up @@ -267,10 +267,11 @@ namespace MiniMaxH3 {
if (ctx->backend != nullptr) {
auto buft = ggml_backend_get_default_buffer_type(ctx->backend);
size_t alignment = ggml_backend_buft_get_alignment(buft);
size_t max_size = ggml_backend_buft_get_max_size(buft);
max_size -= max_size % alignment;
// This is a conservative chunk budget, not an operation support limit.
size_t chunk_budget = ggml_backend_buft_get_max_size(buft);
chunk_budget -= chunk_budget % alignment;
size_t token_bytes = ggml_row_size(GGML_TYPE_F32, 3 * heads * head_dim) * inputs[0]->ne[2] * inputs[0]->ne[3];
chunk_size = static_cast<int64_t>(std::min<size_t>(chunk_size, std::max<size_t>(1, max_size / token_bytes)));
chunk_size = static_cast<int64_t>(std::min<size_t>(chunk_size, std::max<size_t>(1, chunk_budget / token_bytes)));
}
if (chunk_size == sequence) {
ggml_tensor* projected = nullptr;
Expand All @@ -282,7 +283,7 @@ namespace MiniMaxH3 {
return split_qkv(ctx, projected);
}

// Split Q/K/V before concatenating tokens so the full packed QKV never exceeds the buffer limit.
// Split Q/K/V before concatenating tokens to avoid materializing the full packed QKV.
std::vector<ggml_tensor*> chunks[3];
for (size_t i = 0; i < inputs.size(); ++i) {
auto input = inputs[i];
Expand Down
Loading