From patchwork Tue Feb 27 05:29:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 61152 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 D8AFE27BBEA; Tue, 27 Feb 2024 05:31:00 +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 E949A27BBE2 for ; Tue, 27 Feb 2024 05:30:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1req3A-0004w5-6z; Tue, 27 Feb 2024 00:30:44 -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 1req37-0004uU-Uc for guix-patches@gnu.org; Tue, 27 Feb 2024 00:30:41 -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 1req32-0002uq-Px for guix-patches@gnu.org; Tue, 27 Feb 2024 00:30:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1req3S-00083j-3p for guix-patches@gnu.org; Tue, 27 Feb 2024 00:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67873] [PATCH v3] llama-cpp: Update to commit de473f References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2024 05:31: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.170901183030902 (code B ref 67873); Tue, 27 Feb 2024 05:31:02 +0000 Received: (at 67873) by debbugs.gnu.org; 27 Feb 2024 05:30:30 +0000 Received: from localhost ([127.0.0.1]:48994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1req2w-00082I-4F for submit@debbugs.gnu.org; Tue, 27 Feb 2024 00:30:30 -0500 Received: from mail-yb1-f169.google.com ([209.85.219.169]:60498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1req2u-00081r-86 for 67873@debbugs.gnu.org; Tue, 27 Feb 2024 00:30:28 -0500 Received: by mail-yb1-f169.google.com with SMTP id 3f1490d57ef6-dc23bf7e5aaso3899558276.0 for <67873@debbugs.gnu.org>; Mon, 26 Feb 2024 21:30:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709011796; x=1709616596; 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=89n0PX3fXLmkP9oro2nobF/iibgAKaWNBuW32826Sbk=; b=Qummd95wxI/iDTLpwlg8r500k/AjfFnRj/xkNdJ4xKvlBkRmIYnRvFh0zNW5lSNoO2 OTWGF5sL2sv8h3ak1ZRLDXx+Lfm+dJedEOqKJ2ALbzKAmrK3s9Cb1WI/PlM5zajt5uXF PMNRLib1JxFPBgV8/ErgDfAsdMhH/sLuwjRUJ9rChQQvbrB2RwjEKvqrQwOSv1tcSVuL bAVawxeamWWg7ZDizxn+sjUQRvXOMxHV34cRkA/td8FKLPuYb5auk9Fp/2Lk3lHmBjqI CAYkd6se+wSfvLtLwxpd8B/kUKccINjW7Qct7RxTx080QjVPCBNrJL2vWXaRpW2mezpy Sc2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709011796; x=1709616596; 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=89n0PX3fXLmkP9oro2nobF/iibgAKaWNBuW32826Sbk=; b=bG1jfuVvAwlVNK/M9qhFu2jZXcT6z9/UIh5hBGyjx+KnUsa58gZbAwZ6TMseKUa+tM XrT2dH/ZrG/+kVZoqaHW8RKsAQ45ZmT4PQ0dDanzUl1nm2KuY1ZxV71ME44PH8AUYfaT P2Vm11LHGMax72WPigynp1ojgEZeLl/2PL92WaaUk/4NwYHT0wmjpMzaLsi2BlYFiYz+ sBejuy47JZSSU86wXQVr3mWUZ1NYEjDhPafWuAzYhpnjXzf52wRMsaw3Z41TE/V8o1Dn ULLZi8gY437PNep535ZbkMXVlUDYb9ZVaPXeo1LA26U4BcNH8UaCzRBk0kfBWecJSfJv /8lw== X-Gm-Message-State: AOJu0Ywn4NBeOqFrEO0xGSYkcJvJvw98tII1C/p+KkB/tSEz0XxvHiGb Clqbj+K+6QR1QziVWotVqVgjiR0E5e+Yay9L/IvI7cAb5qyE7h/u1MdC48jX X-Google-Smtp-Source: AGHT+IFCN4idx3Oi7JH5zEZYDHyl5QiJGYfFFITXuCgyELuD8HtQNV4rnAam0ZnCwZ2f66viV+7Gaw== X-Received: by 2002:a25:b92:0:b0:dcc:aa1f:b418 with SMTP id 140-20020a250b92000000b00dccaa1fb418mr1299984ybl.1.1709011796271; Mon, 26 Feb 2024 21:29:56 -0800 (PST) Received: from DEskMiniX300.. (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.gmail.com with ESMTPSA id d25-20020aa78159000000b006e535914f9bsm2298281pfn.97.2024.02.26.21.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 21:29:55 -0800 (PST) From: Andy Tai Date: Mon, 26 Feb 2024 21:29:53 -0800 Message-Id: <330b21da7ce1f63dd4bf1f34f99f6628d06709f7.1709011748.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 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 de473f Change-Id: Ib6c53df05a6def119c9bebacbf3ab9765ef82ecc --- gnu/packages/machine-learning.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) base-commit: 4b60a39aa5d3c10aada9a0be2ed1579e19bd118d diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6e94e21f3e..2646bf2b3f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -523,8 +523,8 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") - (revision "0")) + (let ((commit "de473f5f8e19ba5e659cdf5af65fb9251dce16c5") + (revision "1")) (package (name "llama-cpp") (version (git-version "0.0.0" revision commit)) @@ -533,10 +533,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 "1ba3apr98i7b6wmk03v3df835x3l8p5sjp7nqya4wwrxln42dsia")))) (build-system cmake-build-system) (arguments (list @@ -563,7 +563,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