From patchwork Thu Mar 13 21:18:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 40142 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 285BE27BBEA; Thu, 13 Mar 2025 21:21:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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=ham 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 539AC27BBE2 for ; Thu, 13 Mar 2025 21:21:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tspzH-0003ql-Ca; Thu, 13 Mar 2025 17:21:07 -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 1tspzE-0003qH-1e for guix-patches@gnu.org; Thu, 13 Mar 2025 17:21:05 -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 1tspzC-0000br-0e for guix-patches@gnu.org; Thu, 13 Mar 2025 17:21:03 -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=2EOLBQ+ag5m7cYtWX7/YHeCCvWnl1q8fIadrxQGBG9s=; b=TTMmK/DBZ78Akb7/vUxaoGs75KJ1n715195x9lIUjhx7l41OoJ6/mrmcLGtRBO3HU5aTLYorj4oZivsodaqz7TO16BMtQvbfNKSOqxf3XmBCKtc76wycvvmk8HZyZ7EXreFfssDih8UWalfUvyjpyOd37VEUTOQ2KtqaBXq02Y7+Z7/HbiHuDcf9CcdAWEihd5exv/we6lozpyJTlrShWup+iB3sSw6gZk+0V0rGBiJocRsfmEH1WrtKatD91hzd1RK+JKYi7zaJG4731l6SeaYvO3Dk+waPPhYwF8S0ZLGraIiSfc7P3VSbQsUzhqAMSxWE5YtEc39yVaUyKIuurQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tspzB-0006El-S4 for guix-patches@gnu.org; Thu, 13 Mar 2025 17:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76999] [PATCH 2/2] gnu: llama-cpp: Update to 0.0.0-b4882. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Mar 2025 21:21:01 +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.174190081023637 (code B ref 76999); Thu, 13 Mar 2025 21:21:01 +0000 Received: (at 76999) by debbugs.gnu.org; 13 Mar 2025 21:20:10 +0000 Received: from localhost ([127.0.0.1]:58524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tspyK-000682-TY for submit@debbugs.gnu.org; Thu, 13 Mar 2025 17:20:09 -0400 Received: from mail-dm6nam11olkn2081f.outbound.protection.outlook.com ([2a01:111:f403:2c15::81f]:4577 helo=NAM11-DM6-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 1tspyG-00063n-PL for 76999@debbugs.gnu.org; Thu, 13 Mar 2025 17:20:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hRJyoV/Z+/7RxBaNW5npa6TUErwJ1nGCfrVj188wGAgznpaBoy5SB83+Pfhj19Ag6ejWaJJtIqznYgWP6VfMjBO7dkm2mpWDsMgOpVaeDsMuqagMQTOFnqR0ncW7HS04+PDgs6kFWfRWJ1MTAd2kvODLgF5z26MPy79w8Pik877eHxXwCVUzH1UID1eTWN19huqAjfsIPEGaBQ3POellt3vMVQYLyGLuMflGC1HDEP2J8zf4tzvSqObh6FFTu2UDrkuYbeWuUfYHq2cvXiPxJ4wKuqNJ2Y2lcJJOmeAadNW7+oZwCSDMmmDTHCGb5FPzU+kAj1yvsEw5A/nR8pF1Mw== 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=2EOLBQ+ag5m7cYtWX7/YHeCCvWnl1q8fIadrxQGBG9s=; b=yN+9u6z1euerY7hXQ8ewfU8A0XCYnFcDfEFWK+tXWyS0AJalCVoUk6dAzPTROfXM40AFVGyM+bl+R3CUt99a8/Mqf4Xwa+5RiQN4N2tcGfES5Jbo39Ji1mu8KPdwPGfb9Q2dAF6NZnHz/9VNamtnvlqjlJe3IAYn6IYhdckQEppiEvMBYpZlIvC1Uqw3BYfwnoWMfMfXEYuCz1ytLmtEicrv811JhNLVpVCvMT582xmyp8m8vMiZVh+OOpZ7qyDKsX6PHV+EtZkDC839bOaWaKvTWecIAOulDhkHR+7WkrZ9LJ4DS/P/v+Lz/ZqyAtVFSx62c5t0U8hVl3ArCaEiXw== 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=2EOLBQ+ag5m7cYtWX7/YHeCCvWnl1q8fIadrxQGBG9s=; b=UfniKKseUDbbd+pqsquhqm3J72Q4svrgvw5nNYJkyjM+WooAVoUG3G4mvIeJ8rLUMvJG3TLSNMYFls1pMHquHpnexihysq3fHjHWKD1rudxOKx4yIBap472APZ4MVzzkEo4e0fsK5asSrmZVCZIsUdE2Z4+k8JtGrcLsfGO4xdoEfN0ALC6srNbAn4JFve6hl655Mc347Okqr1x8iTnpFdPOxhVelSOm2Z90YcXC5GjpO6COF/sUj8mkO5+FAA6ICKcdq3jtHd4WZfPiHB9l2CY1RLcFoJWhtGyW8A08JLchLiwlBIhp2j0pyV2oyrrpetgS3v9QsBzQV7DLBuM6hg== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by MW4PR84MB1778.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1b1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Thu, 13 Mar 2025 21:19:58 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%4]) with mapi id 15.20.8511.026; Thu, 13 Mar 2025 21:19:58 +0000 From: Morgan Smith Date: Thu, 13 Mar 2025 17:18:52 -0400 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <0dca61ca84a0608f22bbc78b8174153ff4795cee.1741900274.git.Morgan.J.Smith@outlook.com> References: <0dca61ca84a0608f22bbc78b8174153ff4795cee.1741900274.git.Morgan.J.Smith@outlook.com> X-ClientProxiedBy: QB1P288CA0023.CANP288.PROD.OUTLOOK.COM (2603:10b6:c00:2d::36) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <12592725f06e3827e04fad80dd02244a06190d5f.1741900274.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW4PR84MB1778:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a689cb3-717e-43bc-dd89-08dd6274ce7c X-Microsoft-Antispam: BCL:0; ARA:14566002|15080799006|7092599003|5072599009|461199028|19110799003|8060799006|41001999003|12071999003|21061999003|1602099012|10035399004|3412199025|440099028|4302099013|1710799026; X-Microsoft-Antispam-Message-Info: fEkRfgWgTFNSuc5MdaOumINtHvr6wdWAEXyRX7Czc+J1tK9eIrZ4E6bbAbtRZjiNiTmLpVlzaWIkgY6YQCTAvWVw60Rcb6Wki808wpxiDGz/NF131LorjWd/gtKg5k/q6eT8VjlnY3/VElShWZuUnKKCxB/HJpywXzPCV1WcGrYfHlE5o38Rkir04Uy3RzhleEik5UPIIZz5YRrMRL0OniCZn7ICYwoq8kbCzX3YUxl2EDwTa8mThHkWOC3Ld3l0SHbSU7tde+G9SS3jC4MoFxI5Uqc53BsUADdbvWKY5x+z4PzHg0LiaDATUMKLBko8q7rxKZMAAtSC/ecM8GXhd2NdhA8MYFGYyE6vKaxkTaAAQae/DrdIJ3BK4KJomH5Rj3yDRrfd9JZkRv1MqXqlMpVlN9ANf37/wBKWgFoKYJP2x57QWrdJy7pCtuucVooqRiMA/7L/JfUA9yr8d4HXOKZToXU6PCPb6CXKDwmyG4YqV0Uw6Ye7uOwKYSy+C1xsf0dZ2WLLDH27oYEbcbUSY9tfbmvtvP9HLJbodrLgIW86tH8yqzUDD2eon3gvusbXJh9chJdl7TTVdBjgwlwLALhGvcureOglEGlC6I+gg6fDYwYViL/Eu5IdTZe4aR7IXD51O+y1YAd9hPLH67fi9KsUJrH3YnOB8tMenVHNKjbOmyuSfoo7SmsMKbFcgA3StusUcQDZPkI3595Y0xMuaJspAa5rVq/h6jKHzGvJ2+ziBiEniop1G3+Qq+H3cDghDxGR6/bIqdRh1Gqbf7ud7i+1XIJwEG8ULKDfcWIZ25tzlLuxn0GIwA91qj4TlWTfeABczslGTsoOw/Fijm+JjzTw0gZTM07haVa/1fZcpv0DKHy54Niawcjy52rnL53jNrwJa/H6pyjxhJ+pGcsoP/A9j4G5wpD5KeXy84nTMYyzN/3NkkTSzIe81OIhu8yoffc0Ry/xnrVyQxDeTID7DJTLk3C3/zR2wscyg0OTQJWY5U8743auUhFK4E4d5ntN89F7DKkG41ufPufC/M3VBWz5umO+z2upLiJdStEDmyOdRhzv0v1P+OFXD9xrpkrS1V46N1EeqF2lY2+s70cYUEmZQcN+iz12O6FwOqXvHZE2IYYxxNU+NgYpvEc/p7s534oyfAyi6+Zdto00qI1IL3Nw78IfYpUI7iJEk+PyWrMZ5k/3VQ1bcCzWRfoHBmpLSjfGoX5oqVdTzDnuJnsSPN+1LpFY6RFy5JuvhwFOfAqfNa/lhcHPC6byjEcYSA2sEX3jAZ8mHlcr3Eh83qc32OGsli3sjbzMPjE7+zYa9RYH9VFHFwDBb1lYDkymYwgT9dpQAZm4e9ueh02pXreVVQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RcB9QKF2Mfgpp0oYZRMivUQ8FEzCruYaOKGBRw7uh4X8LRIequcjEWTesneZrdPJLRMKEcpiW6eJT82LWeRpGivVDgfve7koWfcS+ncsGPut4aLVJfq641EovN9DYThOXsl4SU7XmpbIpa/YA5Mk16hqdBBU67kNzu01gyGRUYnlI3M+/LWfP37Xw2I6vxEP+52fqQQQ5ccvK1RVuGkTRacL1Up9/Gxfugp46YnElAbVaRt5VzPUWXnG8LqWYma9QuTysCvy7afptbM8NqkCM16vgMen59CWlXMWvjOaJy/JtTeAzrueXoK0z+lxABcgUsbu+1oz6ETFDwwA0va23ofoCg0gbNOBDPQ0OvppFso9ASjpIrAdgsSk1PblW98tSS2ttBxWtA6AKQOdTXe169R9mpJOlfD5lSH1QMsafwaiW9zu7ZFowoPahj2P9losVaBCHRF4lFzZhTHep7DKBPI2XquSEvGsd+8txKm7gg06tIS+5wxItVVb11G5mEijqWAMDQZr6Lm1R5mTcZTRssTV3wnRM8x65lxCTfAxibt0vQx/D8FIgz6K7qtl9+lQYhl0c7TredNW01J3uwuNlSHGru/XK71Nnt3G+I9e5vOvlucnb94s48kVXhLxVVwmzoPOgoNxkKr8/e8siVKPj4DFTsP7rIdqy+D6a9LFznsi5fGXEEj1J+lVxiEOAIm/CVRVhkKiN1MB+8MTRP1UP6dITe0MSHARXjMaTDfy9tLF1alMYqQ3dz1CeZ0L5A9sVqssC3772mgGvTBPrT9rbnNkPc0AAtAqe8V+yFEfVRSXJ6JqUhgLWrIsw2Z2zCgCx5hsyhwdmDEG6OTvAJPU3l5KyUYoj3zgPYav57Zpf/QjR6cDwLoNAJNRYyVV2w4MkkUfOsPZjrZzPnJppR6oVWuC2bY81iJI/hIVS7CPcQzcpzty7rMTr2AxKBMUHpmk/CM4kyw2tsdzZ8Z6Awdn7ty+Ih+nBou8msGkwm3yf9PVSCovl7aWMzOdzkWFRDQ54q94YCX31H8g3lXj5nwXMtO2HJUA5dAwcmfJ+cDDYnMYG0Uza3n+n+ihOuhkCC9QWleRU2gKnlKG4v990DUsIkozNzJqMyZ1zWlUmVdSNrHywlQk5b50Uni2aenINGpBZF2ymLARcHfLY1BUG6rojwDbfFIu2JFioF0b1gKhIe21i+i2q3B+SRyMsdqeQeuRmpZKfrkQHKGIkrzOw2/10OakMca/t6C+f/hIscnT60JqlZYlUlcsh4JxVKVQOFtcOKCtJv2Uha5R0t0FVxov5Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a689cb3-717e-43bc-dd89-08dd6274ce7c X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2025 21:19:58.0006 (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: MW4PR84MB1778 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-b4882. [inputs]: Add curl, glslang, and python-gguf-llama-cpp. [native-inputs]: bash -> bash-minimal. [source, homepage]: Update URL. [python-scripts]: Check that we can run them. [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 | 41 +++++++++++-------- .../patches/llama-cpp-vulkan-optional.patch | 38 ----------------- 3 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/patches/llama-cpp-vulkan-optional.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5425095e1d..dcff631515 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1841,7 +1841,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.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 ee5feb58fc..b173f54fec 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -77,6 +77,7 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages cmake) #:use-module (gnu packages cpp) #:use-module (gnu packages cran) + #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages documentation) @@ -585,7 +586,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((tag "b4549")) + (let ((tag "b4882")) (package (name "llama-cpp") (version (string-append "0.0.0-" tag)) @@ -593,19 +594,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 "1mhh4293lgvyvyq58hpphqk18n5g2zadafpdf9icf7xlj0cf7bqc")))) (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=" @@ -635,13 +636,16 @@ (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")))) + "COMMAND true llama-eval-callback")) + ;; Help it find the test files it needs + (substitute* "tests/test-chat.cpp" + (("\"\\.\\./\"") "\"../source/\"")))) (add-before 'install 'install-python-scripts (lambda _ (let ((bin (string-append #$output "/bin/"))) @@ -657,23 +661,28 @@ (define-public llama-cpp (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 - (assoc-ref python:%standard-phases 'wrap)) + (for-each + (lambda (file) + (make-script file) + ;; Run script as a sanity check + (invoke (string-append bin file) "-h")) + '(;; involves adding python-transformers package which looks involved. + ;; "convert_hf_to_gguf_update.py" + "convert_hf_to_gguf" + "convert_llama_ggml_to_gguf"))))) (add-after 'install 'remove-tests (lambda* (#:key outputs #:allow-other-keys) (for-each delete-file (find-files (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-llama-cpp + 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