Skip to content
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

fix seg fault #222

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix seg fault #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2714,6 +2714,7 @@ struct llama_model {

// Object used to allow caching of GGML graph between tokens where possible.
struct ggml_cached_graph {
bool is_active = false;
ggml_cgraph * gf;
size_t n;
ggml_backend_t backend_res;
Expand Down Expand Up @@ -14550,7 +14551,11 @@ static int llama_decode_internal(

gf = llama_build_graph(lctx, u_batch, false);

// disable future graph caching in presense of env var,
// Set whether GGML graph caching is in use within GGML module, based on
// whether caching was activated here during the previous token
ggml_set_cached_graph(lctx.sched,lctx.cached_graph.is_active);

// Disable future graph caching in presence of env var,
// if there are multiple devices, or if batch size is greater than 1
// TO DO enable graph caching for these cases
bool disable_cached_ggml_graph = (getenv("GGML_DISABLE_GRAPH_CACHING") != nullptr)
Expand All @@ -14562,7 +14567,8 @@ static int llama_decode_internal(
}
}

if(!disable_cached_ggml_graph) ggml_set_cached_graph(lctx.sched,true);
// Set whether graph caching should be used for future tokens
lctx.cached_graph.is_active=!disable_cached_ggml_graph;

// the output is always the last tensor in the graph
res = gf->nodes[gf->n_nodes - 1];
Expand Down
Loading