Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-02-04 23:52:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

ggml : ggml_backend_graph_copy -> ggml_backend_graph_copy_state

Browse Source 
ggml-ci
This commit is contained in:
Georgi Gerganov 2025-01-12 17:57:51 +02:00
parent afd40ea206
commit a97b3621cf
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ggml/include/ggml-backend.h
View File

@ -323,7 +323,7 @@ extern "C" {
// Utils // Utils
// //
struct ggml_backend_graph_copy { struct ggml_backend_graph_copy_state {
ggml_backend_buffer_t buffer; ggml_backend_buffer_t buffer;
struct ggml_context * ctx_allocated; struct ggml_context * ctx_allocated;
struct ggml_context * ctx_unallocated; struct ggml_context * ctx_unallocated;
@ -331,8 +331,8 @@ extern "C" {
}; };
// Copy a graph to a different backend // Copy a graph to a different backend
GGML_API struct ggml_backend_graph_copy ggml_backend_graph_copy_init(ggml_backend_t backend, struct ggml_cgraph * graph); GGML_API struct ggml_backend_graph_copy_state ggml_backend_graph_copy(ggml_backend_t backend, struct ggml_cgraph * graph);
GGML_API void ggml_backend_graph_copy_free(struct ggml_backend_graph_copy copy); GGML_API void ggml_backend_graph_copy_free(struct ggml_backend_graph_copy_state copy);
typedef bool (*ggml_backend_eval_callback)(int node_index, struct ggml_tensor * t1, struct ggml_tensor * t2, void * user_data); typedef bool (*ggml_backend_eval_callback)(int node_index, struct ggml_tensor * t1, struct ggml_tensor * t2, void * user_data);

6
ggml/src/ggml-backend.cpp
View File

@ -1724,7 +1724,7 @@ static void graph_copy_init_tensor(struct ggml_hash_set * hash_set, struct ggml_
} }
} }
struct ggml_backend_graph_copy ggml_backend_graph_copy_init(ggml_backend_t backend, struct ggml_cgraph * graph) { struct ggml_backend_graph_copy_state ggml_backend_graph_copy(ggml_backend_t backend, struct ggml_cgraph * graph) {
struct ggml_hash_set hash_set = ggml_hash_set_new(graph->visited_hash_set.size); struct ggml_hash_set hash_set = ggml_hash_set_new(graph->visited_hash_set.size);
struct ggml_tensor ** node_copies = (ggml_tensor **) calloc(hash_set.size, sizeof(node_copies[0])); // NOLINT struct ggml_tensor ** node_copies = (ggml_tensor **) calloc(hash_set.size, sizeof(node_copies[0])); // NOLINT
bool * node_init = (bool *) calloc(hash_set.size, sizeof(node_init[0])); bool * node_init = (bool *) calloc(hash_set.size, sizeof(node_init[0]));
@ -1805,14 +1805,14 @@ struct ggml_backend_graph_copy ggml_backend_graph_copy_init(ggml_backend_t backe
}; };
} }
void ggml_backend_graph_copy_free(struct ggml_backend_graph_copy copy) { void ggml_backend_graph_copy_free(struct ggml_backend_graph_copy_state copy) {
ggml_backend_buffer_free(copy.buffer); ggml_backend_buffer_free(copy.buffer);
ggml_free(copy.ctx_allocated); ggml_free(copy.ctx_allocated);
ggml_free(copy.ctx_unallocated); ggml_free(copy.ctx_unallocated);
} }
bool ggml_backend_compare_graph_backend(ggml_backend_t backend1, ggml_backend_t backend2, struct ggml_cgraph * graph, ggml_backend_eval_callback callback, void * user_data) { bool ggml_backend_compare_graph_backend(ggml_backend_t backend1, ggml_backend_t backend2, struct ggml_cgraph * graph, ggml_backend_eval_callback callback, void * user_data) {
struct ggml_backend_graph_copy copy = ggml_backend_graph_copy_init(backend2, graph); struct ggml_backend_graph_copy_state copy = ggml_backend_graph_copy(backend2, graph);
if (copy.buffer == NULL) { if (copy.buffer == NULL) {
return false; return false;
} }