From unknown Sun Jun 22 00:54:30 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#69102] [PATCH] Update llama-cpp hashes to latest version and add new script names Resent-From: John Fremlin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Feb 2024 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69102@debbugs.gnu.org Cc: John Fremlin X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17078383738385 (code B ref -1); Tue, 13 Feb 2024 15:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Feb 2024 15:32:53 +0000 Received: from localhost ([127.0.0.1]:45640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZumD-0002BA-8q for submit@debbugs.gnu.org; Tue, 13 Feb 2024 10:32:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:51372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZumB-0002B3-HE for submit@debbugs.gnu.org; Tue, 13 Feb 2024 10:32:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZult-0001g7-Kh for guix-patches@gnu.org; Tue, 13 Feb 2024 10:32:33 -0500 Received: from spribog.eb.pe ([5.9.0.72]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZuls-00028u-4b for guix-patches@gnu.org; Tue, 13 Feb 2024 10:32:33 -0500 Received: by spribog.eb.pe (Postfix, from userid 1000) id 1413814EEE43; Tue, 13 Feb 2024 16:32:31 +0100 (CET) From: John Fremlin Date: Tue, 13 Feb 2024 10:32:12 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=5.9.0.72; envelope-from=john@spribog.eb.pe; helo=spribog.eb.pe X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.1 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) Change-Id: I9f5474606dd01be73fbc50813250991e9d248d85 --- gnu/packages/machine-learning.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 2e20872555..53e152a88f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -522,7 +522,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") + (let ((commit "03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc") (revision "0")) (package (name "llama-cpp") @@ -532,10 +532,10 @@ (define-public llama-cpp (method git-fetch) (uri (git-reference (url "https://github.com/ggerganov/llama.cpp") - (commit (string-append "master-" (string-take commit 7))))) + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p")))) + (base32 "1ag1jash84hasz10h0piw72a8ginm8kzvhihbzzljz96gq2kjm88")))) (build-system cmake-build-system) (arguments (list @@ -562,8 +562,10 @@ (define-public llama-cpp (get-string-all input)))))) (chmod (string-append bin script) #o555))) (mkdir-p bin) - (make-script "convert-pth-to-ggml") + (make-script "convert-hf-to-gguf") + (make-script "convert-llama-ggml-to-gguf") (make-script "convert-lora-to-ggml") + (make-script "convert-persimmon-to-gguf") (make-script "convert")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) base-commit: ffc7650c11fd7c4b9f7b4894f8e0a451e0e49063 -- 2.41.0 From unknown Sun Jun 22 00:54:30 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: John Fremlin Subject: bug#69102: closed (Re: [bug#69102] [PATCH] Update llama-cpp hashes to latest version and add new script names) Message-ID: References: <87sf18d39y.fsf@gnu.org> X-Gnu-PR-Message: they-closed 69102 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 69102@debbugs.gnu.org Date: Sat, 02 Mar 2024 16:10:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1709395802-20545-1" This is a multi-part message in MIME format... ------------=_1709395802-20545-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #69102: [PATCH] Update llama-cpp hashes to latest version and add new scrip= t names which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 69102@debbugs.gnu.org. --=20 69102: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D69102 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1709395802-20545-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 69102-done) by debbugs.gnu.org; 2 Mar 2024 16:09:52 +0000 Received: from localhost ([127.0.0.1]:39210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgRvs-0005Kv-Fe for submit@debbugs.gnu.org; Sat, 02 Mar 2024 11:09:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgRvq-0005Ki-6F for 69102-done@debbugs.gnu.org; Sat, 02 Mar 2024 11:09:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rgRvI-0004iG-27; Sat, 02 Mar 2024 11:09:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=z8CcVQdGmjthGSYN3xUdIbjQlW1cPcOuSRU3+xNxvb8=; b=iytCl9fvUW+Jwt+ljpE6 tBQ22SqgmOvNbCZwm4YQYNm+nBRhESxpLmmFh3dGYwj+n/C5d698migOqkh9E2rB0vy7kmzeHKYaM S2f6nNLbq8qiIQQp81EXaxoa/TG6vxI11ijpo4MeJGh+IGmXapFr9QZTGgTmp+OYRbkiWGCFWNS8x q9tdg52+wDdSVWdF0mlgascI8t1unGsMHW7B3zdXazBAt+TdM2sLqYg4cjFtwEqpqugDHbeYmccnf GJKSWdT78znyhOVMNIcSjjN4xzt2seotcvpFSQxTcYZERhNoVMv6Uc7UrpDgekps0mSZw1KkdJcaZ 5VT0ckIpZnVfqg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: John Fremlin Subject: Re: [bug#69102] [PATCH] Update llama-cpp hashes to latest version and add new script names In-Reply-To: (John Fremlin's message of "Tue, 13 Feb 2024 10:32:12 -0500") References: Date: Sat, 02 Mar 2024 17:09:13 +0100 Message-ID: <87sf18d39y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69102-done Cc: 69102-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, John Fremlin skribis: > (define-public llama-cpp > - (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") > + (let ((commit "03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc") > (revision "0")) I bumped =E2=80=98revision=E2=80=99, tweaked the commit log according to our conventions, and applied. Thanks! Ludo=E2=80=99. ------------=_1709395802-20545-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Feb 2024 15:32:53 +0000 Received: from localhost ([127.0.0.1]:45640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZumD-0002BA-8q for submit@debbugs.gnu.org; Tue, 13 Feb 2024 10:32:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:51372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZumB-0002B3-HE for submit@debbugs.gnu.org; Tue, 13 Feb 2024 10:32:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZult-0001g7-Kh for guix-patches@gnu.org; Tue, 13 Feb 2024 10:32:33 -0500 Received: from spribog.eb.pe ([5.9.0.72]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZuls-00028u-4b for guix-patches@gnu.org; Tue, 13 Feb 2024 10:32:33 -0500 Received: by spribog.eb.pe (Postfix, from userid 1000) id 1413814EEE43; Tue, 13 Feb 2024 16:32:31 +0100 (CET) From: John Fremlin To: guix-patches@gnu.org Subject: [PATCH] Update llama-cpp hashes to latest version and add new script names Date: Tue, 13 Feb 2024 10:32:12 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=5.9.0.72; envelope-from=john@spribog.eb.pe; helo=spribog.eb.pe X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.248, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.1 (--) X-Debbugs-Envelope-To: submit Cc: John Fremlin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) Change-Id: I9f5474606dd01be73fbc50813250991e9d248d85 --- gnu/packages/machine-learning.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 2e20872555..53e152a88f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -522,7 +522,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") + (let ((commit "03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc") (revision "0")) (package (name "llama-cpp") @@ -532,10 +532,10 @@ (define-public llama-cpp (method git-fetch) (uri (git-reference (url "https://github.com/ggerganov/llama.cpp") - (commit (string-append "master-" (string-take commit 7))))) + (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p")))) + (base32 "1ag1jash84hasz10h0piw72a8ginm8kzvhihbzzljz96gq2kjm88")))) (build-system cmake-build-system) (arguments (list @@ -562,8 +562,10 @@ (define-public llama-cpp (get-string-all input)))))) (chmod (string-append bin script) #o555))) (mkdir-p bin) - (make-script "convert-pth-to-ggml") + (make-script "convert-hf-to-gguf") + (make-script "convert-llama-ggml-to-gguf") (make-script "convert-lora-to-ggml") + (make-script "convert-persimmon-to-gguf") (make-script "convert")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) base-commit: ffc7650c11fd7c4b9f7b4894f8e0a451e0e49063 -- 2.41.0 ------------=_1709395802-20545-1--