Skip to content

An error is reported when compiling based on metal: the cur parameter is missing #2465

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

Closed
wants to merge 1 commit into from
Closed

An error is reported when compiling based on metal: the cur parameter is missing #2465

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
13 changes: 8 additions & 5 deletions llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ static bool llama_model_load(
}
}

static struct ggml_cgraph * llama_build_graph(
static struct std::pair<ggml_cgraph *, ggml_tensor *> llama_build_graph(
llama_context & lctx,
const llama_token * tokens,
const float * embd,
Expand Down Expand Up @@ -1755,7 +1755,7 @@ static struct ggml_cgraph * llama_build_graph(

ggml_free(ctx0);

return gf;
return std::make_pair(gf, cur);
}

// evaluate the transformer
Expand Down Expand Up @@ -1799,8 +1799,9 @@ static bool llama_eval_internal(
#ifdef LLAMA_USE_ALLOCATOR
ggml_allocr_reset(lctx.alloc);
#endif

ggml_cgraph * gf = llama_build_graph(lctx, tokens, embd, n_tokens, n_past);
auto result = llama_build_graph(lctx, tokens, embd, n_tokens, n_past);
ggml_cgraph * gf = result.first;
ggml_tensor * cur = result.second;

#ifdef LLAMA_USE_ALLOCATOR
ggml_allocr_alloc_graph(lctx.alloc, gf);
Expand Down Expand Up @@ -3279,7 +3280,9 @@ struct llama_context * llama_new_context_with_model(
int n_tokens = std::min((int)hparams.n_ctx, params.n_batch);
int n_past = hparams.n_ctx - n_tokens;
llama_token token = llama_token_bos(); // not actually used by llama_build_graph, but required to choose between token and embedding inputs graph
ggml_cgraph * gf = llama_build_graph(*ctx, &token, NULL, n_tokens, n_past);
auto result = llama_build_graph(*ctx, &token, NULL, n_tokens, n_past);
ggml_cgraph * gf = result.first;
ggml_tensor * cur = result.second;

// measure memory requirements for the graph
size_t alloc_size = ggml_allocr_alloc_graph(ctx->alloc, gf) + tensor_alignment;
Expand Down