root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-06 08:44:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

avoid to change ggml_task_type

Browse Source
This commit is contained in:
Howard Su 2023-04-09 22:11:24 +08:00
parent 3b03df5c05
commit 2035a3cc29
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ggml.c
View File

@ -2725,9 +2725,9 @@ struct ggml_context_container {
// //
enum ggml_task_type { enum ggml_task_type {
GGML_TASK_INIT = 1, GGML_TASK_INIT = 0,
GGML_TASK_COMPUTE = 2, GGML_TASK_COMPUTE,
GGML_TASK_FINALIZE = 4, GGML_TASK_FINALIZE,
}; };
struct ggml_compute_params { struct ggml_compute_params {
@ -9260,13 +9260,14 @@ static void ggml_graph_compute_thread(void * data) {
int type = state->params.type; int type = state->params.type;
if (state->node) { if (state->node) {
if (state->params.ith < state->params.nth) { if (state->params.ith < state->params.nth) {
if (type & GGML_TASK_INIT) if (type == GGML_TASK_INIT)
{ {
state->params.type = GGML_TASK_INIT; state->params.type = GGML_TASK_INIT;
ggml_compute_forward(&state->params, state->node); ggml_compute_forward(&state->params, state->node);
type = GGML_TASK_COMPUTE;
} }
if (type & GGML_TASK_COMPUTE) if (type == GGML_TASK_COMPUTE)
{ {
state->params.type = GGML_TASK_COMPUTE; state->params.type = GGML_TASK_COMPUTE;
ggml_compute_forward(&state->params, state->node); ggml_compute_forward(&state->params, state->node);
@ -9579,7 +9580,7 @@ void ggml_graph_compute(struct ggml_context * ctx, struct ggml_cgraph * cgraph)
continue; continue;
workers[next_task].params = (struct ggml_compute_params) { workers[next_task].params = (struct ggml_compute_params) {
.type = GGML_TASK_COMPUTE | GGML_TASK_INIT, .type = GGML_TASK_INIT,
.ith = 0, .ith = 0,
.nth = 1, .nth = 1,
.wsize = 0, .wsize = 0,