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

clip : use smart pointer (⚠️ breaking change) (#12869)

Browse source 
* clip : use smart pointers

* fix warmup

* add forward declaration

* misisng include

* fix include (2)

* composite

* simplify batch ptr

* fix conflict
This commit is contained in:
Xuan-Son Nguyen 2025-04-11 12:09:39 +02:00 • committed by GitHub
parent fccf9cae83
commit 0c50923944
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 256 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

23
examples/llava/clip-impl.h
View file

@ -1,5 +1,6 @@
#include "ggml.h"
#include "gguf.h"
#include "clip.h"
#include "clip.h"
@ -202,23 +203,31 @@ static void clip_log_internal(enum ggml_log_level level, const char * format, ..
// cpp wrappers
//
// wrapper for clip_image_size
struct clip_image_size_deleter {
void operator()(clip_image_size * val) { clip_image_size_free(val); }
};
typedef std::unique_ptr<clip_image_size, clip_image_size_deleter> clip_image_size_ptr;
// wrapper for clip_image_u8
struct clip_image_u8_deleter {
void operator()(clip_image_u8 * val) { clip_image_u8_free(val); }
};
typedef std::unique_ptr<clip_image_u8, clip_image_u8_deleter> clip_image_u8_ptr;
// wrapper for clip_image_f32
struct clip_image_f32_deleter {
void operator()(clip_image_f32 * val) { clip_image_f32_free(val); }
};
typedef std::unique_ptr<clip_image_f32, clip_image_f32_deleter> clip_image_f32_ptr;
struct clip_image_f32_batch_deleter {
void operator()(clip_image_f32_batch * val) { clip_image_f32_batch_free(val); }
struct clip_image_u8_batch {
std::vector<clip_image_u8_ptr> entries;
};
typedef std::unique_ptr<clip_image_u8, clip_image_u8_deleter> clip_image_u8_ptr;
typedef std::unique_ptr<clip_image_f32, clip_image_f32_deleter> clip_image_f32_ptr;
typedef std::unique_ptr<clip_image_f32_batch, clip_image_f32_batch_deleter> clip_image_f32_batch_ptr;
// TODO @ngxson : we're currently having a naming clash between struct clip_image_size and function clip_image_size()
struct clip_image_f32_batch {
std::vector<clip_image_f32_ptr> entries;
};
//
// common utils