vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reverted changes in ggml.c

Browse source
This commit is contained in:
l3utterfly 2023-10-12 15:54:01 +08:00
parent cbf6d074b8
commit cb58690579
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

47
ggml.c
View file

@ -4699,18 +4699,18 @@ struct ggml_context * ggml_init(struct ggml_init_params params) {
const size_t mem_size = params.mem_buffer ? params.mem_size : GGML_PAD(params.mem_size, GGML_MEM_ALIGN); const size_t mem_size = params.mem_buffer ? params.mem_size : GGML_PAD(params.mem_size, GGML_MEM_ALIGN);
struct ggml_scratch empty_scratch = { 0, 0, NULL }; *ctx = (struct ggml_context) {
/*.mem_size =*/ mem_size,
ctx->mem_size = mem_size; /*.mem_buffer =*/ params.mem_buffer ? params.mem_buffer : GGML_ALIGNED_MALLOC(mem_size),
ctx->mem_buffer = params.mem_buffer ? params.mem_buffer : GGML_ALIGNED_MALLOC(mem_size); /*.mem_buffer_owned =*/ params.mem_buffer ? false : true,
ctx->mem_buffer_owned = params.mem_buffer ? false : true; /*.no_alloc =*/ params.no_alloc,
ctx->no_alloc = params.no_alloc; /*.no_alloc_save =*/ params.no_alloc,
ctx->no_alloc_save = params.no_alloc; /*.n_objects =*/ 0,
ctx->n_objects = 0; /*.objects_begin =*/ NULL,
ctx->objects_begin = NULL; /*.objects_end =*/ NULL,
ctx->objects_end = NULL; /*.scratch =*/ { 0, 0, NULL, },
ctx->scratch = empty_scratch; /*.scratch_save =*/ { 0, 0, NULL, },
ctx->scratch_save = empty_scratch; };
GGML_ASSERT(ctx->mem_buffer != NULL); GGML_ASSERT(ctx->mem_buffer != NULL);
@ -18053,17 +18053,18 @@ struct ggml_cgraph * ggml_new_graph(struct ggml_context * ctx) {
struct ggml_object * obj = ggml_new_object(ctx, GGML_OBJECT_GRAPH, GGML_GRAPH_SIZE); struct ggml_object * obj = ggml_new_object(ctx, GGML_OBJECT_GRAPH, GGML_GRAPH_SIZE);
struct ggml_cgraph * cgraph = (struct ggml_cgraph *) ((char *) ctx->mem_buffer + obj->offs); struct ggml_cgraph * cgraph = (struct ggml_cgraph *) ((char *) ctx->mem_buffer + obj->offs);
(*cgraph).n_nodes = 0; *cgraph = (struct ggml_cgraph) {
(*cgraph).n_leafs = 0; /*.n_nodes =*/ 0,
(*cgraph).order = GGML_CGRAPH_EVAL_ORDER_LEFT_TO_RIGHT; /*.n_leafs =*/ 0,
(*cgraph).perf_runs = 0; /*.nodes =*/ { NULL },
(*cgraph).perf_cycles = 0; /*.grads =*/ { NULL },
(*cgraph).perf_time_us = 0; /*.leafs =*/ { NULL },
/*.hash_table =*/ { NULL },
memset((*cgraph).nodes, 0, sizeof((*cgraph).nodes)); /*.order =*/ GGML_CGRAPH_EVAL_ORDER_LEFT_TO_RIGHT,
memset((*cgraph).grads, 0, sizeof((*cgraph).grads)); /*.perf_runs =*/ 0,
memset((*cgraph).leafs, 0, sizeof((*cgraph).leafs)); /*.perf_cycles =*/ 0,
memset((*cgraph).visited_hash_table, 0, sizeof((*cgraph).visited_hash_table)); /*.perf_time_us =*/ 0,
};
return cgraph; return cgraph;
} }