From patchwork Mon Apr 7 23:19:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41425 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5883927BC4A; Tue, 8 Apr 2025 00:21:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4FB8827BC49 for ; Tue, 8 Apr 2025 00:21:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1vm5-000285-8M; Mon, 07 Apr 2025 19:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1vm3-00027U-1D for guix-patches@gnu.org; Mon, 07 Apr 2025 19:21:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u1vm2-0007tF-Nk for guix-patches@gnu.org; Mon, 07 Apr 2025 19:21:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=UCS6EvHXwK2X+1Lq2Qe7W2mbwLlRqC2MYilJuEPCu/E=; b=B2/XrYSoMsXamAP+YFljar3EY5zVDTkvw40Sqw1BxfbUoIu88XvU821dENa1khD0MWiTrlcasM8hEh+RKjgQOxFNQbxM6lEtDrlC+zlLVQNpZAX80M+SaLkwDhiITBTk+A3fW6ZljTSeCN6JkRSYvATP2r7GLyAnpWyfsvCRgv0oblcdWTJq6Z/mciXDU0Wx1NFRspeKIFLerQMfAjHgFdr0h6keuvEypdzdR67JVYolHVe+R3pdXJRtc6DgB72KYhElyOwJCKKBUYKvgbPncFSMZNUYMxGJbjpnLClTOPxqgEQKbrAjv5oFI/eXtWHZI4ujjEEQNfIbzRbTtEZEvQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1vm2-0005Ak-Jj for guix-patches@gnu.org; Mon, 07 Apr 2025 19:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76999] [PATCH v3 2/2] gnu: llama-cpp: Update to 0.0.0-b5013. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Apr 2025 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76999 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76999@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 76999-submit@debbugs.gnu.org id=B76999.174406803419757 (code B ref 76999); Mon, 07 Apr 2025 23:21:02 +0000 Received: (at 76999) by debbugs.gnu.org; 7 Apr 2025 23:20:34 +0000 Received: from localhost ([127.0.0.1]:57503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1vlZ-00058Z-OO for submit@debbugs.gnu.org; Mon, 07 Apr 2025 19:20:34 -0400 Received: from mail-bn7nam10olkn2108.outbound.protection.outlook.com ([40.92.40.108]:10721 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u1vlU-00057i-3C for 76999@debbugs.gnu.org; Mon, 07 Apr 2025 19:20:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CMkLtBgvr2ZQvADPBfPnybSpT8byXlzvHrNNtf6ti2Z/fpz+3b+0O3oTFmqYmJRk2RRNrKX5zApDeEZVjdHQH4mHsVmyeqVizzA6v5GtmOfPbZeQMD31mgN5UrM0/xbJJCu1vkrx6n4g9YAJ25+My9+SvJ+YnBQuiftAU/34lTFg0gsG80rl0oRmLSfc7xGYD16to+WNzVte2hmpuOUf0CjmB3KJ1OCKAE4BBQT2PUrDinXJ7WExb/TS9GQsKVH+d83yn8riDJtnX/V7YUjutewQLW/mtPS/VQm9hQjjjtzP2Nf/QdTj2hsfAMNs2y6Gq9VSwZbjFIuaVVh2JF8iIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UCS6EvHXwK2X+1Lq2Qe7W2mbwLlRqC2MYilJuEPCu/E=; b=TERrrxlXuwty95bB+LD6/2OMqVYhhGOXA8Rsz9LhhoOKOyFzzvNX9+j44Dgt5u3AeuulpAJ8mn2o6lK1cEooIOxTy3RP0xkt8S3lGqv8PCyi5yR5+Zh6iQeOr2RpwC6SyXlvF/yNf15LWIJFPeRx/17UloNq1eorzbZJHriDlu6u+FHgkougR1WPn663NSncRoX+Olhux4jrDVnekTyNQZflBlqlJosIvc+yQFHqVXjxFrjA0QejGWZx2r74YRr3/iaKOQzv9y8onQ+OTYKaRgR838AF/F34vXN6RawmHSxZiFFWzxYSXb5cklp19+sNoFkcit8cI4jcdsnig4e5Qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UCS6EvHXwK2X+1Lq2Qe7W2mbwLlRqC2MYilJuEPCu/E=; b=rCElyXtHGg7RsYkIl26TEC1LtjfJWaaYXsJkicJQTnKVWh5zVKiQfeygNzwBG8KAwaZh4rhT38UFUMZLFxQzRZtwYztnhu/b//zTQLIYZjRQ12is0fDWX6AkKnOkR+1wD52+EjY0QZDpHb+vrf80IwlIBVd2AnN+zJVaj2HFJyzqb5TvQJw22NgGbMgYwHEXzj4pMWT/SVuSRZVLWGoQba2QagiOhyH04bW8uosjsGGeUWABg+Gp5u96GOxOZnio5XugegZkL6wZ+/uZ10mGihj2i1O1q0E61vQnuO4q2J5+1D2KLtVLjRh9dt7Clzmiw/RpDM+nNamfHoVcbX9wCQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH0PR84MB1833.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:160::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8583.43; Mon, 7 Apr 2025 23:20:18 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8606.033; Mon, 7 Apr 2025 23:20:18 +0000 From: Morgan Smith Date: Mon, 7 Apr 2025 19:19:39 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <8bd869846de6c8c3c11fd1b146d5e5e792cc6d39.1744067978.git.Morgan.J.Smith@outlook.com> References: <8bd869846de6c8c3c11fd1b146d5e5e792cc6d39.1744067978.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: YQXPR0101CA0023.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:15::36) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH0PR84MB1833:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bd11fd2-2525-422b-f01a-08dd762ac02f X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|15080799006|461199028|5072599009|8060799006|7092599003|10035399004|3412199025|440099028|4302099013|41001999003|12071999003|21061999003|1602099012|1710799026; X-Microsoft-Antispam-Message-Info: ZNyGuGyAHPb/B+dwNaJFMZnPHiCB8tPLjfkhiG268SvP8ih8wHd7ZJp9HHExKzd/mffdm/ECwIbX9yvq1qTnb/gVLmzdSkXAW0UU8MljEDh4ALiCAKBEvMLIf/QE8F+rId1FxGdJvheGiZxzXVANxrdkAc2ZuLJ8Ddl1gdyHozaH70QLgNcDF2C5bd5vc+mWnJj26SM+O5oY27uVi1lsKg5eXEzMIVhkWI7GW+43ZMOQPXeFz2YrQm1q0Ce+vFnZ/apm8eytP7OF0kfcjq+SCiCbIMNBDQA2QhU3m6Qve6b8QYP5xYKNiTwhDJaGFfO7SmanpneKEWSyg74Dwqjy5mbRA4ldaqs+pdcL72mZra1ODGOJi0CPsnEneQPN9N8RtNuwci9RULELKUx6H/jUGLkwrEVSbLSS5HzOW3X+o/s3SfCAli/ljYywEbLZgDk3wwyQ05ORLakqk+b+7HwV2zqqvNs9Inf2awMfPqIcV+HkOvigpQ9sxr02iA7vdgvn4g9UTxSIvEAsIFTmKjYAVRp9Fpzj0iugEUD/1odtO3Bm0CZxM3ybos/2Zwv9vIjoDi2KKC77PHTQhCwwpjfEY58FSZFGHciLOj6ZmvUNv3IUzbRJZKrVjyY5aFWEFPWN2fg5Gy/FYqNl0rHjzrubPtkPB4ctDmvebPSQ1MWDZFJGF2sBsUtTdEZQzyRovOt+MaYWvp5coDdCvsDpGP7j3cZH0JvWxoDHl4CyIsLva0KTCsqrpDfoDcFYMmjhmNtMhUSBvwTyO3lp7O+6XN0QpWQsa3EWbetT4pTq6IRSjE2apxwYKCmJZjLAaTUHH6PcaPbADpfbzQLeB28ftbCqd23wQunR5OL+tjRgm7UUVgFVZP0vZoFH8Llr8k7AOEHLOlTeARcuDqrGU125beV/b3njaNFjop/6r6QkEswMb2//goQg6/kmkwKJ/vpQ3uWy0RONUIxjcRkVzXl5Ybe+Rn+QbRH3lG/BWYAySn/A9TETxUp1aYAHSCa3RbNifzk0o4+cz8SiqrNx0ebwy7ogxLlvze/E12owArUQqcmAuU4XATS3BkEXxONPxr5nG8vkqLZQ0wFiAgwokxaQS7IqOwjtAas++S/W2ZuGuqGfK8loMV6eAMNJ7B8bmcmIPgTpBfPKlZGZU3zY4u/GGahSs8wD4Y9yUNdfNrBqBQoLurYVHT/oXfTEiNePg5RVAxRlIofVsXB5OHA3aVq+GgcajtwiI5HED4hCO6yaKFlL1dgzwdUhWg3XNIVgrex3EPk6xUZmxQ28aEILyt7iBnTC9dGaVRFfdho93DhYwnmN3xt5XDusPQTylY+2ZwXbrSM4DLC2xGs6eu2o5+ky493ORXJUIPmdvp3B1FZoocW3gYg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vLTAKW2knltVvvADQ784wbt0g6wbGD7TJj2vOFBYCbakx6lZyHYORZyAKzzlWPnZov+fGoK1JEZ/mx63uvg1y4Yh7wYGPMPptGz80tWXtYJxvCu7UCyHbmzavt+q07spPiqyz2Ng3/OwiDR7783SBfrTY3EwpA9ffq41uAS0NLL6SDOXdyyynBj0rZeKlCWOai1+PkPu88zSgGER5ytCF1uYIVK3UePx5LZjfeKxfDMGrOuia65iUGHu07ilyv6onl8Wga5MYoYJcdj7FyFlQKrUeu/mlqJwCJUtmI3GXDN2SrOtDmxDnaZ+3MzA9Dt5RieR4Nj69ue75FrCUgD5CnhTjY1INzjv28fi0QSMPdAesMBGckfROPPRRQ15JYIxSk7sL8x5yFDqkDszfkMJLWMgGJe9ixf8pUBhg3LRB7q25Q4Fcdjc6HrAwmb6JFurUbzUaEzZOZd2lpS3N/2pXSG8j/GuN4kmVuOdHfK7DptqG9l6um9+xHs5lL7rG98ci0Chz6jo1EsZYgrzbhFi5Th909ubf6wgRlRxVWPQ09YzxwTsJN7qNlL0tmEFrlcy881l0ZFqJkdJbJ7nUv3xGizYxX1qcZ2ReScsSndJhbtBdHlb6fdPV6s3afAFpL4HaLL/dc8JSyZOhBzg0Aqcc46KjyJxULJvfr68XOQqmLwWjG9vXgZU7tBn9ELYL2/5abmhdmk6ihvzuYNwD493wd4qLM39TlqinLG/VELYYv8eNezeZUX8VuY1DfT1oCBfxHUjjrvEmpuHZ296Bn6uaeOvAbOTXBM7pgsGV+vD3U9JQCMG1Vkdi6cbEJWiWpcD+pQini+8+7tkSdncXetzBaxcInQuGTW3Tqo/TQe59zIjeSg+xSvsahLTDmWZGXIiBwgVfe/A3deq82ITed+R/kwIEyn1kpI1RwmGR6k3DuvFY+JRscAz9ndFIwhk9u+L+MGbub3Lg1FKInfgdWvdJmEqgBk4VdLGHG1vuA7s+TrWiK9Wz2TbFP8k8EtGE+imJux4nrbS/w/Tk9fmXormi1qqx8fsjqqEU6WKa6ISgr0CkIoOzDRzo+wF6OO0NmpRHjIOC3bbKohfNxwg1Pb9G8Ty5B3qpTFIsxUSi9qu+f5zQLBEs7O1U2tFTZvWZ4sQyeUf5iKneEpcg1zcYmpK+V6qMoJKugVyh/wQoIXWyCr5F7SACUqBb0M5KirA71+Qz7pH0Gk0f18e8O7flcS+Xc8Oed9DyWALM4noQETW3fCZvIz5wWO6DsrqvAfbUNWp X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bd11fd2-2525-422b-f01a-08dd762ac02f X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2025 23:20:14.4749 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR84MB1833 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/machine-learning.scm (llama-cpp): Update to 0.0.0-b5013. [inputs]: Add curl, glslang, and python-gguf. [native-inputs]: bash -> bash-minimal. [source, homepage]: Update URL. [python-scripts]: Rely on upstream to install them. Delete phase. [fix-tests]: Fix an additional test. * gnu/packages/patches/llama-cpp-vulkan-optional.patch: Delete. * gnu/local.mk: Unregister patch. Change-Id: Ic297534cd142cb83e3964eae21b4eb807b74e9bc --- gnu/local.mk | 1 - gnu/packages/machine-learning.scm | 47 +++++++------------ .../patches/llama-cpp-vulkan-optional.patch | 38 --------------- 3 files changed, 17 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/llama-cpp-vulkan-optional.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6dc4b4f61b..65c21c2f0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1843,7 +1843,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ %D%/packages/patches/libmodbus-disable-networking-test.patch \ %D%/packages/patches/lib-tl-for-telegram-memcpy.patch \ - %D%/packages/patches/llama-cpp-vulkan-optional.patch \ %D%/packages/patches/llhttp-ponyfill-object-fromentries.patch \ %D%/packages/patches/lvm2-no-systemd.patch \ %D%/packages/patches/maturin-no-cross-compile.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index bd7a4fd81b..0b9ee4fa39 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -84,6 +84,7 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-tls) #:use-module (gnu packages crates-web) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages documentation) @@ -640,7 +641,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((tag "b4549")) + (let ((tag "b5013")) (package (name "llama-cpp") (version (string-append "0.0.0-" tag)) @@ -648,19 +649,19 @@ (define-public llama-cpp (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ggerganov/llama.cpp") + (url "https://github.com/ggml-org/llama.cpp") (commit tag))) (file-name (git-file-name name tag)) (sha256 - (base32 "1xf2579q0r8nv06kj8padi6w9cv30w58vdys65nq8yzm3dy452a1")) - (patches - (search-patches "llama-cpp-vulkan-optional.patch")))) + (base32 "0s73dz871x53dr366lkzq19f677bwgma2ri8m5vhbfa9p8yp4p3r")))) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DBUILD_SHARED_LIBS=ON" + #~(list #$(string-append "-DGGML_BUILD_NUMBER=" tag) + "-DBUILD_SHARED_LIBS=ON" "-DGGML_VULKAN=ON" + "-DLLAMA_CURL=ON" "-DGGML_BLAS=ON" "-DGGML_BLAS_VENDOR=OpenBLAS" (string-append "-DBLAS_INCLUDE_DIRS=" @@ -690,32 +691,17 @@ (define-public llama-cpp (substitute* "ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp" (("\"/bin/sh\"") (string-append "\"" (search-input-file inputs "/bin/sh") "\""))))) - (add-after 'unpack 'disable-unrunable-tests + (add-after 'unpack 'fix-tests (lambda _ ;; test-eval-callback downloads ML model from network, cannot ;; run in Guix build environment (substitute* '("examples/eval-callback/CMakeLists.txt") (("COMMAND llama-eval-callback") - "COMMAND true llama-eval-callback")))) - (add-before 'install 'install-python-scripts - (lambda _ - (let ((bin (string-append #$output "/bin/"))) - (define (make-script script) - (let ((suffix (if (string-suffix? ".py" script) "" ".py"))) - (call-with-input-file - (string-append "../source/" script suffix) - (lambda (input) - (call-with-output-file (string-append bin script) - (lambda (output) - (format output "#!~a/bin/python3\n~a" - #$(this-package-input "python") - (get-string-all input)))))) - (chmod (string-append bin script) #o555))) - (mkdir-p bin) - (make-script "convert_hf_to_gguf") - (make-script "convert_llama_ggml_to_gguf") - (make-script "convert_hf_to_gguf_update.py")))) - (add-after 'install-python-scripts 'wrap-python-scripts + "COMMAND true llama-eval-callback")) + ;; Help it find the test files it needs + (substitute* "tests/test-chat.cpp" + (("\"\\.\\./\"") "\"../source/\"")))) + (add-after 'install 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'remove-tests (lambda* (#:key outputs #:allow-other-keys) @@ -723,12 +709,13 @@ (define-public llama-cpp (string-append (assoc-ref outputs "out") "/bin") "^test-"))))))) - (inputs (list python vulkan-headers vulkan-loader)) - (native-inputs (list pkg-config shaderc bash)) + (inputs (list curl glslang python python-gguf + vulkan-headers vulkan-loader)) + (native-inputs (list pkg-config shaderc bash-minimal)) (propagated-inputs (list python-numpy python-pytorch python-sentencepiece openblas)) (properties '((tunable? . #true))) ;use AVX512, FMA, etc. when available - (home-page "https://github.com/ggerganov/llama.cpp") + (home-page "https://github.com/ggml-org/llama.cpp") (synopsis "Port of Facebook's LLaMA model in C/C++") (description "This package provides a port to Facebook's LLaMA collection of foundation language models. It requires models parameters to be downloaded diff --git a/gnu/packages/patches/llama-cpp-vulkan-optional.patch b/gnu/packages/patches/llama-cpp-vulkan-optional.patch deleted file mode 100644 index 43a49b6a02..0000000000 --- a/gnu/packages/patches/llama-cpp-vulkan-optional.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: Danny Milosavljevic -Date: 2025-01-29 -License: Expat -Subject: Make Vulkan optional - -See also: - -diff -ru orig/llama.cpp/ggml/include/ggml-vulkan.h llama.cpp/ggml/include/ggml-vulkan.h ---- orig/llama.cpp/ggml/include/ggml-vulkan.h 2025-01-29 10:24:10.894476682 +0100 -+++ llama.cpp/ggml/include/ggml-vulkan.h 2025-02-07 18:28:34.509509638 +0100 -@@ -10,8 +10,6 @@ - #define GGML_VK_NAME "Vulkan" - #define GGML_VK_MAX_DEVICES 16 - --GGML_BACKEND_API void ggml_vk_instance_init(void); -- - // backend API - GGML_BACKEND_API ggml_backend_t ggml_backend_vk_init(size_t dev_num); - -diff -ru orig/llama.cpp/ggml/src/ggml-vulkan/ggml-vulkan.cpp llama.cpp/ggml/src/ggml-vulkan/ggml-vulkan.cpp ---- orig/llama.cpp/ggml/src/ggml-vulkan/ggml-vulkan.cpp 2025-01-29 10:24:10.922476480 +0100 -+++ llama.cpp/ggml/src/ggml-vulkan/ggml-vulkan.cpp 2025-01-29 22:33:19.955087552 +0100 -@@ -8174,8 +8174,13 @@ - /* .iface = */ ggml_backend_vk_reg_i, - /* .context = */ nullptr, - }; -- -- return ® -+ try { -+ ggml_vk_instance_init(); -+ return ® -+ } catch (const vk::SystemError& e) { -+ VK_LOG_DEBUG("ggml_vk_get_device_count() -> Error: System error: " << e.what()); -+ return nullptr; -+ } - } - - // Extension availability