From patchwork Mon Jan 1 02:02:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 58272 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2D44727BBEA; Mon, 1 Jan 2024 02:03:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A329E27BBE2 for ; Mon, 1 Jan 2024 02:03:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rK7dv-0007AS-EL; Sun, 31 Dec 2023 21:03:03 -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 1rK7du-00078R-0r for guix-patches@gnu.org; Sun, 31 Dec 2023 21:03:02 -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 1rK7dt-0007Kw-P1 for guix-patches@gnu.org; Sun, 31 Dec 2023 21:03:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rK7du-0000oQ-79 for guix-patches@gnu.org; Sun, 31 Dec 2023 21:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67873] [PATCH v2] llama-cpp: Update to commit 2994f0 References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jan 2024 02:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67873@debbugs.gnu.org Cc: Andy Tai Received: via spool by 67873-submit@debbugs.gnu.org id=B67873.17040745733108 (code B ref 67873); Mon, 01 Jan 2024 02:03:02 +0000 Received: (at 67873) by debbugs.gnu.org; 1 Jan 2024 02:02:53 +0000 Received: from localhost ([127.0.0.1]:47209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rK7dl-0000o3-G9 for submit@debbugs.gnu.org; Sun, 31 Dec 2023 21:02:53 -0500 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]:47559) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rK7dj-0000nq-Cj for 67873@debbugs.gnu.org; Sun, 31 Dec 2023 21:02:51 -0500 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-35fd902c6b5so71910375ab.3 for <67873@debbugs.gnu.org>; Sun, 31 Dec 2023 18:02:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704074564; x=1704679364; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=x2kgdKQB0UtPNG5Kar6owtX/ZB8P4FUJmH6YZHX/DBI=; b=fsdHfiyZI6WNa9PkhLwJEdn/xMsx6eqheOC3m50qtrnN/Dt/TWah01xBvFjorqOrRp OYSNbfjDZYTycAhdUwqxwef+hHx+QZCC9h2VcTaHZwxNzxTmV+swHfU/KLKt3yKkITpE 0IXjfGNK0f4noDOULJ71mt2CWVPRQetHbeJdqzpASibdhoXXSYxSKLILNJDqrxyYfH6G DNZUeixu7988TP6V5Rci+T7ndfe8Z46gkCVSH6u6AZuTyH1aUOCplklvH/KRo7V1mVt8 XTiLZ4iFt4yM7h0zevptIn3SGd5XKLuDYUkm46nx4wSPWaMfDn8YvSZnvpTQMDRWpOs7 8JRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704074564; x=1704679364; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=x2kgdKQB0UtPNG5Kar6owtX/ZB8P4FUJmH6YZHX/DBI=; b=pjT6pcgsOlvegk5v4YHhHG0zZzCjzOddyDlO15/5pCCj5+CryTDDPy/rgvUeyJRKEr f2tVTimcZeG+rNdBx/RieMPD0kgzUHzerkMLRnwL628DMbKjHeVAw9hDzYqYQIVCCYoj 9R2a3edxqwC1UueAQE9jibkEx+L1cMJGXPtoOgnQMrK2cQGKZHOvz8KnQNn88Xce62zY ptH9o8LwhzKuVeuNlJW5HmOQmmYVfYL8UOj3XLZa7V0sDO31Ho+r/xPo29TT3UPdi1A6 Xroa3JKMjPTMkUNY/rCOzym4DZSWLQ5NWxW8Ai6t0ufX6EBIlmhWKrF7NTRj8GjadL5Z SKOw== X-Gm-Message-State: AOJu0YzwbjwncTxQPCojR4988F6mE4WCEWbpq+NVUMnYyeINb8PSL2fT 2lnT0MEuP+Q1D0W0PjCwN+G6pd2x+Yg= X-Google-Smtp-Source: AGHT+IGqn6vxmP/OPmpOfX5V6zSO4WaoSkLy9+1gaBfXccrXq7IlwGZ3GKBTNbHBPYkgwq3uHQH1eQ== X-Received: by 2002:a05:6e02:1a07:b0:35f:ebc7:6639 with SMTP id s7-20020a056e021a0700b0035febc76639mr21165529ild.31.1704074563780; Sun, 31 Dec 2023 18:02:43 -0800 (PST) Received: from localhost.localdomain (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.googlemail.com with ESMTPSA id 5-20020a170902ee4500b001d06b63bb98sm19334905plo.71.2023.12.31.18.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 18:02:43 -0800 (PST) From: Andy Tai Date: Sun, 31 Dec 2023 18:02:39 -0800 Message-ID: <4c92058e38d6e1ff9c4bacde4de244560cce629f.1704074531.git.atai@atai.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/machine-learning.scm (llama-cpp): Update to commit 2994f0 Change-Id: I241752d2ac2aa893933e87111454636f08df1af7 --- gnu/packages/machine-learning.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) base-commit: 19f5302d136783d861b42107ae5e2920bbd769d9 diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 53a955bb90..19344a00eb 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -516,8 +516,8 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") - (revision "0")) + (let ((commit "2994f0c5a2e8c96955b422dedc93ec2595d16b82") + (revision "1")) (package (name "llama-cpp") (version (git-version "0.0.0" revision commit)) @@ -526,10 +526,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 "0g02jh9qz74vmvqh4485jsfcg26r02hn5sji4ckzsnkv627rw9mz")))) (build-system cmake-build-system) (arguments (list @@ -556,7 +556,6 @@ (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-lora-to-ggml") (make-script "convert")))) (add-after 'install-python-scripts 'wrap-python-scripts