Skip to content

Commit fd37494

Browse files
authored
Merge branch 'ggml-org:master' into master
2 parents 6a5ad20 + 4efd326 commit fd37494

File tree

6 files changed

+14
-4
lines changed

6 files changed

+14
-4
lines changed

ggml/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project("ggml" C CXX ASM)
44
### GGML Version
55
set(GGML_VERSION_MAJOR 0)
66
set(GGML_VERSION_MINOR 9)
7-
set(GGML_VERSION_PATCH 7)
7+
set(GGML_VERSION_PATCH 8)
88
set(GGML_VERSION_BASE "${GGML_VERSION_MAJOR}.${GGML_VERSION_MINOR}.${GGML_VERSION_PATCH}")
99

1010
find_program(GIT_EXE NAMES git git.exe NO_CMAKE_FIND_ROOT_PATH)

ggml/include/ggml.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,10 @@ extern "C" {
733733
GGML_API size_t ggml_type_size(enum ggml_type type); // size in bytes for all elements in a block
734734
GGML_API size_t ggml_row_size (enum ggml_type type, int64_t ne); // size in bytes for all elements in a row
735735

736+
GGML_DEPRECATED(
737+
GGML_API double ggml_type_sizef(enum ggml_type type), // ggml_type_size()/ggml_blck_size() as float
738+
"use ggml_row_size() instead");
739+
736740
GGML_API const char * ggml_type_name(enum ggml_type type);
737741
GGML_API const char * ggml_op_name (enum ggml_op op);
738742
GGML_API const char * ggml_op_symbol(enum ggml_op op);

ggml/src/ggml.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,12 @@ size_t ggml_row_size(enum ggml_type type, int64_t ne) {
12941294
return ggml_type_size(type)*ne/ggml_blck_size(type);
12951295
}
12961296

1297+
double ggml_type_sizef(enum ggml_type type) {
1298+
assert(type >= 0);
1299+
assert(type < GGML_TYPE_COUNT);
1300+
return ((double)(type_traits[type].type_size))/type_traits[type].blck_size;
1301+
}
1302+
12971303
const char * ggml_type_name(enum ggml_type type) {
12981304
assert(type >= 0);
12991305
assert(type < GGML_TYPE_COUNT);

scripts/sync-ggml.last

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
553552e1d88be2b214b85e5159eedd39a63e2c34
1+
c044a8eeae2591faa0950c8b5e514cbc4bbfc4ca

tools/server/public/index.html.gz

60 KB
Binary file not shown.

tools/server/webui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAttachmentsDropdown.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
</Tooltip.Trigger>
149149

150150
<Tooltip.Content side="right">
151-
<p>Images require vision models to be processed</p>
151+
<p>Image processing requires a vision model</p>
152152
</Tooltip.Content>
153153
</Tooltip.Root>
154154
{/if}
@@ -173,7 +173,7 @@
173173
</Tooltip.Trigger>
174174

175175
<Tooltip.Content side="right">
176-
<p>Audio files require audio models to be processed</p>
176+
<p>Audio files processing requires an audio model</p>
177177
</Tooltip.Content>
178178
</Tooltip.Root>
179179
{/if}

0 commit comments

Comments
 (0)