From patchwork Mon Dec 18 01:09:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 57666 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 BBE9B27BBE9; Mon, 18 Dec 2023 01:11:35 +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=unavailable 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 3DFFB27BBE2 for ; Mon, 18 Dec 2023 01:11:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rF29y-0006Vk-Hb; Sun, 17 Dec 2023 20:11:06 -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 1rF29u-0006SO-Si for guix-patches@gnu.org; Sun, 17 Dec 2023 20:11: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 1rF29s-0003Xg-OF for guix-patches@gnu.org; Sun, 17 Dec 2023 20:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rF29t-0007id-Qv for guix-patches@gnu.org; Sun, 17 Dec 2023 20:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67873] [PATCH] llama-cpp: Update to commit 2994f0 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 01:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67873@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170286180629604 (code B ref -1); Mon, 18 Dec 2023 01:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2023 01:10:06 +0000 Received: from localhost ([127.0.0.1]:59207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rF28z-0007hO-MK for submit@debbugs.gnu.org; Sun, 17 Dec 2023 20:10:05 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rF28x-0007gk-P1 for submit@debbugs.gnu.org; Sun, 17 Dec 2023 20:10:04 -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 1rF28q-0006J1-Lv for guix-patches@gnu.org; Sun, 17 Dec 2023 20:09:56 -0500 Received: from mail-oi1-x235.google.com ([2607:f8b0:4864:20::235]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rF28o-00039J-Pm for guix-patches@gnu.org; Sun, 17 Dec 2023 20:09:56 -0500 Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-3ba2dd905f9so1630449b6e.2 for ; Sun, 17 Dec 2023 17:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702861792; x=1703466592; darn=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=hEeauYN2bvFdPG6Qrd26GhQB5qpXRqXLWCqA7VODjmI=; b=Gjn+Y5TmosuLRFbPIOIOtXxiLfPOvl5VeEoKTx6z5m5KsULX5t1HkFYhqHxRB5I2aT 2zWT33oz6rn6lSb5wwmVXg+suZQXgzVIuafYrD8/qDPEyRl8b/xt//n6a2pNF8aH+60a 5RnotckDgyZ2m/KplTq4344MNh5+hBAJ7Qk7kDEy4L6CGtc3+Ib9R5skAnRTSys+hOz+ bO38qghBKL7Ph9kU2mLsNE3jeIWhvHz+Z7vrmN++8S44tWB+x3cgEEJhNBus1/MJ7ipw G16hJELsQBS9JnoJcwUTsSZGbse6f8+jVAubqy4sJPSXCRRWSXDZkE9j4RR7bH5mYSOa ZEBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702861792; x=1703466592; 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=hEeauYN2bvFdPG6Qrd26GhQB5qpXRqXLWCqA7VODjmI=; b=nh0ZVb7WxpNIbq7dm/or8B3Ixgm8hJT3mf88j5qVMVkWqOZX9qALrz1kfYLkIQXkeK hhP/Pa665lh/9iX7U6ooCHjT6QF/F0Pl130KgJ+hkDbiWU4/WeMRJYdgqFYKVclEMR7l fvQShtJjeUPG0ipIVKTvokV9MPeBupkoGnytOk/TvYnCw/bPySdKT4nyi6i7dHV4w8WZ Vuq6L+TbryV3CVzRg0SRCtxhxa7mgi/7dDiu+FCG6KZiz8V4T3j8tE+NZ1Bx9Vr4nojs 2z0B5kfD1x1uUURhe/mgG2PDVeO2D/gcI8/Qde7xk98sjGAfMEqHn2pn2RkUOY17ljw2 Nqyg== X-Gm-Message-State: AOJu0YxKdBijZnKD2Ptfd/rntH2V/EEGZZnmUBbQBxLT7rA+DOh/JvBc FYRrlcuolI08SUM3+CHRFLx60Ycq0s0= X-Google-Smtp-Source: AGHT+IE9h8RemUaPFso1YXkNLIySa9cJFMrSeqIBOskRSIw7uTYjiF64jYYRzItoFgRDTWhJlFwxsw== X-Received: by 2002:a05:6808:13c4:b0:3b8:b063:5d61 with SMTP id d4-20020a05680813c400b003b8b0635d61mr17066965oiw.72.1702861792507; Sun, 17 Dec 2023 17:09:52 -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 n2-20020a632702000000b005cd8044c6fesm2760278pgn.23.2023.12.17.17.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 17:09:52 -0800 (PST) From: Andy Tai Date: Sun, 17 Dec 2023 17:09:47 -0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::235; envelope-from=lichengtai@gmail.com; helo=mail-oi1-x235.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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-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: 6ab242609daec00e8bd54f7bff54557c92695724 diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index c100e0be6e..dbac325eb3 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