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

49
ggml.c
View file

@ -4698,19 +4698,19 @@ 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->mem_size = mem_size; *ctx = (struct ggml_context) {
ctx->mem_buffer = params.mem_buffer ? params.mem_buffer : GGML_ALIGNED_MALLOC(mem_size); /*.mem_size =*/ mem_size,
ctx->mem_buffer_owned = params.mem_buffer ? false : true; /*.mem_buffer =*/ params.mem_buffer ? params.mem_buffer : GGML_ALIGNED_MALLOC(mem_size),
ctx->no_alloc = params.no_alloc; /*.mem_buffer_owned =*/ params.mem_buffer ? false : true,
ctx->no_alloc_save = params.no_alloc; /*.no_alloc =*/ params.no_alloc,
ctx->n_objects = 0; /*.no_alloc_save =*/ params.no_alloc,
ctx->objects_begin = NULL; /*.n_objects =*/ 0,
ctx->objects_end = NULL; /*.objects_begin =*/ NULL,
ctx->scratch = empty_scratch; /*.objects_end =*/ NULL,
ctx->scratch_save = empty_scratch; /*.scratch =*/ { 0, 0, NULL, },
/*.scratch_save =*/ { 0, 0, NULL, },
};
GGML_ASSERT(ctx->mem_buffer != NULL); GGML_ASSERT(ctx->mem_buffer != NULL);
@ -18052,18 +18052,19 @@ struct ggml_cgraph ggml_build_backward(struct ggml_context * ctx, struct ggml_cg
struct ggml_cgraph * ggml_new_graph(struct ggml_context * ctx) { 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).n_leafs = 0;
(*cgraph).order = GGML_CGRAPH_EVAL_ORDER_LEFT_TO_RIGHT;
(*cgraph).perf_runs = 0;
(*cgraph).perf_cycles = 0;
(*cgraph).perf_time_us = 0;
memset((*cgraph).nodes, 0, sizeof((*cgraph).nodes)); *cgraph = (struct ggml_cgraph) {
memset((*cgraph).grads, 0, sizeof((*cgraph).grads)); /*.n_nodes =*/ 0,
memset((*cgraph).leafs, 0, sizeof((*cgraph).leafs)); /*.n_leafs =*/ 0,
memset((*cgraph).visited_hash_table, 0, sizeof((*cgraph).visited_hash_table)); /*.nodes =*/ { NULL },
/*.grads =*/ { NULL },
/*.leafs =*/ { NULL },
/*.hash_table =*/ { NULL },
/*.order =*/ GGML_CGRAPH_EVAL_ORDER_LEFT_TO_RIGHT,
/*.perf_runs =*/ 0,
/*.perf_cycles =*/ 0,
/*.perf_time_us =*/ 0,
};
return cgraph; return cgraph;
} }
@ -22003,4 +22004,4 @@ int ggml_cpu_has_vsx(void) {
#endif #endif
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////