marfrit/rk-llama.cpp
1
0
Fork 0
Code Issues Pull Requests Actions 31 Packages Projects Releases Wiki Activity

context : fix off-by-one comparisons to n_gpu_layers (#24208)

Browse Source
This commit is contained in:
Sigbjørn Skjæret
2026-06-06 06:06:47 +02:00
committed by GitHub
parent 308f61c31f
commit 603300b008
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llama-context.cpp
+2 -2
View File
@@ -341,7 +341,7 @@ llama_context::llama_context(
// enabling pipeline parallelism in the scheduler increases memory usage, so it is only done when necessary // enabling pipeline parallelism in the scheduler increases memory usage, so it is only done when necessary
bool pipeline_parallel = bool pipeline_parallel =
model.n_devices() > 1 && model.n_devices() > 1 &&
model.n_gpu_layers() > model.hparams.n_layer() && model.n_gpu_layers() > model.hparams.n_layer_all &&
model.split_mode() == LLAMA_SPLIT_MODE_LAYER && model.split_mode() == LLAMA_SPLIT_MODE_LAYER &&
cparams.offload_kqv && cparams.offload_kqv &&
!model.has_tensor_overrides(); !model.has_tensor_overrides();
@@ -2351,7 +2351,7 @@ llm_graph_cb llama_context::graph_get_cb() const {
// norm may be automatically assigned to the backend of the previous layer, increasing data transfer between backends // norm may be automatically assigned to the backend of the previous layer, increasing data transfer between backends
// FIXME: fix in ggml_backend_sched // FIXME: fix in ggml_backend_sched
const bool full_offload = model.n_gpu_layers() > model.hparams.n_layer(); const bool full_offload = model.n_gpu_layers() > model.hparams.n_layer_all;
if (ubatch.n_tokens < 32 || full_offload) { if (ubatch.n_tokens < 32 || full_offload) {
if (il != -1 && strcmp(name, "norm") == 0) { if (il != -1 && strcmp(name, "norm") == 0) {
const auto & dev_layer = model.dev_layer(il); const auto & dev_layer = model.dev_layer(il);