Merge branch 'master' into concedo_experimental

# Conflicts:
#	.github/workflows/build.yml
#	scripts/build-info.sh
This commit is contained in:
Concedo 2023-07-25 22:55:55 +08:00
commit 6a054b80b0
12 changed files with 753 additions and 146 deletions

View file

@ -1721,12 +1721,17 @@ static bool llama_eval_internal(
// run the computation
ggml_build_forward_expand(&gf, cur);
// fprintf(stderr, "graph build time: %.3f ms (%d nodes, %d leafs)\n", (ggml_time_us() - t_start_us)/1000.0, gf.n_nodes, gf.n_leafs);
#if GGML_USE_MPI
ggml_mpi_graph_compute_pre(lctx.ctx_mpi, &gf, n_layer);
#endif
#ifdef GGML_USE_METAL
if (lctx.ctx_metal && N == 1) {
if (!ggml_metal_if_optimized(lctx.ctx_metal)) {
ggml_metal_graph_find_concurrency(lctx.ctx_metal,&gf);
}
ggml_metal_set_n_cb (lctx.ctx_metal, n_threads);
ggml_metal_graph_compute(lctx.ctx_metal, &gf);
ggml_metal_get_tensor (lctx.ctx_metal, cur);