From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WI8tGJz+y2UOWwAAe85BDQ:P1 (envelope-from ) for ; Wed, 14 Feb 2024 00:43:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id WI8tGJz+y2UOWwAAe85BDQ (envelope-from ) for ; Wed, 14 Feb 2024 00:43:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707867804; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YaS1o6xq7WGg/xQMXeDSxJ5AJr6xpeQZD1tZimFVwFM=; b=mBiykiscRn1yzuGg/WM1Xpaxn54Dz4p7QdLnaQRZDFrU7lfUiZjubueL4T2jpiecWjX0sI 8V9LzilfD1v0hrfpSo0OtqZe0ggZ+20U+NUHZfb6QhD7C3ffp9vVev222ghtHVwgESGtvC ECWfEZwFlwtQr7Rf3NgGNXLIXrtg+aAdrYnvku57r3PcpJuFJmFNN5wKjacWM922uHlNVe PhmWgzg5gGo0JnDCb7/MVcK0CvcKdm8lpiywoubsAoFFDTYQV2fRN0AOPBWAaI0CSAOVOs jqogiCyRvU7UvQa6/+P34yUgWO6iiJnILZwbHGpizcvpvUgt+TFC2dOBsqgtog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707867804; a=rsa-sha256; cv=none; b=ka8zu8ObqNomn7P7hdREOec3ymk5FSQPe5Cr+UEVQl131HMEoleDqbGusDO5GsuLjDAaXK +5su+P1/x6Ezsft6lTd3W/H69F+46tBaQnQVsofKXTpa6XhkeRNqofKaqGG1xPxVDoPMEW ez8qqVOvlISi55XTiPAMpRlGj59TmM85WLijQbjRz7fv1qdRDa8r9NeCc0/TUj/V8Wp68i vcASZt2cMr2WxyLwl2CvAFj6zTJd75nahDJiy3QomEnyVngZGaNTX2ez34CmAPQjl2NlAs n21mbUnLs/fPYwIAZZUJpBMrAY+Fevy8ip44D3qrka92TLupVkmx6lAEhRUpdw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F3E6F3DC7B for ; Wed, 14 Feb 2024 00:43:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ra2QY-0003TQ-O7; Tue, 13 Feb 2024 18:43:02 -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 1rZum5-0001gb-Ax for guix-patches@gnu.org; Tue, 13 Feb 2024 10:32:45 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZum5-0002Bv-2Z for guix-patches@gnu.org; Tue, 13 Feb 2024 10:32:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZumM-0002BZ-H8 for guix-patches@gnu.org; Tue, 13 Feb 2024 10:33:02 -0500 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) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 13 Feb 2024 18:43:01 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Fremlin X-ACL-Warn: , John Fremlin via Guix-patches From: John Fremlin via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.67 X-Migadu-Queue-Id: F3E6F3DC7B X-Spam-Score: -6.67 X-Migadu-Scanner: mx11.migadu.com X-TUID: oG9TDn/EaG/0 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