Danny Milosavljevic <dannym@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 7 Apr 2025 23:20:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 07 19:20:34 2025
Received: from localhost ([127.0.0.1]:57503 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u1vlZ-00058Z-OO
for submit <at> 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 <Morgan.J.Smith@HIDDEN>)
id 1u1vlU-00057i-3C
for 76999 <at> 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 <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH v3 2/2] gnu: llama-cpp: Update to 0.0.0-b5013.
Date: Mon, 7 Apr 2025 19:19:39 -0400
Message-ID: <CH3PR84MB342425DC0CB8C55796AA75EDC5AA2@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <8bd869846de6c8c3c11fd1b146d5e5e792cc6d39.1744067978.git.Morgan.J.Smith@HIDDEN>
References: <8bd869846de6c8c3c11fd1b146d5e5e792cc6d39.1744067978.git.Morgan.J.Smith@HIDDEN>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
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: <f4bb203a558c80312ffdecd70c1b404644274369.1744067978.git.Morgan.J.Smith@HIDDEN>
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: =?us-ascii?Q?ZNyGuGyAHPb/B+dwNaJFMZnPHiCB8tPLjfkhiG268SvP8ih8wHd7ZJp9HHEx?=
=?us-ascii?Q?Kzd/mffdm/ECwIbX9yvq1qTnb/gVLmzdSkXAW0UU8MljEDh4ALiCAKBEvMLI?=
=?us-ascii?Q?f/QE8F+rId1FxGdJvheGiZxzXVANxrdkAc2ZuLJ8Ddl1gdyHozaH70QLgNcD?=
=?us-ascii?Q?F2C5bd5vc+mWnJj26SM+O5oY27uVi1lsKg5eXEzMIVhkWI7GW+43ZMOQPXeF?=
=?us-ascii?Q?z2YrQm1q0Ce+vFnZ/apm8eytP7OF0kfcjq+SCiCbIMNBDQA2QhU3m6Qve6b8?=
=?us-ascii?Q?QYP5xYKNiTwhDJaGFfO7SmanpneKEWSyg74Dwqjy5mbRA4ldaqs+pdcL72mZ?=
=?us-ascii?Q?ra1ODGOJi0CPsnEneQPN9N8RtNuwci9RULELKUx6H/jUGLkwrEVSbLSS5HzO?=
=?us-ascii?Q?W3X+o/s3SfCAli/ljYywEbLZgDk3wwyQ05ORLakqk+b+7HwV2zqqvNs9Inf2?=
=?us-ascii?Q?awMfPqIcV+HkOvigpQ9sxr02iA7vdgvn4g9UTxSIvEAsIFTmKjYAVRp9Fpzj?=
=?us-ascii?Q?0iugEUD/1odtO3Bm0CZxM3ybos/2Zwv9vIjoDi2KKC77PHTQhCwwpjfEY58F?=
=?us-ascii?Q?SZFGHciLOj6ZmvUNv3IUzbRJZKrVjyY5aFWEFPWN2fg5Gy/FYqNl0rHjzrub?=
=?us-ascii?Q?PtkPB4ctDmvebPSQ1MWDZFJGF2sBsUtTdEZQzyRovOt+MaYWvp5coDdCvsDp?=
=?us-ascii?Q?GP7j3cZH0JvWxoDHl4CyIsLva0KTCsqrpDfoDcFYMmjhmNtMhUSBvwTyO3lp?=
=?us-ascii?Q?7O+6XN0QpWQsa3EWbetT4pTq6IRSjE2apxwYKCmJZjLAaTUHH6PcaPbADpfb?=
=?us-ascii?Q?zQLeB28ftbCqd23wQunR5OL+tjRgm7UUVgFVZP0vZoFH8Llr8k7AOEHLOlTe?=
=?us-ascii?Q?ARcuDqrGU125beV/b3njaNFjop/6r6QkEswMb2//goQg6/kmkwKJ/vpQ3uWy?=
=?us-ascii?Q?0RONUIxjcRkVzXl5Ybe+Rn+QbRH3lG/BWYAySn/A9TETxUp1aYAHSCa3RbNi?=
=?us-ascii?Q?fzk0o4+cz8SiqrNx0ebwy7ogxLlvze/E12owArUQqcmAuU4XATS3BkEXxONP?=
=?us-ascii?Q?xr5nG8vkqLZQ0wFiAgwokxaQS7IqOwjtAas++S/W2ZuGuqGfK8loMV6eAMNJ?=
=?us-ascii?Q?7B8bmcmIPgTpBfPKlZGZU3zY4u/GGahSs8wD4Y9yUNdfNrBqBQoLurYVHT/o?=
=?us-ascii?Q?XfTEiNePg5RVAxRlIofVsXB5OHA3aVq+GgcajtwiI5HED4hCO6yaKFlL1dgz?=
=?us-ascii?Q?wdUhWg3XNIVgrex3EPk6xUZmxQ28aEILyt7iBnTC9dGaVRFfdho93DhYwnmN?=
=?us-ascii?Q?3xt5XDusPQTylY+2ZwXbrSM4DLC2xGs6eu2o5+ky493ORXJUIPmdvp3B1FZo?=
=?us-ascii?Q?ocW3gYg=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vLTAKW2knltVvvADQ784wbt0g6wbGD7TJj2vOFBYCbakx6lZyHYORZyAKzzl?=
=?us-ascii?Q?WPnZov+fGoK1JEZ/mx63uvg1y4Yh7wYGPMPptGz80tWXtYJxvCu7UCyHbmza?=
=?us-ascii?Q?vt+q07spPiqyz2Ng3/OwiDR7783SBfrTY3EwpA9ffq41uAS0NLL6SDOXdyyy?=
=?us-ascii?Q?nBj0rZeKlCWOai1+PkPu88zSgGER5ytCF1uYIVK3UePx5LZjfeKxfDMGrOui?=
=?us-ascii?Q?a65iUGHu07ilyv6onl8Wga5MYoYJcdj7FyFlQKrUeu/mlqJwCJUtmI3GXDN2?=
=?us-ascii?Q?SrOtDmxDnaZ+3MzA9Dt5RieR4Nj69ue75FrCUgD5CnhTjY1INzjv28fi0QSM?=
=?us-ascii?Q?PdAesMBGckfROPPRRQ15JYIxSk7sL8x5yFDqkDszfkMJLWMgGJe9ixf8pUBh?=
=?us-ascii?Q?g3LRB7q25Q4Fcdjc6HrAwmb6JFurUbzUaEzZOZd2lpS3N/2pXSG8j/GuN4km?=
=?us-ascii?Q?VuOdHfK7DptqG9l6um9+xHs5lL7rG98ci0Chz6jo1EsZYgrzbhFi5Th909ub?=
=?us-ascii?Q?f6wgRlRxVWPQ09YzxwTsJN7qNlL0tmEFrlcy881l0ZFqJkdJbJ7nUv3xGizY?=
=?us-ascii?Q?xX1qcZ2ReScsSndJhbtBdHlb6fdPV6s3afAFpL4HaLL/dc8JSyZOhBzg0Aqc?=
=?us-ascii?Q?c46KjyJxULJvfr68XOQqmLwWjG9vXgZU7tBn9ELYL2/5abmhdmk6ihvzuYNw?=
=?us-ascii?Q?D493wd4qLM39TlqinLG/VELYYv8eNezeZUX8VuY1DfT1oCBfxHUjjrvEmpuH?=
=?us-ascii?Q?Z296Bn6uaeOvAbOTXBM7pgsGV+vD3U9JQCMG1Vkdi6cbEJWiWpcD+pQini+8?=
=?us-ascii?Q?+7tkSdncXetzBaxcInQuGTW3Tqo/TQe59zIjeSg+xSvsahLTDmWZGXIiBwgV?=
=?us-ascii?Q?fe/A3deq82ITed+R/kwIEyn1kpI1RwmGR6k3DuvFY+JRscAz9ndFIwhk9u+L?=
=?us-ascii?Q?+MGbub3Lg1FKInfgdWvdJmEqgBk4VdLGHG1vuA7s+TrWiK9Wz2TbFP8k8EtG?=
=?us-ascii?Q?E+imJux4nrbS/w/Tk9fmXormi1qqx8fsjqqEU6WKa6ISgr0CkIoOzDRzo+wF?=
=?us-ascii?Q?6OO0NmpRHjIOC3bbKohfNxwg1Pb9G8Ty5B3qpTFIsxUSi9qu+f5zQLBEs7O1?=
=?us-ascii?Q?U2tFTZvWZ4sQyeUf5iKneEpcg1zcYmpK+V6qMoJKugVyh/wQoIXWyCr5F7SA?=
=?us-ascii?Q?CUqBb0M5KirA71+Qz7pH0Gk0f18e8O7flcS+Xc8Oed9DyWALM4noQETW3fCZ?=
=?us-ascii?Q?vIz5wWO6DsrqvAfbUNWp?=
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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <dannym@HIDDEN>
-Date: 2025-01-29
-License: Expat
-Subject: Make Vulkan optional
-
-See also: <https://github.com/ggerganov/llama.cpp/pull/11494>
-
-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
--
2.49.0
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 7 Apr 2025 23:20:30 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 07 19:20:30 2025
Received: from localhost ([127.0.0.1]:57501 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u1vlW-00058M-8L
for submit <at> debbugs.gnu.org; Mon, 07 Apr 2025 19:20:30 -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 <Morgan.J.Smith@HIDDEN>)
id 1u1vlT-00057i-2G
for 76999 <at> debbugs.gnu.org; Mon, 07 Apr 2025 19:20:27 -0400
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=YIxMn5S5u13cnI/KBExrIfohC0gSzSe6WdwC+Arc3GM+ScHVCN+pHGxBuaruq9aRPRAGZxbveg8IHGxiP8BL2wTwHxSR+XLvCL4t6GTNuNxpwGVOVUD8pOzZVujeaenaKpw1+9zrWRfkKjgK0Xq4lC1UcgbfD03xqb+XrOjvTXe1wmv8tm0oBfBR1Q4vSolI+hZ7AIo2bjhAj7/n8OdWozP0XjxpB7w8ETY6hkLGB1ZCIwXC084aRLzEqLky+xYFpU66nltaLTHiYbUTSSu9XyFN+oBklECtUixb6sn/czRnE3kKREmqajKTZHiePCCu13ijJfpd9ihLezo3Cp3aSg==
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=X7T3DX/7kxg0UnGipDTzn6v0HD3QEopMVBvPUsv7jf0=;
b=rd2PFlAZd8LQfzM5jBvUv31QUQvwCfheigmR2dHqN1y/spvpcXLBXRH8YeexRzbA5OGeTDT66SfIdGsoqedk1eUeTklY6b+k0jDhjzHD66j+IxsYBLkuZzNedjqi6fc6BMnqmbj2GFFX5FPdpo72kZ/GX7pKvBC4/oopOoxTwOpLTU6kMPrkkepnl7/LmIzgVBl/B+VjcWjVqGes42wYqR/Vux+MSAVlGMlj6bfAOIekg9GT+wPVNRowwHEdO8C9c4VeHyfLvNY4bN2wVfUK39eO1L8+TN5MUEbukdM9DSxLKAmNNimFYUw9EiYTSqKMYtDoLq2Xp90dnxUcxmykUw==
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=X7T3DX/7kxg0UnGipDTzn6v0HD3QEopMVBvPUsv7jf0=;
b=ActcmBNY5aku9uOd0YQBG5odnCDlRkgMl7ebp1AEli1fBEyPGGRKX0VyVzcqQpGFm/f8WIczIoVfWEMesoJZJ8hVwLWzhTak9ZV3pxDLuIWnC35NKc8mF4970d2f+nd7qIQlS+7FLIQFr/NrG90GK5pfav5/vtRcuertvgQYj91WxRT/sVmymNtO2fFrShm4pAHFrPD0YWnxnO41Lp93PHfFIxwf+duF3y2G93SLfJ1Tdrk0d+6xEMdzyH1mXYP2lyQmY/Jo9QlJHFefUCgWJplwQ8dqWW8zr1ZFs+lpRDq31kXK7yFWcnF5DOIW0IXXuldsC+J4W9PoGtV7kGMgJg==
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:11 +0000
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH v3 1/2] gnu: python-gguf: Update to 0.16.0.
Date: Mon, 7 Apr 2025 19:19:38 -0400
Message-ID: <CH3PR84MB3424439AFECFE2F4F8855B99C5AA2@HIDDEN>
X-Mailer: git-send-email 2.49.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: YQXPR0101CA0008.CANPRD01.PROD.OUTLOOK.COM
(2603:10b6:c00:15::21) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
(2603:10b6:610:1c4::17)
X-Microsoft-Original-Message-ID: <8bd869846de6c8c3c11fd1b146d5e5e792cc6d39.1744067978.git.Morgan.J.Smith@HIDDEN>
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: 4be460aa-7f89-4581-6ee1-08dd762abe44
X-Microsoft-Antispam: BCL:0;
ARA:14566002|19110799003|15080799006|461199028|5072599009|8060799006|7092599003|10035399004|3412199025|440099028|41001999003|12071999003|21061999003|1710799026;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?firGFxQnKcxKvv+fZh4TySYYzQlK399b3Xz1yD+JCjUy3ZsRJ0TRx3tQHZ44?=
=?us-ascii?Q?QlFVReATJZV+UI5mvGxshTQnl4CUoMh9ZhMUMX9rKhnRGqrsAGQ7FZ50Aslg?=
=?us-ascii?Q?q1lhg9XpLHfOgEjyJ0jUpjsq0LXxG04q4fLMdMlKhNeqZs2Gb5fx6S+E5wks?=
=?us-ascii?Q?oXkdqeV3aXtpf79Vn0VT7KG0oaQg4UlpF8jrFzHd+7DBhBYqSLq0rTVQGlQg?=
=?us-ascii?Q?QXSYn56lvzg6DcLPMZhtoMOdgSUtQtNYMdUPbdSNYMWXGzOhzTZ7MmBMDyKd?=
=?us-ascii?Q?WA39k2J4RfjyvoC3Itf6Y7hHYrf3/nLwzJw8DvAqpvVHMom6JAnz/Rx5UpF4?=
=?us-ascii?Q?nExIJisUTuDXTM98YTge1KNJNEJfyEoXQTTV8v9LQVPHlRE2SFHZNhz33r4m?=
=?us-ascii?Q?AdmeqUg7YCtGk54D/Vo9134WgA05X9axz8NN9uoQ5NnmYCZVxYYtESETOsCV?=
=?us-ascii?Q?K9QnJcQXaiEu1EvGj2KJQ4zqafAn0VauQqZ3uCCCe2vU4p2Qp/8j8SDVn4wG?=
=?us-ascii?Q?y/iOl6eKRJDfQyfmCM1c7UwsMWl9Wm5kBL81ojlor1UAbeimVRPXsD6POR+b?=
=?us-ascii?Q?Erad2CGaD7QoSxDtPoOTm295m/O9vm+itl0CNmeO7Vn8EV1w/W4q8Zs2qz0b?=
=?us-ascii?Q?U63+Vs7ajFf1uP8tTNdVSXQt4BbvfWRVOwHET63bdAGf/dEN25ApPm7iNEsu?=
=?us-ascii?Q?HAUfotnwi2cw+LWodUzSPjPiRWMo7+UNliUAFsb39AymEtG5zV3Ybc8O7ZTJ?=
=?us-ascii?Q?us1kPYoPRuyBsBA+KqqyE+nhXP4LDyBuPV2IStD+yG1/wn8vP+dIs5w0K2nJ?=
=?us-ascii?Q?y1UbMIfq4NZTHcj8/1Cv0W1XFfH1CdO4ldnibgojw7SV/xy6/ED2uO2EoK9X?=
=?us-ascii?Q?3H9hE4H1fsTYUKhL9QafeBJRlFQEBzd4gBCXJGBmO3wzD/KtDZjAw28n+SDM?=
=?us-ascii?Q?L9xWuM5Oh0PtdZhhkvBXDNjNq05OzGj3YFuQRpibsLi8X7R6xkVROA996142?=
=?us-ascii?Q?gzmNRMPcldGere1DdMkC6wiFnlDdC527ixHFzvuiTwGYVTeDXjJ64WfnlMO6?=
=?us-ascii?Q?3aqQtWtbpjEs8LBxXWOeO9LqsNR4QfFX17yu/V2VY7SI6U5tk/yLdECIYv7g?=
=?us-ascii?Q?DpMbp2RlCVLjLEo3NSeErdH+XHzMW0DACHpnHdG319w0FU8wrwQ8tucG0kfy?=
=?us-ascii?Q?2ovXh54nz6BHVVN3z8wdRPZ2Kf4djUhGCx/Rvbv6paLTRUYWt8CLdz+MWlYi?=
=?us-ascii?Q?XG5dcuNqMuK/SxVSuYp1FIFV9Gq7aeFrrvhNJjk1HbLY0+JS5340wVghXt6x?=
=?us-ascii?Q?Sl0=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iUD9tfGaSkNJwgGypcJ2nTs+PPN3D4455tXxaMoFVJZpyZYY18gUDephUQEN?=
=?us-ascii?Q?xaNo15D9YiOs0YAQNZSUZw8lKsuh/tEN8FmZo2u7gCkjZZ1+nTYBVeEm/aQN?=
=?us-ascii?Q?IfWLcVFaHC2iKrrvYm16IxX4X972BMU+oGHKJjZwOLhIALDKznHMO/K0aIyG?=
=?us-ascii?Q?N6gV2StGVSRX89bZnQ6a9Npu2JHGVbYlh4HnhOJYndnlmEb7gR4Yp1HnE7fE?=
=?us-ascii?Q?OaLHTV2sfSCqBiyngksPPJ+0/5Rv/tfv2t9j6tIoPcrTC6IOy3+gUIgRypKc?=
=?us-ascii?Q?u+EaOb8oBv1Cezd8qTHbWPO38nVq1CmgduXtDi8UiygLPNKC8s4WNA23DtrU?=
=?us-ascii?Q?j5ZYPxQhIQPqiXUaHutD6dheiy2ulKswSxHnjFCLZRBvg+CxsUq601ydzBDp?=
=?us-ascii?Q?HKPxUcFDeRFGvmRLpvztQLShYsnKGQEDriHQnz6CC0VNtSxxzQQ1KOTfcRX8?=
=?us-ascii?Q?2vvuTWUm5lLgeKBgAnmwFjNWqGoyqmQiitWJPppPJ+NEMuHdfivOrHgRsl3B?=
=?us-ascii?Q?QebiZo8tiHQxP4zUwDm/JpCiRkXqevbxMkxjKejyahnxwRQNfep5CNkhgQvK?=
=?us-ascii?Q?bVtcx5ToZ3O06dJN3kG73CjW5nYJWGnoeYC/J8jHqs3uRvXr2s3gNkOD0lab?=
=?us-ascii?Q?tt7KvYDSRfyx3OyrsIIk+45mrS2Hu/4qXAl632/WRWrHUp/47mjxuA7TTKpi?=
=?us-ascii?Q?xxXkyT+UonNpcquPGRYzc6BU812dVOBsl0NAugdfgP70pYr7owK9tpNPomn4?=
=?us-ascii?Q?lhLt81k168cU/VQhOCOzUIsDlsHvI80uMCll+QlTq3chu3W/orj8Mw1zrC2P?=
=?us-ascii?Q?dBaHOx9gZp2sZx2YKvloSJ2R0FWVDU6ikQXVKNeoefF18+ojt3VCEDq7mobO?=
=?us-ascii?Q?3kzlXpgQM/4wfe4UTLzFhY44U2d3U1w7NpDvaZHFkspK2ENyIv7anbC5omc6?=
=?us-ascii?Q?dWjgOprouFuiWfuLT6SNMIDz5g+0VqyMhOLJOU89sPDA7IUOv5GQGTe/j+pr?=
=?us-ascii?Q?l5OjRqDGEGGZzW2tIQ5ZZn6jTtS9UdRMUV5n6pHtBR3460dJZCbe129nBoxu?=
=?us-ascii?Q?dz6xa0i6CoGSTICiQ9x0xy8JJ9UMPljrtvMesLIHuncWAQTzvBbcQMjydBRd?=
=?us-ascii?Q?mnvChHAeGBdmffPctHUor9ZRLW4Mt8cYC2ZA0io9qh9ow3AGRh8gEhI803Qg?=
=?us-ascii?Q?fs6f7fRaBrUebe7OHuBKdMYrN78by/p4UVw68zAVPbXw7JUNowq5Hp9uJsvl?=
=?us-ascii?Q?5YMGkdM99aNN0gXua6K1?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4be460aa-7f89-4581-6ee1-08dd762abe44
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:11.3042 (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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/machine-learning.scm (python-gguf): Update to 0.16.0.
Change origin to git repository. Run tests.
Change-Id: I1c1b5f5956e3acb380b56816d180f53243b741fa
---
gnu/packages/machine-learning.scm | 47 +++++++++++++++++++------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3e68af3476..bd7a4fd81b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -7041,24 +7041,35 @@ (define-public oneapi-dnnl-for-r-torch
(base32 "1zyw5rd8x346bb7gac9a7x3saviw3zvp6aqz2z1l9sv163vmjfz6"))))))
(define-public python-gguf
- (package
- (name "python-gguf")
- (version "0.6.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "gguf" version))
- (sha256
- (base32 "0rbyc2h3kpqnrvbyjvv8a69l577jv55a31l12jnw21m1lamjxqmj"))))
- (build-system pyproject-build-system)
- (arguments
- (list #:tests? #false))
- (inputs (list poetry python-pytest))
- (propagated-inputs (list python-numpy))
- (home-page "https://ggml.ai")
- (synopsis "Read and write ML models in GGUF for GGML")
- (description "A Python library for reading and writing GGUF & GGML format ML models.")
- (license license:expat)))
+ ;; They didn't tag the commit
+ (let ((commit "69050a11be0ae3e01329f11371ecb6850bdaded5"))
+ (package
+ (name "python-gguf")
+ (version "0.16.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ggml-org/llama.cpp")
+ (commit commit)))
+ (file-name (git-file-name name commit))
+ (sha256
+ (base32 "1563mbrjykwpsbhghhzi4h1qv9qy74gq5vq4xhs58zk0jp20c7zz"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "gguf-py"))))))
+ (propagated-inputs (list python-numpy python-pyyaml python-sentencepiece
+ python-tqdm))
+ (native-inputs (list python-poetry-core python-pytest))
+ (home-page "https://ggml.ai")
+ (synopsis "Read and write ML models in GGUF for GGML")
+ (description "A Python library for reading and writing GGUF & GGML format ML models.")
+ (license license:expat))))
(define-public python-gymnasium
(package
base-commit: 666a6cfd88b3e5106a9180e06ea128db8084be0e
--
2.49.0
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 7 Apr 2025 23:11:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 07 19:11:32 2025
Received: from localhost ([127.0.0.1]:57483 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u1vcp-0004QF-2z
for submit <at> 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 <Morgan.J.Smith@HIDDEN>)
id 1u1vcm-0004Pi-4p
for 76999 <at> 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 <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: llama-cpp: Update to 0.0.0-b5013.
Date: Mon, 7 Apr 2025 19:11:08 -0400
Message-ID: <CH3PR84MB3424C0BE45E21D2B184537E1C5AA2@HIDDEN>
X-Mailer: git-send-email 2.49.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
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: <f4bb203a558c80312ffdecd70c1b404644274369.1744067468.git.Morgan.J.Smith@HIDDEN>
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: =?us-ascii?Q?slw5gLWydzfFAvYWZ1U+qWmW7KQqQBqfuUNYDMUnPM/2lF+44hI4ljl0DpmK?=
=?us-ascii?Q?ziGhIYWzh3kUvsk7d/0vu/SB49YzAGrvw9tBR4Y3WaVq4ipDPdA/2/P5C84H?=
=?us-ascii?Q?OA5fWRUOPkqg7SFsSBIJkKMtOpov8Jig+fQIQ24rWwtnLL6Yh0GyKncbHffr?=
=?us-ascii?Q?hftCjaAj/nqy6iJgoZ7xQ86XO3+V5AxQ0b32KjWyanmaZHNselq5uZnSjYck?=
=?us-ascii?Q?lo8AN2b4Gzoy7UEfEZNTHEenPYWjPShhlQQvlBxBN40PMFLmCUviZNBzZW8v?=
=?us-ascii?Q?lr3WSf+lx5M9ogw4/BJwGzG0iYJFBB8JsCCv3OFEA9K37fs76pUXQrXEOPn/?=
=?us-ascii?Q?4AzLo51f1xBOWLJj1td0QWgCralYmKPq27BikuCIpDJc+gPkCYpbon7/YbFU?=
=?us-ascii?Q?EO9DJ/qrXPL/3Lit6ZgGB6wtiAIqXycqprXHN0i9zIzJEL11EHW9OhlY2zkr?=
=?us-ascii?Q?L/V2k1AFx49buecuvdY7wSDu+KN6r5IbsbGVbHk0k8xbJ9L9SQnr7nMODBZR?=
=?us-ascii?Q?Mduz5uojQf7wdfNDg59as47V38vKlUJDM1WJOMPv1J5Wnk+LTaLXOUBsWkel?=
=?us-ascii?Q?X9Sveb0Miyl4dvU61xUmfUCyolIZGvcbh38ZDtSIvpnBsKxHxchYPZ1rbRom?=
=?us-ascii?Q?nlA1zpvtjdztzmDQu7kHG+SHnU6rCwGxhK01V6pegX3g6Ak2LsX6RibyPmW2?=
=?us-ascii?Q?7UFij8FCwXD8h8b+GQCAbcQkyxGKuxh8hpeReMRNq4ouEA6LCM7XwcKfQ7Xn?=
=?us-ascii?Q?YFYlDTPm9VhF6furb+Zv9SzSKl0S/0lvRP8YsknGy29k/Vy4xs+bvYwbbeb0?=
=?us-ascii?Q?mTB8ANNUCamKVGksCRWAy8BtDgAoLnBS8zWsxKcCT1FcFWfaSyIQ8efsAZ50?=
=?us-ascii?Q?42mxAQZX7PkEz+tSOZbf4GigovfSjA+4FPNYrww/NjjhaBeloX2O6XfR1aBO?=
=?us-ascii?Q?BJ4UB5rJwZ4TAEKVQLV+mRj3v2zDHYO25/6KhaHYXAYVJDBl0Cvww+r4H2d0?=
=?us-ascii?Q?3cj0XUb4We9IsWCBiypERXxJxUeyQ7VWCw1dIcMnX9zRIEpK6Og0irrL+8kA?=
=?us-ascii?Q?NA3hn0QZWuGzePtctkwN79CkTicPpTa2/T+x3Xa5qq3QeoEEn4X2AdATkahX?=
=?us-ascii?Q?eZ5DnoMnVXOFOEhu0Yz9ANjCeM9g29XRegJ8Y42kYAJiyddLsHB7s9Kk6S2q?=
=?us-ascii?Q?GOAr1bYqzwXgtSxnvD0zAvB17nx2Dq+1gEkDDt84h4wNlmlj7qepDHugleNF?=
=?us-ascii?Q?yhGGJYnQWF7CiFKupSa0pJX/iIGUyqwr9OIpPo7agcLNffsbArchVwQIrnmt?=
=?us-ascii?Q?GVfrtLRRK00O6bjWv/7Z6iwJWZcn6bNaA2h+wOnvmgL0+pXxtFb1Onx9JWsc?=
=?us-ascii?Q?62nTW/Ujrpyjw01XfTA8JzFx/mok?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Hw8LN82VxfDx4/jABSzYj5Z9XOrjoQ6JvhVbuHXvBvvG0AxEDgYXjVbBQ82/?=
=?us-ascii?Q?/juTXa5eUFaV/hx/3PmVg0sn1NK8ZdJ6BV3icixtv3pvxNW7JDt8/y5OFBvT?=
=?us-ascii?Q?H30XYmrYsyIQOsB8WIVbxSUKhVyFeBrOe2JPTK2Y9OWdp+sWbYNts+V2RQg2?=
=?us-ascii?Q?3y38J85DQuAX2TV7yT/SM/eje8LUImqBB+vGgcOp6H1aELbwILSmHuNs3bwn?=
=?us-ascii?Q?ItKib3z8YyW9ska4KKDXluBMZ7V8fVXW1KQtcjYNY5HKSGTp1t8woESUborj?=
=?us-ascii?Q?T467gB9lpf61tnhiLUXPf6DYIco6czwMiCgpnPAHuImdYYLV2qtP91Jb2xZ1?=
=?us-ascii?Q?9qZjlTK1iVfGHC1ARwE4jvQ23PzsGg0SI4FYwlWpW/5DB9W94pIYBXaRC0DL?=
=?us-ascii?Q?S9OA4qcAS3YZdIYSb/wbJEIXSZxW1230uy3kWgt/RLHaf7RJVu4HMPn2qDEf?=
=?us-ascii?Q?ea5RET3D6Yd5RA6SNmxNSRVAkbeDU4FlR7m1oiWG1ReF8i6h9sSw9duCkZhK?=
=?us-ascii?Q?rZowpgIEjyjDXN9fqwoM1tCVGAP3xtcG7dc2GmmJb07MTL7/qZEToyMgj6Qq?=
=?us-ascii?Q?XoHsMABZFnLKl1NxP9wjM4p1iOZKmwgXzpZHg2450gMWAURwIR/VWoWW7eTU?=
=?us-ascii?Q?Ed3y+0BdEgziwckQauf3NbNazkiaiN8smUT6bd0f2+NGh+R+VZ48l5xHdxed?=
=?us-ascii?Q?i4uqAZllh9Z39Fn13fBy6vfCjieuhIRXcg4MQmRB0EAqGojsJoj6sF4pKk4+?=
=?us-ascii?Q?ebBWDkYl1oj4HU01oH1PUX4FrsTxLk1M24oCS7UDOJFrJINhA4uS8qcC17TE?=
=?us-ascii?Q?KFfZDx/gpn5QpjUE1PH/JSbc6YcQLF1Ij1212KWYJHc6BpkQF/9kr96q44xs?=
=?us-ascii?Q?ShzGObKnfvefTT0fMe/e2Du+3bT2EFBwbsZH9pk4dguFnqiHUCcn5MVJgcqz?=
=?us-ascii?Q?KJwPQZmFDmlBCf2XGHQUg27lyH3Fuwt0REN2/QpUPqalVFMzUllZd7RaQ9zS?=
=?us-ascii?Q?vXK1a7Yls4yM3cASbjdUvaU1yYjaAFM9qgxYDopce0WMNqtUm/U4X1D7MW2+?=
=?us-ascii?Q?o94nWUwPIS4i4C+AUwEKI9WNgau18e5EESik3ScYbAcWYCPAcz7uAZsum36a?=
=?us-ascii?Q?cX+ivqnJYC/bTRA2wUUN00G+iP6S1MDeUAgpXLZ+UtdxMKgJuu4DYFX9vbr/?=
=?us-ascii?Q?7xq+jibgE8Mb6+vWBGs4vGLoJn+611NcpU5bwcoUq/MhJrjEFlCQi0wfZipl?=
=?us-ascii?Q?yaUK4AhBatqqmlI4kjGZ?=
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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <dannym@HIDDEN>
-Date: 2025-01-29
-License: Expat
-Subject: Make Vulkan optional
-
-See also: <https://github.com/ggerganov/llama.cpp/pull/11494>
-
-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
base-commit: 666a6cfd88b3e5106a9180e06ea128db8084be0e
prerequisite-patch-id: 1e2c478cf648ee8c9a3b1af55543e1b96ff24ec7
--
2.49.0
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.Received: (at 76999) by debbugs.gnu.org; 7 Apr 2025 23:10:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 07 19:10:12 2025 Received: from localhost ([127.0.0.1]:57478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1u1vbY-0004LV-30 for submit <at> debbugs.gnu.org; Mon, 07 Apr 2025 19:10:12 -0400 Received: from mail-co1nam11olkn20815.outbound.protection.outlook.com ([2a01:111:f403:2c16::815]:55136 helo=NAM11-CO1-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 <Morgan.J.Smith@HIDDEN>) id 1u1vbU-0004FV-Vq for 76999 <at> debbugs.gnu.org; Mon, 07 Apr 2025 19:10:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NEUa2P2epqMYeUvlKngVj9eyXa42uPrN/szZL1Ty4MuAVT71pDpvLw6lKSpj2+ioNI4qfTEl4TISw3sv9phxdpIKnJxNZXsLBAfvklWYkECz7HIzVbv8QQKbnVJfUdBF7lQPK49SpVxedkpoqEbZOo+tvTmfxi1zHY340p8g+QR0vznzrMIp0K+9EgkNrQG9CeQvO7bh1iq4px53DQJX/L6t6V52wTv37I9FjCnpodgYqBeT1Y1JryAzGDdKjzS4tOzfAvAEQiLJJBNW//MIwBllHpAlseRQibnVWSxeE7hA6RF3a7tJbA93B33JEDofntCOutoDezgYxc8OOLs8gg== 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=EhCxTymKLjVxxbnLCrq/hc5AaXPAQi/oZIT0YQ7baQY=; b=vPHXwLgGGqArJtKpFwpIxHiip7BLWU9gU+ff7J/JxyuEp0Ifmef46jmFu+D4XO9ysMzLYXvrc3w9vnmfYGA7TsGrml0F5h/U25l9PNDio3TqfTfjWgn6dRenOPcCHnQuiofg8CFpMK1ONmePO7tttwbvvw7Xy7eNRLFVLQKvPirQluwdqnx570dilS/ZGXrw94MFwd9pTNjwXyi0bMc7rUXNh4oQ1won7NzpW6L2nif2SxdbFWjW8fkLa2/ZXrU/ggRFlHr6HL+nBf/LvY98A2WGNEFfnUFrnSrTN58w2AunbmlCcWtVFOkAuqbuKvAHkkF1swMJwH+xNsmXS6pCkA== 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=EhCxTymKLjVxxbnLCrq/hc5AaXPAQi/oZIT0YQ7baQY=; b=AEUwg4PriF9hzHOTxVUvCGDj5rjRxaaMakTrZmSElMYuW2Yrwjo9fTSUc3bTXzHgLUnGzk+zCngB+RVxFuGqUceiE+zaccPpZSd7zO6g9GO3LQUFBp8PlKBiIBi+XK/ppbgzmaYraASMaEZ9eUWObA86+h4BINfnqfQpoyN++GhW2GifxXkYBstGCRcJjeu0DRboMh5xuibDBFoODOcORu+K92z3ndjtpCk72VxzVygGq8yJq1bvFDoAp7CxZT+sVtGKL9D9lHT81LumYaSedctRz0+t0sgeyeScQFsCVOmFBl7UMK/+fKwKt37HTSfsHGPtuJI4C0GoQHFuUhnBnQ== 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:10:01 +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:10:00 +0000 From: Morgan Smith <Morgan.J.Smith@HIDDEN> To: Christopher Baines <mail@HIDDEN> Subject: Re: [bug#76999] [PATCH 1/2] gnu: Add python-gguf-llama-cpp. In-Reply-To: <87y0wdw9kh.fsf@HIDDEN> References: <CH3PR84MB342448E7EB63F85EA958565DC5D32@HIDDEN> <CH3PR84MB3424609A3E0E8CE70C8AF473C5D32@HIDDEN> <87y0wdw9kh.fsf@HIDDEN> Date: Mon, 07 Apr 2025 19:09:57 -0400 Message-ID: <CH3PR84MB3424E7AF4B403610FCAFC0BBC5AA2@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: text/plain X-ClientProxiedBy: YT4P288CA0077.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d0::6) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <87y0wbh8l6.fsf@HIDDEN> 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: 1a205b6e-45dc-4559-cec7-08dd76295266 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|15080799006|461199028|7092599003|8060799006|5072599009|3412199025|440099028|41001999003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?99sp4WpKAZRzueNHVQdqp46efPlJ+0hjnQfiF2FIeixN3rgX1xKPniIkNc0k?= =?us-ascii?Q?Tb5kJghhEgPWtIKVCgmeBkWCl37R2sr+BBtonadGwx8Vt+Uf50QHdyBRcdrg?= =?us-ascii?Q?5wRKysr6tX8WJzGJpo5J8sxdQGDuiqCqJzcWQe7GCtUgOZhPZjIsONo2cFoM?= =?us-ascii?Q?Jmxw6QDtiDYAE4GSMd2Z7TnzPh/W0UrQXf3sCDLoqYCrWG8i19Ps9iFhVqac?= =?us-ascii?Q?HBUzLCHMoMzpbRa5TIAfNQZDh2xdVBEB3l9s0RDSimJw+/isGOxomvRJfiKC?= =?us-ascii?Q?7R3M15Ei7RiCZgC0Ej/AuHjCpkvSvp5bmML2UVKRtXYmOQ3MskG5Niv9ykZV?= =?us-ascii?Q?NONrAfMXLH3p5CI3SRxzgk2KktyebmtwyeHOgw9P0tgHqE9JnXC8RK3xHUPr?= =?us-ascii?Q?EYf3foSaYpMqtxuaTDlX6FxNslndna6meTzuKHulQiC/4iAX49IZXnSwc6tm?= =?us-ascii?Q?RV3+g0hWPsHs297qkiBNoU38THqopRmPvHJjFM8VNosUT2yw0a/w/7jiN1kI?= =?us-ascii?Q?jsDP3CULMild3jqvIY/dxKZh3hXc4rVq7OWRup2jYpDSc7XIn9KuGPJK4iZ5?= =?us-ascii?Q?3Xj/rnwU1B03aMBVKgYHkK1RzzpyI+MGVMc6ufUWWHBiAftwIOfJZ82fJTdj?= =?us-ascii?Q?B1PmgUJCo7q+wAWQVF/m0g9767VP0GMhh0I8kAoR9Mq3SgTf+6WskdjVPbWN?= =?us-ascii?Q?9l5LXgC0hMCItXRc44H1hDKiuox6bTT3W+ef1MLj2dgdgzipfySw0g9YtUuN?= =?us-ascii?Q?oh98OQH/4/Bg1qPwJ/23bzVirdEua8GgAAvUcyfEkJQE3tfX1yzgXVPF+YN7?= =?us-ascii?Q?ndf+yQ/tGqjV5WHav6c7s10f5qWu0k7T4O50L6yCvmXKTwPZV08uxt50Lx8F?= =?us-ascii?Q?+FtTi7EMOOjg2smkElBNr6KmHSqXMPOq/HeRV+T5uv7S9jDkVbAuBLsNeGvS?= =?us-ascii?Q?KkpIuFCvbyIPa0E/WrHOxBff3Y7dNZEbLa3HhKSsS0jL0kihD3aS3Wsj0HpR?= =?us-ascii?Q?vEKYIJWCVWcjF9I81tjwxbAOzcSg/cIsDRGOoMiP/ofDEZFFKczcgr38+7/I?= =?us-ascii?Q?BFEvHLrgg/u/0Dk4FhjbO+kfBJSiVptiBxHjz9fgkGEOBvPzFsIUWPzb7Nzt?= =?us-ascii?Q?DdUeDTcb6cH6zlLEyM7Rsrs+NubFJn88wA=3D=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sfA7/9CZoDjVLwGz71GhLhJ4B4Cqz8/SiOp/8e4mruEee6VGHq6FrrtTJWHx?= =?us-ascii?Q?dncj3NBLX3RyJiSdz/nCYhr9HGqkXeyr+/pabkAP+A3kNzfSAEyTbeAglzqx?= =?us-ascii?Q?2C9JoJ+Fyc7HAwE/WDEsWFPUhxwmvWEUzHdl9jI+yyXtk4HsCiSoKrPZ8Rs/?= =?us-ascii?Q?IcSwXsZCG1Klh3+7HzBiptHLHTax13j58fsnvjGzOHUUD6gUE5Et4ZpZTqUW?= =?us-ascii?Q?3aWO9O0rS7VVJdbB1X3jZtppCgZxFYsM+GfID2Mto0IKxbCZM/S3SXaW9cgo?= =?us-ascii?Q?iRcqghOfmKMaET8EjB03ZFrgYSDu/RD42+ky/NeJ2ARIpqPQEywj2QsKp4hs?= =?us-ascii?Q?BFZ6qTjTTTrRrRxTAFMTUh5UeH3EVkbgPjLv6fJpU2aX3SDWhXMNUiNRphX1?= =?us-ascii?Q?bexCpeg89peco74Ag7zHNshGrUfD+rtjBAOn7ydBvum9eVAJ7D3/Id86YXYW?= =?us-ascii?Q?YW/hybom66ds0Z/GpF4tx2OGn7EbNBo0+noJbJ1DHk8Ms/R5T5Iq8bGRIHRg?= =?us-ascii?Q?hRKcwGi3saXZyQJ+n842zLxdbvoh+rT5E09WKxDFdhvd1uQhRL8UVALSJ8I0?= =?us-ascii?Q?MjmCAUlWGQd4mOhjex478Q1/Ho/LdtZmGhw8Ff+rvggNPz8odg6zxsWRz3WZ?= =?us-ascii?Q?O4G9gLTsGxt+aarIICVlMuLPHEWRIUdRkgyA7hnr66iXnoaV7H4dcrl8ftSj?= =?us-ascii?Q?BKl24mogfdrWzothNfxUclUulGL++Jb1ipxWvO/iy8BHsmSMuWLGTmuK/vlD?= =?us-ascii?Q?HIRsnASxcVsVS12eBCZyPeWL4fj41zckh5LtoGLXTTpPFtDch8A40JK/KK7k?= =?us-ascii?Q?rHRXxP/1x0/T8KUuLNk0l0/Jd2XoOVooSypYGUsEVFLhnR/YsBsHZ3ntr6zZ?= =?us-ascii?Q?S1PD6oxmO285h1uvhhZFkiCML4P7n/ZtPAG8/U7J0wVJfb/jHpq1QH8SZyg4?= =?us-ascii?Q?94CDnr/VPRKs97x3XpigtUgLMvTQWEgiTrW6M9lungMAgMyCwppxWHw0Nld6?= =?us-ascii?Q?SUeBdY8UJdyEjB2WBemMF/L47gKJ2G2ad4eSGWCoAHpIlTx2of5/5QBRT7TQ?= =?us-ascii?Q?EZeZMWzTzKbPyWUJXRz4SlO/ZeBpAc04f0d4iVU4IuTjyxBnc0+KmVDsTZ8r?= =?us-ascii?Q?S24nDvUezyeTeqnhZtpDQurvdE78QOlWRTl/ym6I3NDyunU3bof3X4vPQoO1?= =?us-ascii?Q?Tz8fFxbBMTJ477OjbpTG70nvs5YYG1mY/2xU4/w3cUcs2ugxKdUhaFXcvKP6?= =?us-ascii?Q?B/q0F7TkYUGV7K3ziyfd?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a205b6e-45dc-4559-cec7-08dd76295266 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:10:00.8152 (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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 76999 Cc: 76999 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Christopher Baines <mail@HIDDEN> writes: > > Can python-gguf be updated rather than adding this package? I had a tricky time tracking down the canonical source for the package. I'm fairly certain now that it is actually in the llama-cpp package. I assumed it was a bundling situation but it doesn't seem that way. So I will send a patch where I simply update python-gguf.
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.Received: (at 76999) by debbugs.gnu.org; 6 Apr 2025 16:15:18 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 06 12:15:18 2025 Received: from localhost ([127.0.0.1]:49286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1u1SeT-0007Yd-Rh for submit <at> debbugs.gnu.org; Sun, 06 Apr 2025 12:15:18 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:56555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1u1SeQ-0007YO-I8 for 76999 <at> debbugs.gnu.org; Sun, 06 Apr 2025 12:15:15 -0400 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id CE24F27BBE9; Sun, 6 Apr 2025 17:15:12 +0100 (BST) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 72154192; Sun, 6 Apr 2025 16:15:12 +0000 (UTC) From: Christopher Baines <mail@HIDDEN> To: Morgan Smith <Morgan.J.Smith@HIDDEN> Subject: Re: [bug#76999] [PATCH 1/2] gnu: Add python-gguf-llama-cpp. In-Reply-To: <CH3PR84MB3424609A3E0E8CE70C8AF473C5D32@HIDDEN> (Morgan Smith's message of "Thu, 13 Mar 2025 17:18:50 -0400") References: <CH3PR84MB342448E7EB63F85EA958565DC5D32@HIDDEN> <CH3PR84MB3424609A3E0E8CE70C8AF473C5D32@HIDDEN> User-Agent: mu4e 1.12.9; emacs 29.4 Date: Sun, 06 Apr 2025 17:15:10 +0100 Message-ID: <87y0wdw9kh.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 76999 Cc: 76999 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Morgan Smith <Morgan.J.Smith@HIDDEN> writes: > * gnu/packages/machine-learning.scm (python-gguf-llama-cpp): New variable. > > Change-Id: I1c1b5f5956e3acb380b56816d180f53243b741fa > --- > gnu/packages/machine-learning.scm | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-lea= rning.scm > index 246b004156..ee5feb58fc 100644 > --- a/gnu/packages/machine-learning.scm > +++ b/gnu/packages/machine-learning.scm > @@ -6490,6 +6490,21 @@ (define-public python-gguf > (description "A Python library for reading and writing GGUF & GGML f= ormat ML models.") > (license license:expat))) >=20=20 > +(define-public python-gguf-llama-cpp > + (package/inherit python-gguf > + (version "0.16.0") > + (source (package-source llama-cpp)) > + (propagated-inputs (list python-numpy python-pyyaml python-sentencep= iece > + python-tqdm)) > + (native-inputs (list python-poetry-core)) > + (arguments > + (substitute-keyword-arguments (package-arguments python-gguf) > + ((#:phases phases #~%standard-phases) > + #~(modify-phases #$phases > + (add-after 'unpack 'chdir > + (lambda _ > + (chdir "gguf-py"))))))))) > + > (define-public python-gymnasium > (package > (name "python-gymnasium") Can python-gguf be updated rather than adding this package? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmfyqI5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xe2LQ/+Mb1LAKLiFGqUyj+4vG9WPxr0O8nKK4I2 2MipgfPBQWI+U5jSXydFYC2VgAmGHQroQRzKEG/K20tvfMvp+Rvi4w9LVHSQdItb rpGTzeBA7jBNotI5LZOOE21bQp9L5YH9+MEkhuoyPIibgA45PzcX3STtX586YUQ2 kF+aC8PwGj7MiDocyKNZj34KkaMY0HlQsDihcvRSnfDDJUneKBbnQI6X47SuNe7V KLiHiNz7TzOVxMNroRdauYfVEyZRXH93e/4osP+A9Iz8ezjE/8qzsoCAM32AguY8 fgPC/kWsFBKUm+4UcYKL2M8HTj2b/pQLD9NzUoroYsf1rTctu+6kGGFIFy7jlmnL khI6BKUF2JOlUvZVDLHy5sMANMZXx2ZswB9rN0gk5bRCSQtCsDW+5vbNJH7ay8Bk QiQYv0oxKxxWYhHMqVdlp/O3FzljQu3LE+HXT6TXRN13x5EFDOd8umhV8kH5PSfF KKu/GUHVdrN8vnf1sFJYmf8qysiDoIOZgJarHZ+hqxY07/+aN2vzLwA2oiHo3X/I KOt6OJrd2Eh2ildmnbbt1t7bzhvK0od8TJeipKKg05ffRios+SzfNsteHY8wxc80 798GazTYlvvoNPmXocQfGB9iHCt19Ew4UxnTO+TesDuBp3cdcLiZvYFRmHyeEIaZ CsKV0fHaja0= =V97f -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 31 Mar 2025 22:51:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 31 18:51:31 2025
Received: from localhost ([127.0.0.1]:43466 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tzNya-0004W2-1I
for submit <at> debbugs.gnu.org; Mon, 31 Mar 2025 18:51:31 -0400
Received: from mail-bn8nam04olkn2087.outbound.protection.outlook.com
([40.92.47.87]:13792 helo=NAM04-BN8-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 <Morgan.J.Smith@HIDDEN>)
id 1tzNyX-0004VA-1u
for 76999 <at> debbugs.gnu.org; Mon, 31 Mar 2025 18:51:26 -0400
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=OOvwonhJ7ZIE77O3+ep2pyxtCv5FxRZDFRyxVsBSKRZU9HMTQ4hSYDPb8PouuEOW9NvUcoU96PfC/OOOQGVN0aGj6jeFueRlP798nKuiBzLhvBZuSPt/AzlwCHlk+2Y6g6dXubS0u+DB4ePUiFmMWLVnuEgguYjWeoE0LaSTQRNYxJp6z63cX7gf3lOWrcjedXuPnyg9cUOBSsM/RwXlY94rHg/BnopyR+DXVoue1GorWxcpP1PmP1qv6s0GqB62ADmcvwfJ2Wg5pslIJzj4Uf3kWAzR2SEV1Ie/hS940vMj9QyuIMrVyviQ3KM58VzhmZesLD/lOJksn4lrabmOog==
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=iAS8bRIkarcv86ioVit1SDIChmwfvrENcVtYQXiWPUo=;
b=Mq5IspzAlSTXuV56rpGVIWbXhH6LZgziMMqfQfWcva3c4SOloL+Q8IRyfzXhEVrgc++9sW4SjIs0z0Ty3tx4jKD8XzPKLNXoxeAgrymREZLut6cRTT2RY4TPIERUhomKiWsuxSk0BhzQFv1+GaLbCXJSpcIb8YrjyGCb5wKYsHX0SCtCj04cJsdbvXz9HMI6w8H6U6zL6FMkonCXK2SKuAp9be6JpxyfpmV4FgRSBBQ68KEvNpnzQofnBZx5Lmq+V0986lta6eYnUjFvdrciIUK3NZn05JOu7GjG/ZGsP6d+MTYAkbkiMRKj/CLZaDBe8snwFX9HIEPSFF9yrpPo+A==
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=iAS8bRIkarcv86ioVit1SDIChmwfvrENcVtYQXiWPUo=;
b=CAd1+6x2b/Nt7sJaqsppSXlj11Et4tyLKrblxUIE1SeqgxV7DOvYZFGgqxKe9yLjrkl3A17HuGQ2n82jTkgmeKXDknHZsw3yDL8mz+1D5lBFTYoDpUHnwZUbk8T16O4Kp0DidQyQlaH74GooIWfkU8Z74/v+q6WvEVFr6zRgoVEGh3eTc786RN9Ui1CPYDn0Uajhe85hWLku0DXBoyTTEuhRiqZOCO2zHcpUv7++8kz0kxWRXU5KAlXStC0ODHN7vMxrU4U/tM2VGvS2lx5Onb3RDPXr2mPvBQQbTfePS6/ZElU/y44nJBBTeUVGFtVi+vta0d6bcp8HLA5OZAVE+Q==
Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17)
by MW4PR84MB1682.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1a5::20)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8583.37; Mon, 31 Mar
2025 22:51: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%4]) with mapi id 15.20.8583.038; Mon, 31 Mar 2025
22:51:18 +0000
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH v2 2/2] gnu: llama-cpp: Update to 0.0.0-b5013.
Date: Mon, 31 Mar 2025 18:50:48 -0400
Message-ID: <CH3PR84MB3424D4B9B5AAFFE7894C0986C5AD2@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <b229a6dad821769d781c76abc666d3b5e4fdebf2.1743461447.git.Morgan.J.Smith@HIDDEN>
References: <b229a6dad821769d781c76abc666d3b5e4fdebf2.1743461447.git.Morgan.J.Smith@HIDDEN>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: YT4PR01CA0273.CANPRD01.PROD.OUTLOOK.COM
(2603:10b6:b01:109::21) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
(2603:10b6:610:1c4::17)
X-Microsoft-Original-Message-ID: <916087ded0125310408239d5762536a488e74dbe.1743461447.git.Morgan.J.Smith@HIDDEN>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW4PR84MB1682:EE_
X-MS-Office365-Filtering-Correlation-Id: 35046cbc-ddfc-4db9-2a16-08dd70a68c65
X-Microsoft-Antispam: BCL:0;
ARA:14566002|19110799003|8060799006|15080799006|7092599003|5072599009|461199028|1602099012|10035399004|4302099013|440099028|3412199025|12071999003|41001999003|21061999003|1710799026;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CvexqKckhP5aG332Hdo2eAWcghBpjvFf5GNF7hXjs2IAMFas7f5n35DrjzIh?=
=?us-ascii?Q?JxsNi8SNEcQeedJtDgNUQyx4U92bNm+8jQq+9gkmz1oFPkRQ5cxrOa9izm2O?=
=?us-ascii?Q?vq9mOTxhJWoAN4uG0Cb0mH6Jtta1Ps6IhbbFJ3kEHHnVb3it8TT7uf/R5cHh?=
=?us-ascii?Q?Z9bHoNFsIkHGYOafmPhfdIpX9U23EWJatKEuPorP7FqFRwopdAjGal7Z4qMV?=
=?us-ascii?Q?MgfjVDTy6RT/9Il8uX8iTd7kB9FJl4NfjnOx9AyPIPW+Le+rmdk0gWqeChyW?=
=?us-ascii?Q?OB3JNZdZSfe4XZouoG37fDlLLtjm+wtloBm9YE1rBMgkmYYKV2e7e3QxnKL1?=
=?us-ascii?Q?M9M5DguauM64QQl2Ttmw0rnipd6mKbdsapD5ISMeFmxg5UBX5cKim0Odr6q4?=
=?us-ascii?Q?vrmuDCEVEUQ1Vh88RvcmR+2QLvX/zKZeyKdvJK8A0AWDtkmEX1tHmtU11qaN?=
=?us-ascii?Q?t9mVTt+HvIMFiRLuYLwwXfeFRRetzGscciKuBX2/3G6fCtzY0LqaMmol8rEs?=
=?us-ascii?Q?hML1vGBmhUdHYZYo0k38sjCN0Dg+KyTK5YysNM+movoQT68AvfJfUloWhjgg?=
=?us-ascii?Q?dFfA2H6F4MkolS53VR8MWAcOc72QHjSs6nHysBXqy5z2qv9Szax51qSUPppT?=
=?us-ascii?Q?qHDSfhhN+E34pZ8w9PPUjTkAFFWBuivKZpXZAvikf4y+YligIPrRx5rZ2mgR?=
=?us-ascii?Q?IULHqxJecifB1wQjlUUYpHB6ChCvst2DBri3iSdwacYmtr0BMywDt6yes9gP?=
=?us-ascii?Q?QjH5DtP5N9jOK4HEzFeis572ppt3ieMDZpXuVfZFiBzf3qEzbhNkWp8SCx9S?=
=?us-ascii?Q?wQlUd8P51uwB74Vs2BTrIEilRXCHSWFOp0Y7XUw4Fzl9eOlz5dbq57KKBUuG?=
=?us-ascii?Q?Ir2ymrIzLPrGyuwCdyOn2QWAtUUueLWSxys3lGZdGupit37YmakK98j7+Xce?=
=?us-ascii?Q?rzVgfGyvr/GMabduWrYDmYd6YTuYqCTwa34KC/zHl+hBNnxK1+hrea7bwp3t?=
=?us-ascii?Q?WsTdPOdbsFjcCAlgYmfsfKcfB3irQK2wbJVbdrHQMcZumkA/DU0NSR55x/yA?=
=?us-ascii?Q?3wOAb7E5lhs17Nxhk69VpSXKJv71sXb74t9bbzP/3OPsUaXtXof0Lq5iplUR?=
=?us-ascii?Q?hb4Vjkv4y+FF1Fr1IrFBi3wRb4DhpS26xx/Vzo3zahjC7rFknJu7Ju2DyBOD?=
=?us-ascii?Q?/QvQcn7+mrA23isLSeZ8m88ElFRyE7Wh7b29qRAO+c92UbNKdPWm85SyYOzz?=
=?us-ascii?Q?uR4q4nYRLB0KLE/O3jZt6TxksWQIBagYxCUnhkkh9MisqIHVfZJy4c7FHnrI?=
=?us-ascii?Q?cNtE+qooHdyT3U1B0YIS6FKsltFXq3ZHkBbGW3jmcHR899oN6abZTMoPETHO?=
=?us-ascii?Q?UqpXCtk=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vA4N3FFmkden4TItZVZgTpRz5bk91SERa+/meZNWjqL0W/Ud17N6GFFOVAOQ?=
=?us-ascii?Q?kusMbBjGo0/lAeW5Xabg9selmdrXAYX/VJoQP7VOYHkFixVdtp4TxY3bu8Z7?=
=?us-ascii?Q?N4YCgIUoJceLeews2YunhHGXzwfXJNt3a+YMLnQbmijZZyhx+Ippsm0POAF/?=
=?us-ascii?Q?JThXFrbnWtiuV3E2ykzXol90YrJjwyuMWF8qLQqI7z2GAME6XaLOIh9cS9vb?=
=?us-ascii?Q?ECaXiPg2/+peoXcVPnmpboJoMz1hItZxqaHN0KqUheuDxcmNQLZhK0NjMdUE?=
=?us-ascii?Q?QWPwZJmd/GCyF/jMRf5Ghoge8q44i5MX05M6vlmgBFySyfYl4wzkMNp0I8rl?=
=?us-ascii?Q?PevxNxS0pknaLvuJyGPhcvVfbmb+9PjS2DqQB28VRteYQYit86rMv6ihrVrC?=
=?us-ascii?Q?n0yHASqevqARK7JxYetZ5kZ1p0P53LER1zxTXmjJFFqmoTNFDuER7L9ms4Tr?=
=?us-ascii?Q?bR4SJWmtg5Cxk8UWIdWUFOonOl2pjGw/jnNmAlU20x9PU18EBCl04b/OGuLj?=
=?us-ascii?Q?4kuJz85s3AgGbrd8Cn0XffNa1pwiqmIFIwcx+TZjm2nITap5iHXj4qTu7l/x?=
=?us-ascii?Q?c/GNYbr1cgXR7kp8c/X8DV+I9Z4o743eMcdmNYgvJ3ZeONYqv92La9aTbVfk?=
=?us-ascii?Q?aYtJrqiSLMnJhri28psai3lkqv2JQM1psAgLyk3+fCmT00X1XsVbfSGKl7TB?=
=?us-ascii?Q?GEGoQ7+Ddz7baQPGUrO81ymf31n1TRxQB8UzCuMnkY2lHtEM8Infh1MEPtyO?=
=?us-ascii?Q?jI9nmGn7TL+iR62Js8UnpCoEyljFDTbynXkZV6SRhMDXaM3NSZzFKWoQumoi?=
=?us-ascii?Q?D92hvpsrs2M6J95Na4nV5l7lzBUEdMZ8YFE55ilm7LNZpTo6AC3VpaYzcGoE?=
=?us-ascii?Q?FFah0fyuDg5Hu3T5yQXWAgoVmLTbLSW9XHIdwSAHNenq1UBm2z44KvM1cDfQ?=
=?us-ascii?Q?X9L0DwukF5xfyau/H9Ri8jF9Hcep3QwFI6bhtkTROXr0nc7ZzJq7QUOwkfNz?=
=?us-ascii?Q?HaJyJIjkTa5AnuYQRpGCri8KP9h84EdZjT93OtaIYNoCtRTp/rdRTrpiCBgT?=
=?us-ascii?Q?pq8Ih2cqrGEcbcRGvDeWdBx8ccHgPG6Jaa0SaYgQNqjrdiEvkBkAB4FoM+d3?=
=?us-ascii?Q?bB4GeBfKT82p4ep2CAMuhQhT5/02SCl+QTkV0SxZog/H2OxRmcnY/JJltTfQ?=
=?us-ascii?Q?8jAkEL33Mrrc5K9VpCcHuM3dPKlKZztvMtzg/qt61R/rtmHAXcOFIVykCH0s?=
=?us-ascii?Q?aSjavKR/oheTILvj7dHl?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 35046cbc-ddfc-4db9-2a16-08dd70a68c65
X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2025 22:51:18.2656 (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: MW4PR84MB1682
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/machine-learning.scm (llama-cpp): Update to 0.0.0-b5013.
[inputs]: Add curl, glslang, and python-gguf-llama-cpp.
[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 f03fcb14fc..00b1a7a959 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1845,7 +1845,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 7cb807ae91..84be26cf35 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -78,6 +78,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)
@@ -634,7 +635,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))
@@ -642,19 +643,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="
@@ -684,32 +685,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)
@@ -717,12 +703,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-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 <dannym@HIDDEN>
-Date: 2025-01-29
-License: Expat
-Subject: Make Vulkan optional
-
-See also: <https://github.com/ggerganov/llama.cpp/pull/11494>
-
-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
--
2.49.0
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 31 Mar 2025 22:51:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Mar 31 18:51:02 2025
Received: from localhost ([127.0.0.1]:43462 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tzNy9-0004TX-BV
for submit <at> debbugs.gnu.org; Mon, 31 Mar 2025 18:51:02 -0400
Received: from mail-bn8nam04olkn2069.outbound.protection.outlook.com
([40.92.47.69]:32197 helo=NAM04-BN8-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 <Morgan.J.Smith@HIDDEN>)
id 1tzNy7-0004Sl-7h
for 76999 <at> debbugs.gnu.org; Mon, 31 Mar 2025 18:51:00 -0400
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=aebn90vqp1G9No7G+TsZ1UmtDZqi1+WLnmdX85g1uhRqsqGrnsTKUI8CDmu95niZSvjL/F+07QplEHYlbveFM6OxofsaMXuBdH5tJtDo3unrnFfLilXMbiPkiCcqX+WEIUtC0U7D2ZaXvEPq2S+xwVm7rHVaSl28DGjqkrbjVvgoZ5Cz6fb2+C96BDghMT51PMqdApUndr8+bkAOId56g744R3vyCpyui2pwgBXof0/t+8MgGQiNI2mwTTuZFda9vbFywVd4OQgFp1+nMGX4G92zFarlFQDYcRByogTWfwnapKBMJ15URlj72cz+MjpFXzZT8sDez1y5KhsnDwsAbQ==
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=djGr5TzmUYzrFWCWiG2IAxhbC6MbpMlnioPgu2o+svg=;
b=w+TjtUQEnbK/yzfXBl7Erm5Xy0aLpX4yPCmq/HSEvY/RU9hH45anUpeyb1OwhgEKxnzE+eGvuh7HufaaMHYPyA32zQqCHLObre685MtI1HYIbYUXBc6+RlFj8ThX3euPADDLjdofgmLRj9rYb7EEBTCsWbomCwBPLJWNhG4O+b8ybX9cmjEWYYaqYX8a99zuLKR3PI3TL+fsEkXL+10ZRUFxtHsNnoK32sQlsS0YBTFyJ8YifpT5CCmdYti2gHIy/dXBc5k9AypNW5Dpq4dFgiyqsdD9gijD5ysa4CcApCOTC7UJACxGNRrsiS/CqBjrsmhkK3nNcgUb8Of3Tn/dZA==
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=djGr5TzmUYzrFWCWiG2IAxhbC6MbpMlnioPgu2o+svg=;
b=TPnkn5B1WOTElH5PeJ03yNZ1OeYD2G45mbPVa+8M9HIo6X6s4DQ6Df93AcO8g2OChQe6O8Ly2DHNgjJ7gGwQMh1YHlqPPauKhDQzZjbH120lBYGTYnERDCcQDJg6JQQamMJnqlVlML2VjGmKJYAT7KoOtTK3C0st1A3Ml2w5VucR3/aVVIuFO8AXk1q/KVuwfrkidpU4sgtjbfpxKtThd2YYlptStOC26PlXDOYDwBm9+vbxWt8mH9TXhyzdi82cFwDl2CfHSJFNugg5nJvuK8a3Lhaoqra9vpxdLs9UDZQK9MNxF3E2IkYZ9Ogp2rdy1GMELX6dloqGSfQyDOhvCg==
Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17)
by MW4PR84MB1682.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1a5::20)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8583.37; Mon, 31 Mar
2025 22:50:50 +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.8583.038; Mon, 31 Mar 2025
22:50:50 +0000
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH v2 1/2] gnu: Add python-gguf-llama-cpp.
Date: Mon, 31 Mar 2025 18:50:46 -0400
Message-ID: <CH3PR84MB3424CA14474F88C0E8FB0F7BC5AD2@HIDDEN>
X-Mailer: git-send-email 2.49.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: YQZPR01CA0022.CANPRD01.PROD.OUTLOOK.COM
(2603:10b6:c01:85::6) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
(2603:10b6:610:1c4::17)
X-Microsoft-Original-Message-ID: <b229a6dad821769d781c76abc666d3b5e4fdebf2.1743461447.git.Morgan.J.Smith@HIDDEN>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW4PR84MB1682:EE_
X-MS-Office365-Filtering-Correlation-Id: eaae513e-9fa9-4cc2-d526-08dd70a67bb7
X-Microsoft-Antispam: BCL:0;
ARA:14566002|19110799003|8060799006|15080799006|7092599003|5072599009|461199028|440099028|3412199025|41001999003|1710799026;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uN+9p+FJOEVVY3m+N6C3Eq7Xt2ILg8gOxQ1QwAEDiFP1Ni9kqFybPi1pX4f7?=
=?us-ascii?Q?tVYcFdvnwbUrS2UDZaeZ6IS+sxem22lEKeHDrDqkSKij5L1Ybw/E7c2EBb8y?=
=?us-ascii?Q?ABePHZ8MerIAAT79TAHzUQ1Ps1xMjJ4DmzMSR8WX++S6w5vW9ENiwhh6AMR1?=
=?us-ascii?Q?+K2C5PjRup/p+RoaRdoKAlUXTbNbwuCWisOW19AgEnMSNmDRi9GnaK85sD9Z?=
=?us-ascii?Q?TXGu0WSc9j2bsIYWoProxfjRqIJRQSI8LKCqQ+ZLqxZmhgHP/wLY4Ni8iCfV?=
=?us-ascii?Q?EhUL3q7LBc5SjJykQrQVB51vCG4EDYn8whsgWgys/mLhIrISJMks+xkGWBPn?=
=?us-ascii?Q?enGr2pcOTFp0DbvYg9GxzE6kClYFGx22Xs/xWdHG7EVUfSndy/JNmBToEehN?=
=?us-ascii?Q?BSIjSU6kCdJQwfvUAjYmkXBNToeS3mx6PBqPcfnDF8LoMtYNYBfsI/5ZAX83?=
=?us-ascii?Q?rD6ZdMHrDtCl5KLuqvo75/i8TxaRuw2vEIwepkLnlvj5oh2OEZ3MX5TyB/XD?=
=?us-ascii?Q?U2zfrNAtAfZGdsojJbNymRz4MlWHgmWW60FjOaJ7RTaM9gMbMkLr5nwXNLLK?=
=?us-ascii?Q?/yZnsBnhkVz9xBXDbmCzFJnGigW8kXXV4ZudExvE3CLLfaIrPNbzINWNyYIw?=
=?us-ascii?Q?Vqfes4CnMlj/F2Y8jWb1/GjvazpjQ95R9Jpriuu0uIk9DNVzcKtvYtZNXOQB?=
=?us-ascii?Q?gpOALHSm1xYdWKThhqs+bnFOMlzOwjllMRcYfmw7FvE9KAGFmpoBbHSA3HYO?=
=?us-ascii?Q?XJwyH/3CdlwyxtRlZ+QRZmreQ583ObTfQdgO8X3S86RzuNFGABpakPgrpF4k?=
=?us-ascii?Q?WP9GHhhKnDUxukoeBVT6cz0+765PKX6eGUyCpr9paWRfoS58zEiQz7sIhvfU?=
=?us-ascii?Q?yIkCRSqYbePHt+Gb4bwKqx04Z3viIvBBqvNnYDVCegtUfoPqblHq+Lez5MJc?=
=?us-ascii?Q?JOf5ETkXAo3guX1uf7UbnYaN45c3rXs3uFbXVa9QnY929SW8BecZz/Ebb5s/?=
=?us-ascii?Q?56UugBSAfs8B5PTNnKPxVprJgQGJqZ4pxgMUAF3wjQe88+buCtyM1/cn0SRZ?=
=?us-ascii?Q?4Xqq5vhlZBl/G6gKqWyGlCi2vHEioSqX+CWvH7lFiEWTYkB9mS0KjNu1MBwh?=
=?us-ascii?Q?MnhN67+Kfsgq/oR1zWT83FG58ERVw3bmjWZipdBwYdhytCCifci6Y28=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jyqxtgFVwXOcrOKYMSkJsB3oOLM1t3OiI9XpznuxpdiTLM/SzSKxhMf0csWA?=
=?us-ascii?Q?QPBjBf18mzs018DiRaxvWlzozM488tdRR1qbCY5Reg4ep8q5qR3+rHxkb7Cp?=
=?us-ascii?Q?SMjwwwhwtS633OXQxV0QJU5TKYtN8chde8bWtJlZmBuSyy57waLQpgQOnYAF?=
=?us-ascii?Q?SZTBQPUassneF+cYNgCVNNkgPc1tptcwfnt64ZArUXSTmSD2eS0Qbew04ZDj?=
=?us-ascii?Q?29m+9akm8/oIxzS83c4NaHjf55CnyRN9GlnDadHmZwJQsw18TxrGbzvw6mpY?=
=?us-ascii?Q?0yxSIkwqIl50ZEtw9gy6ucqfhCrjDOYU2iIRGdEnGrBtAGU1IRQqr5PzblTZ?=
=?us-ascii?Q?IWiXl1PtZA7maWXPDmES833AWFObQN9eA+SocwrstAhrQX5oKatJYKGsRMvX?=
=?us-ascii?Q?4Z5n0dWRp81HvsF+9PXYrfa8WwxXbOgqkKDOfiZD4oG5I6Nx6mS4lCEyTJyl?=
=?us-ascii?Q?ZUb2pleUdtkYnKxbuUKxQGMxFhiJZ/fiTN1yarO/frzWqLoIGI2mf0+75wOL?=
=?us-ascii?Q?+Az4jx33YHDJ+i+pGNh50IXMbg4yX+I5l8h6WS42qaqIJ57xzA8775vOdyhQ?=
=?us-ascii?Q?L9GvoIMRRhgWy0xVoS0WNmjWLHtb5CEVUohG4SfHNxxE/XK2evu6wSU2KmoF?=
=?us-ascii?Q?9BltP0UWAsnobFgegSoqtNKJ4IJZL1RzQuWLJTILquiLAoNLAgXmy3/V6+Hl?=
=?us-ascii?Q?B8qkbNlyIOxUbdLtASPjF2eHWHZDxRJaJfwrmt/nLcJKXt3OxsEdXUus9sVk?=
=?us-ascii?Q?PdW5LA3qTzPenSj5DLfPrKIYjaJQ5a+akpfN57bKslmMps+AC83SO+sv82Fy?=
=?us-ascii?Q?H/ZsqtYgE8naurSMMubYtp3bH1snVyk3WwcBHON+AJ2gbjmqJDkOv8RP2Pxe?=
=?us-ascii?Q?kolp44P9zPrju7d6uQD1cjurs5s8vjlAdT729TxRadHX6vhnLEYcMDzHaVF2?=
=?us-ascii?Q?JGrcSJxt4bcFW+jhceKvRZLn1v9ZO+f31bBhUcioHbFwIhcHtT45rybrhgzE?=
=?us-ascii?Q?9wbNSum01slimS4Nhs0xJLslf/qljJ/6M/9o7b3p9NxqUS0jmpWJM7Bj+DQx?=
=?us-ascii?Q?+g8rdmtPzGCrHTLXHLfXSPfcj7NnzmA1d4tJm9FhivStxzIaQpHKppxGzh5J?=
=?us-ascii?Q?AIWkhRLC2JWEni2AVPiWHxvSWccUtZjdjPRA1a13xiM+skkgPOqYu6buN6vT?=
=?us-ascii?Q?smo0DrnUp5ee5LipgJBabwjvRsj/wNw1DdjNvVJ/ZSx5HA9mtLYCG5oGOUpC?=
=?us-ascii?Q?D3Zsi5CbQaKt4nu4/Cua?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: eaae513e-9fa9-4cc2-d526-08dd70a67bb7
X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2025 22:50:50.3475 (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: MW4PR84MB1682
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/machine-learning.scm (python-gguf-llama-cpp): New variable.
Change-Id: I1c1b5f5956e3acb380b56816d180f53243b741fa
---
gnu/packages/machine-learning.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 7fdf5f37ee..7cb807ae91 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -6544,6 +6544,21 @@ (define-public python-gguf
(description "A Python library for reading and writing GGUF & GGML format ML models.")
(license license:expat)))
+(define-public python-gguf-llama-cpp
+ (package/inherit python-gguf
+ (version "0.16.0")
+ (source (package-source llama-cpp))
+ (propagated-inputs (list python-numpy python-pyyaml python-sentencepiece
+ python-tqdm))
+ (native-inputs (list python-poetry-core))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-gguf)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "gguf-py")))))))))
+
(define-public python-gymnasium
(package
(name "python-gymnasium")
base-commit: e2c2f98edd5d64921678c2570439dedfe662b1f8
--
2.49.0
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 13 Mar 2025 21:20:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 17:20:09 2025
Received: from localhost ([127.0.0.1]:58524 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tspyK-000682-TY
for submit <at> 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 <Morgan.J.Smith@HIDDEN>)
id 1tspyG-00063n-PL
for 76999 <at> 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 <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: llama-cpp: Update to 0.0.0-b4882.
Date: Thu, 13 Mar 2025 17:18:52 -0400
Message-ID: <CH3PR84MB3424D9E7B6E013CFE20DBB63C5D32@HIDDEN>
X-Mailer: git-send-email 2.48.1
In-Reply-To: <0dca61ca84a0608f22bbc78b8174153ff4795cee.1741900274.git.Morgan.J.Smith@HIDDEN>
References: <0dca61ca84a0608f22bbc78b8174153ff4795cee.1741900274.git.Morgan.J.Smith@HIDDEN>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
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@HIDDEN>
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: =?us-ascii?Q?fEkRfgWgTFNSuc5MdaOumINtHvr6wdWAEXyRX7Czc+J1tK9eIrZ4E6bbAbtR?=
=?us-ascii?Q?ZjiNiTmLpVlzaWIkgY6YQCTAvWVw60Rcb6Wki808wpxiDGz/NF131LorjWd/?=
=?us-ascii?Q?gtKg5k/q6eT8VjlnY3/VElShWZuUnKKCxB/HJpywXzPCV1WcGrYfHlE5o38R?=
=?us-ascii?Q?kir04Uy3RzhleEik5UPIIZz5YRrMRL0OniCZn7ICYwoq8kbCzX3YUxl2EDwT?=
=?us-ascii?Q?a8mThHkWOC3Ld3l0SHbSU7tde+G9SS3jC4MoFxI5Uqc53BsUADdbvWKY5x+z?=
=?us-ascii?Q?4PzHg0LiaDATUMKLBko8q7rxKZMAAtSC/ecM8GXhd2NdhA8MYFGYyE6vKaxk?=
=?us-ascii?Q?TaAAQae/DrdIJ3BK4KJomH5Rj3yDRrfd9JZkRv1MqXqlMpVlN9ANf37/wBKW?=
=?us-ascii?Q?gFoKYJP2x57QWrdJy7pCtuucVooqRiMA/7L/JfUA9yr8d4HXOKZToXU6PCPb?=
=?us-ascii?Q?6CXKDwmyG4YqV0Uw6Ye7uOwKYSy+C1xsf0dZ2WLLDH27oYEbcbUSY9tfbmvt?=
=?us-ascii?Q?vP9HLJbodrLgIW86tH8yqzUDD2eon3gvusbXJh9chJdl7TTVdBjgwlwLALhG?=
=?us-ascii?Q?vcureOglEGlC6I+gg6fDYwYViL/Eu5IdTZe4aR7IXD51O+y1YAd9hPLH67fi?=
=?us-ascii?Q?9KsUJrH3YnOB8tMenVHNKjbOmyuSfoo7SmsMKbFcgA3StusUcQDZPkI3595Y?=
=?us-ascii?Q?0xMuaJspAa5rVq/h6jKHzGvJ2+ziBiEniop1G3+Qq+H3cDghDxGR6/bIqdRh?=
=?us-ascii?Q?1Gqbf7ud7i+1XIJwEG8ULKDfcWIZ25tzlLuxn0GIwA91qj4TlWTfeABczslG?=
=?us-ascii?Q?TsoOw/Fijm+JjzTw0gZTM07haVa/1fZcpv0DKHy54Niawcjy52rnL53jNrwJ?=
=?us-ascii?Q?a/H6pyjxhJ+pGcsoP/A9j4G5wpD5KeXy84nTMYyzN/3NkkTSzIe81OIhu8yo?=
=?us-ascii?Q?ffc0Ry/xnrVyQxDeTID7DJTLk3C3/zR2wscyg0OTQJWY5U8743auUhFK4E4d?=
=?us-ascii?Q?5ntN89F7DKkG41ufPufC/M3VBWz5umO+z2upLiJdStEDmyOdRhzv0v1P+OFX?=
=?us-ascii?Q?D9xrpkrS1V46N1EeqF2lY2+s70cYUEmZQcN+iz12O6FwOqXvHZE2IYYxxNU+?=
=?us-ascii?Q?NgYpvEc/p7s534oyfAyi6+Zdto00qI1IL3Nw78IfYpUI7iJEk+PyWrMZ5k/3?=
=?us-ascii?Q?VQ1bcCzWRfoHBmpLSjfGoX5oqVdTzDnuJnsSPN+1LpFY6RFy5JuvhwFOfAqf?=
=?us-ascii?Q?Na/lhcHPC6byjEcYSA2sEX3jAZ8mHlcr3Eh83qc32OGsli3sjbzMPjE7+zYa?=
=?us-ascii?Q?9RYH9VFHFwDBb1lYDkymYwgT9dpQAZm4e9ueh02pXreVVQ=3D=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RcB9QKF2Mfgpp0oYZRMivUQ8FEzCruYaOKGBRw7uh4X8LRIequcjEWTesneZ?=
=?us-ascii?Q?rdPJLRMKEcpiW6eJT82LWeRpGivVDgfve7koWfcS+ncsGPut4aLVJfq641Eo?=
=?us-ascii?Q?vN9DYThOXsl4SU7XmpbIpa/YA5Mk16hqdBBU67kNzu01gyGRUYnlI3M+/LWf?=
=?us-ascii?Q?P37Xw2I6vxEP+52fqQQQ5ccvK1RVuGkTRacL1Up9/Gxfugp46YnElAbVaRt5?=
=?us-ascii?Q?VzPUWXnG8LqWYma9QuTysCvy7afptbM8NqkCM16vgMen59CWlXMWvjOaJy/J?=
=?us-ascii?Q?tTeAzrueXoK0z+lxABcgUsbu+1oz6ETFDwwA0va23ofoCg0gbNOBDPQ0Ovpp?=
=?us-ascii?Q?Fso9ASjpIrAdgsSk1PblW98tSS2ttBxWtA6AKQOdTXe169R9mpJOlfD5lSH1?=
=?us-ascii?Q?QMsafwaiW9zu7ZFowoPahj2P9losVaBCHRF4lFzZhTHep7DKBPI2XquSEvGs?=
=?us-ascii?Q?d+8txKm7gg06tIS+5wxItVVb11G5mEijqWAMDQZr6Lm1R5mTcZTRssTV3wnR?=
=?us-ascii?Q?M8x65lxCTfAxibt0vQx/D8FIgz6K7qtl9+lQYhl0c7TredNW01J3uwuNlSHG?=
=?us-ascii?Q?ru/XK71Nnt3G+I9e5vOvlucnb94s48kVXhLxVVwmzoPOgoNxkKr8/e8siVKP?=
=?us-ascii?Q?j4DFTsP7rIdqy+D6a9LFznsi5fGXEEj1J+lVxiEOAIm/CVRVhkKiN1MB+8MT?=
=?us-ascii?Q?RP1UP6dITe0MSHARXjMaTDfy9tLF1alMYqQ3dz1CeZ0L5A9sVqssC3772mgG?=
=?us-ascii?Q?vTBPrT9rbnNkPc0AAtAqe8V+yFEfVRSXJ6JqUhgLWrIsw2Z2zCgCx5hsyhwd?=
=?us-ascii?Q?mDEG6OTvAJPU3l5KyUYoj3zgPYav57Zpf/QjR6cDwLoNAJNRYyVV2w4MkkUf?=
=?us-ascii?Q?OsPZjrZzPnJppR6oVWuC2bY81iJI/hIVS7CPcQzcpzty7rMTr2AxKBMUHpmk?=
=?us-ascii?Q?/CM4kyw2tsdzZ8Z6Awdn7ty+Ih+nBou8msGkwm3yf9PVSCovl7aWMzOdzkWF?=
=?us-ascii?Q?RDQ54q94YCX31H8g3lXj5nwXMtO2HJUA5dAwcmfJ+cDDYnMYG0Uza3n+n+ih?=
=?us-ascii?Q?OuhkCC9QWleRU2gKnlKG4v990DUsIkozNzJqMyZ1zWlUmVdSNrHywlQk5b50?=
=?us-ascii?Q?Uni2aenINGpBZF2ymLARcHfLY1BUG6rojwDbfFIu2JFioF0b1gKhIe21i+i2?=
=?us-ascii?Q?q3B+SRyMsdqeQeuRmpZKfrkQHKGIkrzOw2/10OakMca/t6C+f/hIscnT60Jq?=
=?us-ascii?Q?lZYlUlcsh4JxVKVQOFtcOKCtJv2Uha5R0t0FVxov5Q=3D=3D?=
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-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <dannym@HIDDEN>
-Date: 2025-01-29
-License: Expat
-Subject: Make Vulkan optional
-
-See also: <https://github.com/ggerganov/llama.cpp/pull/11494>
-
-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
--
2.48.1
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
Received: (at 76999) by debbugs.gnu.org; 13 Mar 2025 21:19:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 17:19:11 2025
Received: from localhost ([127.0.0.1]:58519 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tspxP-00062S-6Z
for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 17:19:11 -0400
Received: from mail-dm6nam10olkn2081c.outbound.protection.outlook.com
([2a01:111:f403:2c13::81c]:34497
helo=NAM10-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 <Morgan.J.Smith@HIDDEN>)
id 1tspxM-00061x-K2
for 76999 <at> debbugs.gnu.org; Thu, 13 Mar 2025 17:19:09 -0400
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=YbT577ns6zNt1MtiENCPHViR8fLVlPwdEKB8wbc52bLXjv71EwuM39heVKeigNtYSC7RjuF79BMSglhGJdtVIeYQ+J+S2W4s+51Nx1iRnfpbI9UwLj/bewvlhlbUk6+iFdHX8kg45PX3TL4FpB+DgFUhasmYTz7CIOGeWNPJn9I5n7j6P0wf+2ZRb1I95eJKZ/b4onJKAVi+Lgzn50eBNhDI6QZSdpbTYR3ej1GoQq7tysW/mfqDIoTJNjCXue9u1ZPXtn+wwBgWt3LUt2cCiOsJSjDAvCaHsxgzEybAujQ+o4YkyJXTLe7dHeCUezgw7jBKucC1j+hXV8fSmPtFEA==
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=H8+S3q80GwkhhgrazfOMJ56gHGNlu9BASXY8ZgkmPUM=;
b=JuyPhK0gtbFD4OfV2II29QIEw9MSjqAZ5NJ6qvXYZZ+WPahxc0A+OnghTaDlaQ933gLK5L7/kCdA8KGfbzTLPPpnKQVs+1IYfwMxBN3XvG/r/o3GME5SK4NBit4yA3HJ79Krz/Yl8o0Ji4jRWs40AtE5mYkzELv+B+FPhnXlGf/c7tT1TS9AcvYp+z5P1h+qV74OThbibvrZIlalatPDj12w0KaH2cE7fSjPqoquvFUPBlbr4hKEkDWHm9lcq/E9hh6sKA6q/7VFY4wxVvZGGv4XxG2rODRpEtwHT0A32dTQ2FeR3VymA1KGJEuEP3NxL3rVmOTPMuXYE4d52gPwZw==
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=H8+S3q80GwkhhgrazfOMJ56gHGNlu9BASXY8ZgkmPUM=;
b=j9loReO1DZ3ZAClTbCVnwQjcc7uthDp/2S5j6xL82LOs7XKHNQhJbikNjg5SiWeNNMPkzjtLm9Jfrpggo4Y8kgmtnW56TlWEF0tGARRV4JGaXIszudOi7UzzViFb8DVGeRyfCLmD5ATDPzQtQ+iZRlIs1niCXPT/4htG9l1/eSuzTqD2aRuG3iY0mqSvW+JEhvIxZzNrit4Iy5HtMBQ2a94+KSPSLtuQX/X9cJY+Lvdg2qf4EeEGv+Qg82XSUu+aEDtOQ6rI1BIbHy/Waa8+ItuqWOWaItDX4TcMV1Q8pVTOApSV/kMQv4fCYCpVGRL8QH1jbmXCdmxnhjdj/r/PPg==
Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17)
by MW5PR84MB1500.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1c2::21)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.28; Thu, 13 Mar
2025 21:19:01 +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:01 +0000
From: Morgan Smith <Morgan.J.Smith@HIDDEN>
To: 76999 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: Add python-gguf-llama-cpp.
Date: Thu, 13 Mar 2025 17:18:50 -0400
Message-ID: <CH3PR84MB3424609A3E0E8CE70C8AF473C5D32@HIDDEN>
X-Mailer: git-send-email 2.48.1
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-ClientProxiedBy: YQZPR01CA0154.CANPRD01.PROD.OUTLOOK.COM
(2603:10b6:c01:8c::13) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
(2603:10b6:610:1c4::17)
X-Microsoft-Original-Message-ID: <0dca61ca84a0608f22bbc78b8174153ff4795cee.1741900274.git.Morgan.J.Smith@HIDDEN>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW5PR84MB1500:EE_
X-MS-Office365-Filtering-Correlation-Id: 5888fdbd-78dc-4661-eab4-08dd6274ac83
X-Microsoft-Antispam: BCL:0;
ARA:14566002|7092599003|15080799006|8060799006|461199028|19110799003|5072599009|440099028|3412199025|41001999003|1710799026;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bWUI11xSBsDAekE28s9ipTOl35sUgK5AZIPCdTikDfjY73bPrPHcyHhnYFRR?=
=?us-ascii?Q?DevoVEmI4xtIbWXCUZGDbNgN2J8YyyF0ItkfSP7n/1BujbwjOOJvzxCRGM2M?=
=?us-ascii?Q?h45tjAfeGooRLIA4hMByVBfzngg92RCEp7QzRLH0fDvmrSvYC7oFyCKGc9br?=
=?us-ascii?Q?dgHXik1WFTGqtIYqbWi2kVXO5yx5e0xgVZ3EQ7WtEqntlcbbbMSSa695QisK?=
=?us-ascii?Q?fWdRn1NU/jB/9g6WyMHWBVwnNmCd6uRGOQediqjqqrj2L021geSU4sKiDF6l?=
=?us-ascii?Q?1uAepDPNCF59kWLnIseS4X8SXDFj/VM7GvmEnyhT+OOyRmp4YvA9DD0NYkMo?=
=?us-ascii?Q?osBfZc58WjKcpOuJUiqH65QtAxDlmW7Rn8peqITmwL9ScsP6oNiZupM6MIkN?=
=?us-ascii?Q?ICEQzgWw8VFruG9M46pkvDqcoNLi3F1S+Hlu5unnSz/sLQmlamLPUb/aZA5I?=
=?us-ascii?Q?n5Qvd72i88mht0A29eEBg5cUa4OjZbJeHdxaqRWXu44tsODpJyx6ztu55RjR?=
=?us-ascii?Q?F8XqXkVjKD97dMaTJCHernKMVoOVHOA9ZsTkz+aAfptx+pjTMZ4vh/xdUBWV?=
=?us-ascii?Q?jQjUFdf2FkeTgXzzX4SYSfILoG2KW6ccSGQ4a8H04s//osht36XtQWdQnAus?=
=?us-ascii?Q?fVwxUgwaorijyFAnBltqlWkzsdCNjkrJr0e1MouUpWGo4onbkHJJ+AJ3NDUJ?=
=?us-ascii?Q?UAOoWCWFp1wG9sRTLM4TPTXZ9NDt7VtLMNkZhWWbdRkOQ3tcppS7nD2u4Fej?=
=?us-ascii?Q?4ZXjlBX26d4BfoOqSjhTTGhk6tveIPSz8RYrS7x6GEmd8fNXS2pduPi4lf6m?=
=?us-ascii?Q?dy3i3fSIgIjymuQT/lpQL72oINHHLESlTJLeXDKYpkpJYnmh0QcatzYwU1sG?=
=?us-ascii?Q?WpqCEJhNDATYszKNHiOJ9Qi23f2S2yAj2Gyb6gWR931pz3iLzohTCreTf8ry?=
=?us-ascii?Q?CxHPNITf/9gKgsOWspRgRFyBCZ32xWDOnNvKeSN8tzeTqGxRt5YPnBIa4Mta?=
=?us-ascii?Q?Ovf8UqjF2sBPNSCNbOPCuBoHVRnX6aNCy6Gy0B5Xao+vNX0q/CouwX0zbZjn?=
=?us-ascii?Q?1vibc89k1kIB8jEw8dUrnGR2oECiFOPlLOILQPqSZSs8EovvRU92n4hbEdUz?=
=?us-ascii?Q?urd6VW0lGwKFRE3lvTdhdJJKa+KWkTdKGg=3D=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8fPDjq3CUHEo4T+OzS2TDXmntSQCRVmfNw6EQ4a0RoJhzZROn4yqwYPhG4hY?=
=?us-ascii?Q?lC8pMN8SHpQsp/6KFvkVYo0bKDFQ0Wl/xsahOG7vuYIE680CX7Y8+SFLKKXX?=
=?us-ascii?Q?2KDXuii8o9hbbRxOD4INdfH2Njvn1CtZ2uQ3BSH6Q3IkgAsT75m9So82xSjK?=
=?us-ascii?Q?KajfvPtTo5gOyd4Deed9KvAUTR5+mlCxx41Ny2734thMpaP4C/C7ALGlDBXP?=
=?us-ascii?Q?9oV3f/FN/ayG89UexC5CmNXIgFg0w+JVxJpyxnwU77XRUXl0JUr5LzUCqyCt?=
=?us-ascii?Q?kzTgsaznqVY/O1WEjiYUOsZWUoaGnYzEWYg9paZwMxkWL5ogMLS3byI72KTJ?=
=?us-ascii?Q?0kXee7STdix0rs9cfjA6ow3i5mkkFTSf+wkneyP8dqCOJl26NhPB64XeJ06L?=
=?us-ascii?Q?Vo6w5oHezy4PMJeODqf0uDC5zoa7pM1E5Zrvh88SMoyv/k1GMXTjR72U+DRm?=
=?us-ascii?Q?6LutzEnI/zl/koEMFFK1bpD37LcGxgLe7WVtaPy/ZElEuMp6vxgQzOuvNN6a?=
=?us-ascii?Q?VdlLVp06jJlGkqibHh8ZmSg/DYCdlyOuceFe2jwMiceXBEjY1PB9SPOO3bFi?=
=?us-ascii?Q?AUyATTI09TGLcPEqus9sQlzbxszUIfXoF37Pyp1h3nq2eGHMZELc1gI4pxRO?=
=?us-ascii?Q?TyItu7Ks0dtgpAdF8igwkeemSD0rVu0KN8Hzd7KP/gopQmwzDhw0jxhlo1Ls?=
=?us-ascii?Q?sf+3OGjslhT573oE23/cGXKcnAjIt9Iw7v7my/4pz9KepMSEUKF6tFH6nry8?=
=?us-ascii?Q?LWSIKVRzzz6lIIpe7CpUD19kt5vvAycuChAUIja0iNi3N9swR5Vsmba6wZf9?=
=?us-ascii?Q?EDuYfm0czXjFFEhbZGdLqyB3q+5NxH+ifZK50OwXzztnM+hUlcEpBsDk9//L?=
=?us-ascii?Q?iOo/jieS207lUVbPVckKYtsUJPmNtxV9K/fjFKltzdDdV5HjdD6ERWlc7lr8?=
=?us-ascii?Q?YEwuZbtup//ivHaURxpIk+Rzm6hc/fdvfUxcn/dQ/o9gfWWQlJJ/LNbg/lXf?=
=?us-ascii?Q?xoT3C8ElpiT1NFcKxa41iDzBOpbwldMQr2ivkNql2ZUhByQpLt9mx622/1Az?=
=?us-ascii?Q?GMMh3EOu1Xhu1qeXCeQBzUkKt411xADJP2frFw34L94WgHbneZd4E3eVMwds?=
=?us-ascii?Q?X0m7fCkY2X+ZVxhGFfxbu0Sa789Wk09kR13pLRTqlT0eSHXNTcpN7XfHSy7d?=
=?us-ascii?Q?ykUBrnsE/WnHmNryV05GgOsR7J3ob5aerseyuRt7zVLnraUBXEvTmIKcW9pO?=
=?us-ascii?Q?XV3O5vjkwmT34oMU4TdRL6aNV2j0oJ9cQ0OjPQ76NQ=3D=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5888fdbd-78dc-4661-eab4-08dd6274ac83
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:00.9968 (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: MW5PR84MB1500
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 76999
Cc: Morgan Smith <Morgan.J.Smith@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/machine-learning.scm (python-gguf-llama-cpp): New variable.
Change-Id: I1c1b5f5956e3acb380b56816d180f53243b741fa
---
gnu/packages/machine-learning.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 246b004156..ee5feb58fc 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -6490,6 +6490,21 @@ (define-public python-gguf
(description "A Python library for reading and writing GGUF & GGML format ML models.")
(license license:expat)))
+(define-public python-gguf-llama-cpp
+ (package/inherit python-gguf
+ (version "0.16.0")
+ (source (package-source llama-cpp))
+ (propagated-inputs (list python-numpy python-pyyaml python-sentencepiece
+ python-tqdm))
+ (native-inputs (list python-poetry-core))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-gguf)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "gguf-py")))))))))
+
(define-public python-gymnasium
(package
(name "python-gymnasium")
--
2.48.1
guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 13 Mar 2025 19:48:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 15:48:02 2025 Received: from localhost ([127.0.0.1]:58267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tsoXB-0000mh-VK for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 15:48:02 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56504) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <Morgan.J.Smith@HIDDEN>) id 1tsoX8-0000m8-KP for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 15:47:59 -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 <Morgan.J.Smith@HIDDEN>) id 1tsoX1-0004QN-JO for guix-patches@HIDDEN; Thu, 13 Mar 2025 15:47:51 -0400 Received: from mail-sn1nam02olkn2026.outbound.protection.outlook.com ([40.92.44.26] helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Morgan.J.Smith@HIDDEN>) id 1tsoWz-0003uS-S2 for guix-patches@HIDDEN; Thu, 13 Mar 2025 15:47:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ryuX2K+oApOKikf2oyFUmM8rPZ2GOaQK/dQTIuMysKZKEPFZsEzpIw4aDHjQuVKDhRm3HfkRQdmEvsJElD3pptbg4dNaQaqEMrQ7v8PvVoP8RYZfm4z6VWel52scv+EidVWaxKmS4WIzDBB53THtpQMy/vgxWPZ2Jhvo2Pg8aJD40jATrWQN9C8/EZdAIJ0qhSXJeEHBytUHnai001wWp8hBzOjnhzkAfNbzdg+hDLgQU53l0G/I1NFhWnBCqoN6Wu7giljLN6tV0brzjxzUGqJHbuNNEFiFlxLlqy4EkkqrLpX140uGBAf+j3ivp6KhJ7R69Kfk3o5Ce6f6q6bPvQ== 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=AsMWjWqbQYN86JcWzsPwfsHdztcPn3wvxfIhFwjmMow=; b=B4OILZxBuy8oMpaRrcMv1v1Am7OH19Fai4By/YKRjhDvt8K14Mm4PGJ9Y9S0+qGCbJT4GhxHF7jxnJCJeBOL/W0tgLq5v96O29H+4EKCHTauFV+5eGRNU/+dYSl6atXWnGSkqlcFzwxAPdbkQbegbZcnPfEhBdcT2by7ZyJtJYJsNur5p0wy2bfOQD9cZoe3Rk/BLXJHhvFLkLB+3Mm7hayOfj3mg76hy6sDs74WZBKDeT5/qpPQqaJjFwgd7DhUQnvBmcgxO/jckxVAmOGEEY8MSeBLo5hpYzn1uIICzvoMfT+7AbUXTs0s8WZ4e9od71rCmqydaPYMR4UZBYvQBQ== 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=AsMWjWqbQYN86JcWzsPwfsHdztcPn3wvxfIhFwjmMow=; b=Edr1/BrYykwStFyMAGx4R7TZEFJoNYPmljiWe+nO6S+qxWbqI0jJytIr2lA+iatCOAKePEJZfsH5Inb461jV9+IHvp9jsxsrYgtdzwLQxti/+1hqU8DdOOiK2U8YwpNW2WhPk1afaF2VUISsmB1xyWtcWObnFJ9tyG2vZHCZxnqQhqtz+F96qKkFTnOyMPrTEP9mgNX3jVH9hs0plXzKAL2ofm338j95Bt5eHQtXQOWwLywuqCVl19nI/qZa4lfTrvNBH9J0XsUiEFIrZrF8J4KidTnGnBlTUZU0p3udQYEhRQFNk6j3VCH1ghVtZtW1wYfxIoJ1rkj5MxLxrov/Dg== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by LV8PR84MB3968.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:408:224::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.28; Thu, 13 Mar 2025 19:42:44 +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 19:42:44 +0000 From: Morgan Smith <Morgan.J.Smith@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/2] gnu: llama-cpp: Update to 0.0.0-b4882. Date: Thu, 13 Mar 2025 15:42:37 -0400 Message-ID: <CH3PR84MB342448E7EB63F85EA958565DC5D32@HIDDEN> X-Mailer: git-send-email 2.48.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: YQBPR0101CA0232.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:66::13) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <cover.1741894740.git.Morgan.J.Smith@HIDDEN> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|LV8PR84MB3968:EE_ X-MS-Office365-Filtering-Correlation-Id: d1f3bb7f-271f-4d75-0ea1-08dd6267393a X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|5072599009|7092599003|15080799006|8060799006|461199028|440099028|3412199025|12071999003|21061999003|1710799026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?V+JVxsoBRXpvc4vAzB9MX5reF8XBnzhjyozH/nUNhQX7M4Xk+UTeGA27c0y4?= =?us-ascii?Q?tn7MDFmv1ssf4DD6Tg+87OCcqAwSsnvuD7xaafiE7n+m9ZzRZfJC4Ww9MOdY?= =?us-ascii?Q?veKwkp8Kt1y1QRL405tyizW+taX3af25ASEyIpmDNPeQc+owtrvHTlUGl0js?= =?us-ascii?Q?drJeyv83ugg7eMYKP1UWoH6Wj5invD5A5I5hwBqjNa4dvA6C+FHdZV0X/WxY?= =?us-ascii?Q?ms4YW3NlUC/e5d9eEsVy4VOeKieYdZyHx8bbtpZAXTUzjWX4++GRB7lmzYDs?= =?us-ascii?Q?JMD1R86RSZCdxvYF0YGIRaEDpDTV8Dz3kc2Y0S6GDXHMWLXRpMGw+n+Fkns/?= =?us-ascii?Q?MTjtRRToUQGcnqLEyqZ06KHYov4t/8MVVRgqPCAeO66Z9a59OFW+BUqI42CF?= =?us-ascii?Q?m59Pm/JHx8RI3HpxuTfSmn4lQB/okqnFBbMcCVZ18N/dgUdmA6LcI5OtMH7n?= =?us-ascii?Q?3Y3qIfFAgWRUEQLq8/5rPiYxsznv30EVc4a91Ca5d5z5wxQoF7yuCDhtZV+B?= =?us-ascii?Q?O5hlBlUjauTmsmejO4CMO5fQC8R9KphG8h61+vRsY1gwRX/5M5aifuS/q0Nm?= =?us-ascii?Q?ccFoKCglrZeOzKTuSQlNaMgsW+SBd2Dvt4jYnkwPYtHG0WLhzSy/qfnboaji?= =?us-ascii?Q?brOrK9WnVN7cCcHlM8c8KVW+GLZWb8HetXpB1FbD68+KywA+cj9H+SXK0Kap?= =?us-ascii?Q?eKUnraGn28HbbvtKuepvy+jvaglnTsonDXsvaI9ayRzJwc8w9xvNcmV4JoaQ?= =?us-ascii?Q?g7BEfntRbvFw2YEpgaDaTFn4UHI9imp920iZNzKJHnMwUJiwXlIC0isyu+Yn?= =?us-ascii?Q?NW+oXvxR02qfkXZ6GIZcT6w2SCgCNCAn5uYibJHi1g+EdYRrsJsZDfRnxJ9v?= =?us-ascii?Q?vM1f/n4TpfIdHeWHU6QbY6DRIO62xKbIvXhRb2P+0xg5xdZYChHhFCv9eO1Q?= =?us-ascii?Q?4GMnR2xPYDG7Pw+87MWmLfnPsaXFZaupIMzQvkjAiaxLQNZ/BCpsWxwwzY2M?= =?us-ascii?Q?GFNoqtMUaTjjaUX9iQA/oMRneOS5VZSv0AUlwKFUeRLp7Eo2zxyxZOODd/uf?= =?us-ascii?Q?fhnMpnl7L7SqeL6K+ZL5kLO0QnTH946HDO/oI0DhUmdlflPDQBSt53qB6nHL?= =?us-ascii?Q?/oSc307N13h1Atmc2bsZbr824oWE483YFpRPhaB7P2mPHaWmSHhpXRY=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FH/f0QPX77G07q05b4bD5KR0Gc9VL1KiZ7cD7R1n3O83gxhRd7K4S8OBvSqB?= =?us-ascii?Q?llHAhyBhWvvOJL08Dt+NrgaNuPT7RdaKtJ6MIYfP7SSgw1NekoNq1YogQBH4?= =?us-ascii?Q?jB20ktsZAxw8o/tuVrVNp3zEU4WBeZd/ngJ+yBqsdmRdIsGozD7uanzPifl8?= =?us-ascii?Q?7dM8QMELUkcrgSWSdqZizPa+/e/uIKc4hlDdgL1LiHipmSgLoo4pxjirfeBd?= =?us-ascii?Q?PuXghIx/3xxVDP5KcmSG3fS1IIices7u1RiaGi72JMCqrU0BGfOFzze52w1I?= =?us-ascii?Q?tI3saUI9EmLs4TBxSMYJrTpBgm1+EnCtRz231ZPqHqcR3R8yslwEb0YeQ4Ka?= =?us-ascii?Q?nVDjsBN8oPCF3Do9n2zzZshh1OnhG2gX2gKZ92uKkwnimFX3G8rLFn+kMEih?= =?us-ascii?Q?/OLOT6f53iljWeKlnsAs8KIlaFWpc79GesuMvOSg5V+OrLvfMb+wAnMQdy4c?= =?us-ascii?Q?iM6Wd1fH/6gbyKXvRfO6Q0HTFvqUU1B5icuriE6f71EAAwqb/udZd1oTOwzh?= =?us-ascii?Q?TmSNuMVk0JJUtVDXW05NU4HMprWlgVlaYjNJgKIRAaeAGJ1sct97+W6SQWZz?= =?us-ascii?Q?UlCXxK77eA5FjnsPfEoqgYpODQnaTU5b8BJnitIk3cCO+S+GbhPGol8RuXSr?= =?us-ascii?Q?KbzLHUYQpMCjxCLDjG0oZlvf1+FUuu7TzUs5FgxpeNwmVwBq8KL3qQqjDjs8?= =?us-ascii?Q?aZoynxAhM3iDCdqWSOXPOL2YjkoDlRG7+GLcjWrfW6YNnlSQrhwBfcN52nca?= =?us-ascii?Q?DdioZ0HRUhDIHrDrHiyaeSjjvjfeLYo8NTzXlDg9P/QDYPN0GjO5Ve9Mp7mW?= =?us-ascii?Q?ccNq3WYrJK6j4aJbQf4GCPYxX/OMsRgAig4VGOAgmCFRswdBzNd0lPYtfyjp?= =?us-ascii?Q?ZMMWaKmAKPRtRFkRCgTeCnrswlviXKPIodYcR+Y92cG8VYtflCWEop2enxyt?= =?us-ascii?Q?5avSD6J+S0U7dwj7UiimgJ72tz/0Tg6wBiq3kSKTBbt1OI3RD6c3H+9OLvkN?= =?us-ascii?Q?yHBpl27ikUOB/7alhfAsNOs6AUtlSagEGDiUOO+wJRIXwSRWmNCF//QBOEgM?= =?us-ascii?Q?LRa+DaxD5Vwrh/AIexehkBdRiPZpD5YI5hk9h4uTbnwD9zVOxNF4LoMq6h/+?= =?us-ascii?Q?zCbWXRe2lllNhjGVajBznLNAebCUq4ofleJUmOHm37WPBpJJ0VYwZIdS8RDh?= =?us-ascii?Q?pO5iIkddw1Vs9v8DlT1t2friJMQAYprWXZGiZnhhoU9jBNFgJgPXXdBqfKbp?= =?us-ascii?Q?7h+B3RI/5ibIjao8uZanbWh/L3ZX5SZjdp8oQy2pfA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1f3bb7f-271f-4d75-0ea1-08dd6267393a X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2025 19:42:44.1910 (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: LV8PR84MB3968 Received-SPF: pass client-ip=40.92.44.26; envelope-from=Morgan.J.Smith@HIDDEN; helo=NAM02-SN1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Morgan Smith <Morgan.J.Smith@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) I was having some troubles running llama-cpp as it didn't have the ability to download things and the python scripts didn't seem to have their dependencies. This no longer installs "convert_hf_to_gguf_update.py" but that didn't work before this patch series anyways. Morgan Smith (2): gnu: Add python-gguf-llama-cpp. gnu: llama-cpp: Update to 0.0.0-b4882. gnu/local.mk | 1 - gnu/packages/machine-learning.scm | 49 +++++++++++++------ .../patches/llama-cpp-vulkan-optional.patch | 38 -------------- 3 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 gnu/packages/patches/llama-cpp-vulkan-optional.patch -- 2.48.1
Morgan Smith <Morgan.J.Smith@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#76999; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.