Skip to content

Commit 9d8562d

Browse files
slarenarthw
authored andcommitted
llama : use smart pointers for ggml resources (ggml-org#10117)
1 parent 07271a0 commit 9d8562d

File tree

4 files changed

+219
-245
lines changed

4 files changed

+219
-245
lines changed

ggml/include/ggml-cpp.h

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#pragma once
2+
3+
#ifndef __cplusplus
4+
#error "This header is for C++ only"
5+
#endif
6+
7+
#include "ggml.h"
8+
#include "ggml-alloc.h"
9+
#include "ggml-backend.h"
10+
#include <memory>
11+
12+
// Smart pointers for ggml types
13+
14+
// ggml
15+
16+
struct ggml_context_deleter { void operator()(ggml_context * ctx) { ggml_free(ctx); } };
17+
struct gguf_context_deleter { void operator()(gguf_context * ctx) { gguf_free(ctx); } };
18+
19+
typedef std::unique_ptr<ggml_context, ggml_context_deleter> ggml_context_ptr;
20+
typedef std::unique_ptr<gguf_context, gguf_context_deleter> gguf_context_ptr;
21+
22+
// ggml-alloc
23+
24+
struct ggml_gallocr_deleter { void operator()(ggml_gallocr_t galloc) { ggml_gallocr_free(galloc); } };
25+
26+
typedef std::unique_ptr<ggml_gallocr_t, ggml_gallocr_deleter> ggml_gallocr_ptr;
27+
28+
// ggml-backend
29+
30+
struct ggml_backend_deleter { void operator()(ggml_backend_t backend) { ggml_backend_free(backend); } };
31+
struct ggml_backend_buffer_deleter { void operator()(ggml_backend_buffer_t buffer) { ggml_backend_buffer_free(buffer); } };
32+
struct ggml_backend_event_deleter { void operator()(ggml_backend_event_t event) { ggml_backend_event_free(event); } };
33+
struct ggml_backend_sched_deleter { void operator()(ggml_backend_sched_t sched) { ggml_backend_sched_free(sched); } };
34+
35+
typedef std::unique_ptr<ggml_backend, ggml_backend_deleter> ggml_backend_ptr;
36+
typedef std::unique_ptr<ggml_backend_buffer, ggml_backend_buffer_deleter> ggml_backend_buffer_ptr;
37+
typedef std::unique_ptr<ggml_backend_event, ggml_backend_event_deleter> ggml_backend_event_ptr;
38+
typedef std::unique_ptr<ggml_backend_sched, ggml_backend_sched_deleter> ggml_backend_sched_ptr;

ggml/src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,7 @@ add_library(ggml
13681368
../include/ggml.h
13691369
../include/ggml-alloc.h
13701370
../include/ggml-backend.h
1371+
../include/ggml-cpp.h
13711372
ggml.c
13721373
ggml-alloc.c
13731374
ggml-backend.cpp

spm-headers/ggml-cpp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../ggml/include/ggml-cpp.h

0 commit comments

Comments
 (0)