From patchwork Mon Apr 7 23:11:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41424 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 E942C27BC4B; Tue, 8 Apr 2025 00:12:22 +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=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 1CB5627BC49 for ; Tue, 8 Apr 2025 00:12:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1vdL-0000Hr-OS; Mon, 07 Apr 2025 19:12:03 -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 1u1vdK-0000Hd-Fa for guix-patches@gnu.org; Mon, 07 Apr 2025 19:12:02 -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 1u1vdK-0006bU-5S for guix-patches@gnu.org; Mon, 07 Apr 2025 19:12: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:Date:From:To:In-Reply-To:References:Subject; bh=1orHbSuSgNJomwD/abCwI8wwqy2Raybs6+063fqK5fc=; b=N5YyKKs/mzWgP4nDB3++qEOcBRDayNXCXAC8wCfY7jP5ph0LDYmJb5aW+ShHRb917jURyMXSb9fMtnaXNjeaJeyrQNyQxg9Gu0YpxW8JdbARtQrhATge+wZpqPZwHbnNwPSpllNul5SkU8u/9sHXtDebK4/e0ibZ3jY88O+Lm9LraspoQX0lpT7fYgbfXIFjSJJYGTUSu09sV8rkCUGGmYVAhBUKSzJn2ypP1Wp6sIlgeJ4pRSXec4C8qSaQMU6FAVYhM6aT58mZZTlUSnmxdsaIp3s6kQ/kMDBwuf8xPh7davfiuM+hreejrdT7fXpE3gmnoBS7jzWEVaWwaRa+qw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1vdJ-0004SM-PZ for guix-patches@gnu.org; Mon, 07 Apr 2025 19:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76999] [PATCH v2] gnu: llama-cpp: Update to 0.0.0-b5013. References: In-Reply-To: Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Apr 2025 23:12: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.174406749217011 (code B ref 76999); Mon, 07 Apr 2025 23:12:01 +0000 Received: (at 76999) by debbugs.gnu.org; 7 Apr 2025 23:11:32 +0000 Received: from localhost ([127.0.0.1]:57483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1vcp-0004QF-2z for submit@debbugs.gnu.org; Mon, 07 Apr 2025 19:11:31 -0400 Received: from mail-dm6nam12olkn2010.outbound.protection.outlook.com ([40.92.22.10]:31653 helo=NAM12-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 1u1vcm-0004Pi-4p for 76999@debbugs.gnu.org; Mon, 07 Apr 2025 19:11:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cftnDwJ3St62lNuSbgBmmai2TjflYZY2LZl02nSrN6CE7vSsu6h/AS6aA/0j25UXTtgD0oWz/837lsHxrz8Qfy6I7k6951himBePkVVsfBSZS//8A6I7PLLxnAtg0qcLXaRZX6wGu5rUhAeEEfKWIUlIaoAI4EBMcxOztOktOo/DgaZRvVXwtRipszWrTlnEXoIg02Q/TMQ4uQm4/flFz3JCZRJoOOlN0uW0JHBhFzhQPQnWX9NAUi85Ch3nBqVEDgJEi5n9C99UOd9DWc7wFJtUyVz0DCM0oYXlUVfCzSOWEOsFA0ZTGTFIuq3b+W738PcCkxbsn+VIz/gzW6upZA== 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=1orHbSuSgNJomwD/abCwI8wwqy2Raybs6+063fqK5fc=; b=LhdqrDyTjKPtfsjmxvkacY5iT1IxrMopYPW9kInLtYfc4h7E6OwkAlarwaEI4crcqaz0CGNClfC0PiGbe7E5g4xFYRG2dIjV2CVDCfaQsTUfb1OEBeEwsv49Q6dJsvAkIvqLw0PLwjo2qrznRpKRDwaFbwBMFnrgADl+xh9xSnn+u7yrMgPogMSWMkZq4BBKotECg+lQiztMQgFOWfnKz+s076ap3yYLEV2jz3Jg3W5xwF6AI4tMrhc5vqyiTB3qYzKQww7FtGbdRrQIEiPR1uk7SNdVAiZQnh44TIj1om25TE43G2WRBl9j72bezsjlCeApmNBbGaX6mKEaRDMSMQ== 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=1orHbSuSgNJomwD/abCwI8wwqy2Raybs6+063fqK5fc=; b=rJRucaU0yOE6e5zONuauGU2mBbaslol+ysiMWdBLmCJMg1fSKemEeHwzefPgljC89iXrhHldYoI4AI8FxyLvbGdSzR2zWBmkJs7xpdsz5kSg5S/eJEL+R6Dj0ny/7i+HmAdJUEnKFhbUszxmaZaUCE49qV7VbdT6THmGKKrduMWQXkhrI9Y2sg32MJDUUGGbnUCHTIkLvNd3gqtod6OPD/r4meIlNdVDTssUvRDpHSptchP8QNf9hQ97ZOsByUKA3e9HSeU3/fXvElvOpqS5Q9OsvilKOHcl2r1+b4KdNzj2U0N6wTZtsNeKDBtHdOxWcj+djA4BcXlrEv/ina+MkQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SJ0PR84MB3174.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:a03:44e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Mon, 7 Apr 2025 23:11: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:11:18 +0000 From: Morgan Smith Date: Mon, 7 Apr 2025 19:11:08 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: YQBPR01CA0008.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01::16) 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_|SJ0PR84MB3174:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d46a2fc-eeaf-4e11-e55f-08dd762980b9 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|15080799006|461199028|5062599005|7092599003|8060799006|5072599009|1602099012|4302099013|3412199025|440099028|10035399004|21061999003|41001999003|12071999003|1710799026; X-Microsoft-Antispam-Message-Info: slw5gLWydzfFAvYWZ1U+qWmW7KQqQBqfuUNYDMUnPM/2lF+44hI4ljl0DpmKziGhIYWzh3kUvsk7d/0vu/SB49YzAGrvw9tBR4Y3WaVq4ipDPdA/2/P5C84HOA5fWRUOPkqg7SFsSBIJkKMtOpov8Jig+fQIQ24rWwtnLL6Yh0GyKncbHffrhftCjaAj/nqy6iJgoZ7xQ86XO3+V5AxQ0b32KjWyanmaZHNselq5uZnSjYcklo8AN2b4Gzoy7UEfEZNTHEenPYWjPShhlQQvlBxBN40PMFLmCUviZNBzZW8vlr3WSf+lx5M9ogw4/BJwGzG0iYJFBB8JsCCv3OFEA9K37fs76pUXQrXEOPn/4AzLo51f1xBOWLJj1td0QWgCralYmKPq27BikuCIpDJc+gPkCYpbon7/YbFUEO9DJ/qrXPL/3Lit6ZgGB6wtiAIqXycqprXHN0i9zIzJEL11EHW9OhlY2zkrL/V2k1AFx49buecuvdY7wSDu+KN6r5IbsbGVbHk0k8xbJ9L9SQnr7nMODBZRMduz5uojQf7wdfNDg59as47V38vKlUJDM1WJOMPv1J5Wnk+LTaLXOUBsWkelX9Sveb0Miyl4dvU61xUmfUCyolIZGvcbh38ZDtSIvpnBsKxHxchYPZ1rbRomnlA1zpvtjdztzmDQu7kHG+SHnU6rCwGxhK01V6pegX3g6Ak2LsX6RibyPmW27UFij8FCwXD8h8b+GQCAbcQkyxGKuxh8hpeReMRNq4ouEA6LCM7XwcKfQ7XnYFYlDTPm9VhF6furb+Zv9SzSKl0S/0lvRP8YsknGy29k/Vy4xs+bvYwbbeb0mTB8ANNUCamKVGksCRWAy8BtDgAoLnBS8zWsxKcCT1FcFWfaSyIQ8efsAZ5042mxAQZX7PkEz+tSOZbf4GigovfSjA+4FPNYrww/NjjhaBeloX2O6XfR1aBOBJ4UB5rJwZ4TAEKVQLV+mRj3v2zDHYO25/6KhaHYXAYVJDBl0Cvww+r4H2d03cj0XUb4We9IsWCBiypERXxJxUeyQ7VWCw1dIcMnX9zRIEpK6Og0irrL+8kANA3hn0QZWuGzePtctkwN79CkTicPpTa2/T+x3Xa5qq3QeoEEn4X2AdATkahXeZ5DnoMnVXOFOEhu0Yz9ANjCeM9g29XRegJ8Y42kYAJiyddLsHB7s9Kk6S2qGOAr1bYqzwXgtSxnvD0zAvB17nx2Dq+1gEkDDt84h4wNlmlj7qepDHugleNFyhGGJYnQWF7CiFKupSa0pJX/iIGUyqwr9OIpPo7agcLNffsbArchVwQIrnmtGVfrtLRRK00O6bjWv/7Z6iwJWZcn6bNaA2h+wOnvmgL0+pXxtFb1Onx9JWsc62nTW/Ujrpyjw01XfTA8JzFx/mok X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hw8LN82VxfDx4/jABSzYj5Z9XOrjoQ6JvhVbuHXvBvvG0AxEDgYXjVbBQ82//juTXa5eUFaV/hx/3PmVg0sn1NK8ZdJ6BV3icixtv3pvxNW7JDt8/y5OFBvTH30XYmrYsyIQOsB8WIVbxSUKhVyFeBrOe2JPTK2Y9OWdp+sWbYNts+V2RQg23y38J85DQuAX2TV7yT/SM/eje8LUImqBB+vGgcOp6H1aELbwILSmHuNs3bwnItKib3z8YyW9ska4KKDXluBMZ7V8fVXW1KQtcjYNY5HKSGTp1t8woESUborjT467gB9lpf61tnhiLUXPf6DYIco6czwMiCgpnPAHuImdYYLV2qtP91Jb2xZ19qZjlTK1iVfGHC1ARwE4jvQ23PzsGg0SI4FYwlWpW/5DB9W94pIYBXaRC0DLS9OA4qcAS3YZdIYSb/wbJEIXSZxW1230uy3kWgt/RLHaf7RJVu4HMPn2qDEfea5RET3D6Yd5RA6SNmxNSRVAkbeDU4FlR7m1oiWG1ReF8i6h9sSw9duCkZhKrZowpgIEjyjDXN9fqwoM1tCVGAP3xtcG7dc2GmmJb07MTL7/qZEToyMgj6QqXoHsMABZFnLKl1NxP9wjM4p1iOZKmwgXzpZHg2450gMWAURwIR/VWoWW7eTUEd3y+0BdEgziwckQauf3NbNazkiaiN8smUT6bd0f2+NGh+R+VZ48l5xHdxedi4uqAZllh9Z39Fn13fBy6vfCjieuhIRXcg4MQmRB0EAqGojsJoj6sF4pKk4+ebBWDkYl1oj4HU01oH1PUX4FrsTxLk1M24oCS7UDOJFrJINhA4uS8qcC17TEKFfZDx/gpn5QpjUE1PH/JSbc6YcQLF1Ij1212KWYJHc6BpkQF/9kr96q44xsShzGObKnfvefTT0fMe/e2Du+3bT2EFBwbsZH9pk4dguFnqiHUCcn5MVJgcqzKJwPQZmFDmlBCf2XGHQUg27lyH3Fuwt0REN2/QpUPqalVFMzUllZd7RaQ9zSvXK1a7Yls4yM3cASbjdUvaU1yYjaAFM9qgxYDopce0WMNqtUm/U4X1D7MW2+o94nWUwPIS4i4C+AUwEKI9WNgau18e5EESik3ScYbAcWYCPAcz7uAZsum36acX+ivqnJYC/bTRA2wUUN00G+iP6S1MDeUAgpXLZ+UtdxMKgJuu4DYFX9vbr/7xq+jibgE8Mb6+vWBGs4vGLoJn+611NcpU5bwcoUq/MhJrjEFlCQi0wfZiplyaUK4AhBatqqmlI4kjGZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d46a2fc-eeaf-4e11-e55f-08dd762980b9 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:11:18.4723 (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: SJ0PR84MB3174 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 base-commit: 666a6cfd88b3e5106a9180e06ea128db8084be0e prerequisite-patch-id: 1e2c478cf648ee8c9a3b1af55543e1b96ff24ec7 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