Skip to content

Commit 6bc7a30

Browse files
committed
mtmd_input_chunk_copy
1 parent a0fb701 commit 6bc7a30

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

tools/llava/mtmd.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -853,9 +853,16 @@ const mtmd_image_tokens * mtmd_input_chunk_get_tokens_image(const mtmd_input_chu
853853
return nullptr;
854854
}
855855

856-
mtmd_input_chunk * mtmd_input_chunk_release(mtmd_input_chunk * chunk) {
857-
mtmd_input_chunk * copy = new mtmd_input_chunk;
858-
*copy = std::move(*chunk);
856+
mtmd_input_chunk * mtmd_input_chunk_copy(const mtmd_input_chunk * chunk) {
857+
mtmd_input_chunk * copy = new mtmd_input_chunk{
858+
chunk->type,
859+
chunk->tokens_text,
860+
mtmd_image_tokens_ptr(),
861+
};
862+
if (chunk->tokens_image) {
863+
// copy the image tokens
864+
copy->tokens_image = mtmd_image_tokens_ptr(new mtmd_image_tokens(*chunk->tokens_image));
865+
}
859866
return copy;
860867
}
861868

tools/llava/mtmd.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,10 @@ MTMD_API const llama_token * mtmd_input_chunk_get_tokens_text (const mtmd
124124
MTMD_API const mtmd_image_tokens * mtmd_input_chunk_get_tokens_image(const mtmd_input_chunk * chunk);
125125

126126
// in case you want to use custom logic to handle the chunk (i.e. KV cache management)
127-
// you can move the chunk ownership to your own code
128-
// this will release the chunk from the list of input chunks
127+
// you can move the chunk ownership to your own code by copying it
129128
// remember to free the chunk when you are done with it
130-
MTMD_API mtmd_input_chunk * mtmd_input_chunk_release(mtmd_input_chunk * chunk);
131-
MTMD_API void mtmd_input_chunk_free (mtmd_input_chunk * chunk);
129+
MTMD_API mtmd_input_chunk * mtmd_input_chunk_copy(const mtmd_input_chunk * chunk);
130+
MTMD_API void mtmd_input_chunk_free(mtmd_input_chunk * chunk);
132131

133132

134133
// mtmd_image_tokens

0 commit comments

Comments
 (0)