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

[wip] ggml-backend v2 : add ggml_backend_sched #586

Merged
merged 21 commits into from
Oct 30, 2023
Merged

[wip] ggml-backend v2 : add ggml_backend_sched #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
077a9a4
ggml-backend-v2 wip
slaren Oct 9, 2023
af48025
fix metal build
slaren Oct 18, 2023
d35ea27
ggml-alloc : use a real backend buffer in measure mode
slaren Oct 19, 2023
9ac3256
backend sched : ignore view ops to reduce the number of splits
slaren Oct 19, 2023
25fa544
dynamic ggml_cgraph wip
slaren Oct 20, 2023
45d8936
dyn graphs : remove n_tasks from ggml_cplan
slaren Oct 20, 2023
4429aea
dyn graphs : update ggml_graph_import
slaren Oct 20, 2023
827665e
reset hash table in ggml_build_forward
slaren Oct 20, 2023
d38258f
ggml-alloc : split into tensor and graph allocators
slaren Oct 20, 2023
ddea127
add ggml_backend_sched_set_node_backend
slaren Oct 20, 2023
43a7624
remove ggml_build_forward_ctx, ggml_build_backward_ctx
slaren Oct 21, 2023
5948c23
update examples and tests, fix issues
slaren Oct 21, 2023
62a06c6
update more examples
slaren Oct 21, 2023
2105a49
update gpt-2/main-backend.cpp from master
slaren Oct 21, 2023
5cdc4b3
Merge branch 'master' into ggml-backend-v2
ggerganov Oct 30, 2023
63bff39
ggml : fix copmile warning
ggerganov Oct 30, 2023
178a1d3
Merge branch 'master' into ggml-backend-v2
ggerganov Oct 30, 2023
88c784a
ci : update yolo, fix mnist, use gpt-2-backend
ggerganov Oct 30, 2023
9dba67a
ggml : fix uninit warning
ggerganov Oct 30, 2023
6a7bdc5
ci : switch to gpt-2-backend2
ggerganov Oct 30, 2023
2de28e1
metal : skip noops early to avoid warnings from ggml_metal_get_buffer
ggerganov Oct 30, 2023
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
4 changes: 2 additions & 2 deletions ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ function gg_run_gpt_2 {
model="../models-mnt/gpt-2/ggml-model-gpt-2-117M.bin"
prompts="../examples/prompts/gpt-2.txt"

(time ./bin/gpt-2 --model ${model} -s 1234 -n 64 -tt ${prompts} ) 2>&1 | tee -a $OUT/${ci}-tg.log
(time ./bin/gpt-2 --model ${model} -s 1234 -n 64 -p "I believe the meaning of life is") 2>&1 | tee -a $OUT/${ci}-tg.log
(time ./bin/gpt-2-backend2 --model ${model} -s 1234 -n 64 -tt ${prompts} ) 2>&1 | tee -a $OUT/${ci}-tg.log
(time ./bin/gpt-2-backend2 --model ${model} -s 1234 -n 64 -p "I believe the meaning of life is") 2>&1 | tee -a $OUT/${ci}-tg.log

(time ./bin/gpt-2-batched --model ${model} -s 1234 -n 64 -np 8 -p "I believe the meaning of life is") 2>&1 | tee -a $OUT/${ci}-tg.log

Expand Down
10 changes: 5 additions & 5 deletions examples/dolly-v2/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ bool dollyv2_eval(
};

struct ggml_context * ctx0 = ggml_init(params);
struct ggml_cgraph gf = { };
struct ggml_cgraph * gf = ggml_new_graph(ctx0);

// KQ_pos - contains the positions
struct ggml_tensor * KQ_pos = ggml_new_tensor_1d(ctx0, GGML_TYPE_I32, N);
Expand Down Expand Up @@ -555,8 +555,8 @@ bool dollyv2_eval(
( n_ctx)*ggml_element_size(model.memory_v),
(il*n_ctx)*ggml_element_size(model.memory_v)*n_embd + n_past*ggml_element_size(model.memory_v));

ggml_build_forward_expand(&gf, ggml_cpy(ctx0, Kcur, k));
ggml_build_forward_expand(&gf, ggml_cpy(ctx0, Vcur, v));
ggml_build_forward_expand(gf, ggml_cpy(ctx0, Kcur, k));
ggml_build_forward_expand(gf, ggml_cpy(ctx0, Vcur, v));
}

// Q = Qcur.contiguous().view(n_embd/n_head, n_head, N).permute(0, 2, 1, 3)
Expand Down Expand Up @@ -666,8 +666,8 @@ bool dollyv2_eval(
//inpL = ggml_soft_max_inplace(ctx0, inpL);

// run the computation
ggml_build_forward_expand(&gf, inpL);
ggml_graph_compute_with_ctx(ctx0, &gf, n_threads);
ggml_build_forward_expand(gf, inpL);
ggml_graph_compute_with_ctx(ctx0, gf, n_threads);

//if (n_past%100 == 0) {
// ggml_graph_print (&gf);
Expand Down
14 changes: 13 additions & 1 deletion examples/gpt-2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
#
# gpt-2

set(TEST_TARGET gpt-2)
set(TEST_TARGET gpt-2-ctx)
add_executable(${TEST_TARGET} main-ctx.cpp)
target_link_libraries(${TEST_TARGET} PRIVATE ggml common common-ggml)

set(TEST_TARGET gpt-2-alloc)
add_executable(${TEST_TARGET} main-alloc.cpp)
target_link_libraries(${TEST_TARGET} PRIVATE ggml common common-ggml)

set(TEST_TARGET gpt-2-backend)
add_executable(${TEST_TARGET} main-backend.cpp)
target_link_libraries(${TEST_TARGET} PRIVATE ggml common common-ggml)

set(TEST_TARGET gpt-2-backend2)
add_executable(${TEST_TARGET} main.cpp)
target_link_libraries(${TEST_TARGET} PRIVATE ggml common common-ggml)

Expand Down
Loading