From f0c0769189d11debf7b237a02695c44c9773d52a Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 9 Apr 2025 15:45:50 +0200 Subject: [PATCH] gnu: Update whisper-cpp to 1.7.5. * gnu/packages/machine-learning.scm (whisper-cpp): Update to 1.7.5. [source]: Remove `whisper-cpp-enable-tests.patch` patch. [inputs]: Add `git`. * gnu/packages/patches/whisper-cpp-enable-tests.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove `whisper-cpp-enable-tests.patch`. Change-Id: I16050a9cfe40374dc5bf8ba7ed66e1eb02a44ee5 --- gnu/local.mk | 1 - gnu/packages/machine-learning.scm | 10 +++++----- .../patches/whisper-cpp-enable-tests.patch | 19 ------------------- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 gnu/packages/patches/whisper-cpp-enable-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6dc4b4f61ba21abaf00d5f9d6a942865f6073ed7..29bf4c72b89665f8a2dadbeea3403ae1cb0b1558 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2412,7 +2412,6 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ - %D%/packages/patches/whisper-cpp-enable-tests.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3e68af3476b46d3d0abe2fa480ee9d338095fdbc..7a8f866d67928d3e28dfcdb963f326686d2da6bb 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -136,6 +136,7 @@ #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) + #:use-module (gnu packages version-control) #:use-module (gnu packages vulkan) #:use-module (gnu packages video) #:use-module (gnu packages web) @@ -738,17 +739,16 @@ independently to be able to run a LLaMA model.") (define-public whisper-cpp (package (name "whisper-cpp") - (version "1.7.3") + (version "1.7.5") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ggerganov/whisper.cpp") + (url "https://github.com/ggml-org/whisper.cpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0rrkgrx8akw91b77kl36i03i39a79r0p69glhhidm28qfw02icjx")) - (patches (search-patches "whisper-cpp-enable-tests.patch")))) + "0fs15rizz4psd3flfjpdivzvc9w19i3706flisn136ax0k8r7w5n")))) (build-system cmake-build-system) (arguments (list @@ -788,7 +788,7 @@ independently to be able to run a LLaMA model.") (native-inputs (list pkg-config)) (inputs - (list openblas sdl2)) + (list openblas sdl2 git)) (synopsis "OpenAI's Whisper model in C/C++") (description "This package is a high-performance inference of OpenAI's diff --git a/gnu/packages/patches/whisper-cpp-enable-tests.patch b/gnu/packages/patches/whisper-cpp-enable-tests.patch deleted file mode 100644 index c4340d487993a1ce1be8f1976a0653e0e33d7bde..0000000000000000000000000000000000000000 --- a/gnu/packages/patches/whisper-cpp-enable-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Distribution specific patch - -restored tests commented out in CMakeLists.txt upstream - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c53252b..ee06015 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -176,8 +176,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/whisper.pc" - # - - if (WHISPER_BUILD_TESTS AND NOT CMAKE_JS_VERSION) -- #include(CTest) -- #add_subdirectory(tests) -+ include(CTest) -+ add_subdirectory(tests) - endif () - - if (WHISPER_BUILD_EXAMPLES)