From 60f827b6a0ab6e1444a49e6bebeedd141d393961 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sat, 20 Sep 2025 16:44:23 +0300 Subject: [PATCH 1/6] ggml : bump version to 0.9.1 --- ggml/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index 1a0fdb676c449..d4f5cc5318ea3 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -4,8 +4,8 @@ project("ggml" C CXX ASM) ### GGML Version set(GGML_VERSION_MAJOR 0) set(GGML_VERSION_MINOR 9) -set(GGML_VERSION_PATCH 0) -set(GGML_VERSION_DEV "-dev") # "-dev" for development, "" for releases +set(GGML_VERSION_PATCH 1) +set(GGML_VERSION_DEV "") # "-dev" for development, "" for releases set(GGML_VERSION_BASE "${GGML_VERSION_MAJOR}.${GGML_VERSION_MINOR}.${GGML_VERSION_PATCH}") find_program(GIT_EXE NAMES git git.exe NO_CMAKE_FIND_ROOT_PATH) From eab87b075dac2c96099c73c8c47d25c0e7db9327 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Sat, 20 Sep 2025 16:44:23 +0300 Subject: [PATCH 2/6] ggml : prepare for development of 0.9.2-dev --- ggml/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index d4f5cc5318ea3..939504dd98bf0 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -4,8 +4,8 @@ project("ggml" C CXX ASM) ### GGML Version set(GGML_VERSION_MAJOR 0) set(GGML_VERSION_MINOR 9) -set(GGML_VERSION_PATCH 1) -set(GGML_VERSION_DEV "") # "-dev" for development, "" for releases +set(GGML_VERSION_PATCH 2) +set(GGML_VERSION_DEV "-dev") # "-dev" for development, "" for releases set(GGML_VERSION_BASE "${GGML_VERSION_MAJOR}.${GGML_VERSION_MINOR}.${GGML_VERSION_PATCH}") find_program(GIT_EXE NAMES git git.exe NO_CMAKE_FIND_ROOT_PATH) From 1d8a883a42ffc7c5b0a28eafcfc4aaa013f3ad47 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 25 Sep 2025 14:39:05 +0200 Subject: [PATCH 3/6] ggml : bump version to 0.9.3 (ggml/1353) --- ggml/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index 939504dd98bf0..62d50d7725dcd 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -4,8 +4,8 @@ project("ggml" C CXX ASM) ### GGML Version set(GGML_VERSION_MAJOR 0) set(GGML_VERSION_MINOR 9) -set(GGML_VERSION_PATCH 2) -set(GGML_VERSION_DEV "-dev") # "-dev" for development, "" for releases +set(GGML_VERSION_PATCH 3) +set(GGML_VERSION_DEV "") # "-dev" for development, "" for releases set(GGML_VERSION_BASE "${GGML_VERSION_MAJOR}.${GGML_VERSION_MINOR}.${GGML_VERSION_PATCH}") find_program(GIT_EXE NAMES git git.exe NO_CMAKE_FIND_ROOT_PATH) From 6494d711041f5d16e1010ed09bfc6bfe2be6f3ce Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Fri, 26 Sep 2025 17:34:42 +0200 Subject: [PATCH 4/6] ggml : remove -dev suffix from release version (ggml/1355) This commit removes the `-dev` suffix from the version string in CMakeLists.txt and the release script. The version will now be just be formatted as `MAJOR.MINOR.PATCH`. --- ggml/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt index 62d50d7725dcd..4699887cb5570 100644 --- a/ggml/CMakeLists.txt +++ b/ggml/CMakeLists.txt @@ -5,7 +5,6 @@ project("ggml" C CXX ASM) set(GGML_VERSION_MAJOR 0) set(GGML_VERSION_MINOR 9) set(GGML_VERSION_PATCH 3) -set(GGML_VERSION_DEV "") # "-dev" for development, "" for releases set(GGML_VERSION_BASE "${GGML_VERSION_MAJOR}.${GGML_VERSION_MINOR}.${GGML_VERSION_PATCH}") find_program(GIT_EXE NAMES git git.exe NO_CMAKE_FIND_ROOT_PATH) @@ -26,8 +25,8 @@ if(GIT_EXE) ) endif() -# Build the version string with optional -dev suffix and dirty flag -set(GGML_VERSION "${GGML_VERSION_BASE}${GGML_VERSION_DEV}") +# Build the version string with optional dirty flag +set(GGML_VERSION "${GGML_VERSION_BASE}") if(GGML_GIT_DIRTY AND NOT GGML_GIT_DIRTY EQUAL 0) set(GGML_VERSION "${GGML_VERSION}-dirty") endif() From c9446b2b062b94b94ebf3f110054b4a5d35a367f Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Mon, 29 Sep 2025 16:49:11 +0300 Subject: [PATCH 5/6] sync : whisper.cpp (ggml/1359) * ggml : Fix MKL detection by quoting BLAS_INCLUDE_DIRS (whisper/3426) * sync : whisper.cpp --- ggml/src/ggml-blas/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ggml/src/ggml-blas/CMakeLists.txt b/ggml/src/ggml-blas/CMakeLists.txt index 76064c3fd1fe8..60ce4b1e02c1c 100644 --- a/ggml/src/ggml-blas/CMakeLists.txt +++ b/ggml/src/ggml-blas/CMakeLists.txt @@ -74,7 +74,7 @@ if (BLAS_FOUND) target_compile_options(ggml-blas PRIVATE ${BLAS_LINKER_FLAGS}) - if (${BLAS_INCLUDE_DIRS} MATCHES "mkl" AND (${GGML_BLAS_VENDOR} MATCHES "Generic" OR ${GGML_BLAS_VENDOR} MATCHES "Intel")) + if ("${BLAS_INCLUDE_DIRS}" MATCHES "mkl" AND (${GGML_BLAS_VENDOR} MATCHES "Generic" OR ${GGML_BLAS_VENDOR} MATCHES "Intel")) add_compile_definitions(GGML_BLAS_USE_MKL) endif() From d7755f128b56ffc2006550872d58ae361e7e6aa9 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Mon, 29 Sep 2025 16:50:52 +0300 Subject: [PATCH 6/6] sync : ggml --- scripts/sync-ggml.last | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sync-ggml.last b/scripts/sync-ggml.last index 733d30cfa24cd..f20d58946639d 100644 --- a/scripts/sync-ggml.last +++ b/scripts/sync-ggml.last @@ -1 +1 @@ -978f6e1993f2eeb4e99b63d4e70b4401c0a2dae2 +83a15e113b130337a892fb6575c337754557d56f