From patchwork Tue May 23 05:57:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 50246 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 C5C6527BBE9; Tue, 23 May 2023 06:58:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 0A19F27BBE2 for ; Tue, 23 May 2023 06:58:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1L25-0006WX-S4; Tue, 23 May 2023 01:58:05 -0400 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 1q1L24-0006UW-4f for guix-patches@gnu.org; Tue, 23 May 2023 01:58:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1L22-0001T0-FF for guix-patches@gnu.org; Tue, 23 May 2023 01:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1L21-0000eo-RA for guix-patches@gnu.org; Tue, 23 May 2023 01:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63656] [PATCH] gnu: llama-cpp: Update to commit 2e6cd4b Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 05:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63656@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16848214772512 (code B ref -1); Tue, 23 May 2023 05:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2023 05:57:57 +0000 Received: from localhost ([127.0.0.1]:37978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1L1w-0000eS-Nr for submit@debbugs.gnu.org; Tue, 23 May 2023 01:57:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:38118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1L1s-0000eH-5i for submit@debbugs.gnu.org; Tue, 23 May 2023 01:57:54 -0400 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 1q1L1r-0006GC-L1 for guix-patches@gnu.org; Tue, 23 May 2023 01:57:51 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1L1p-0001QT-OI for guix-patches@gnu.org; Tue, 23 May 2023 01:57:51 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1ae3a5dfa42so48783985ad.0 for ; Mon, 22 May 2023 22:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684821468; x=1687413468; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=QIDurKz3io++MSJ6DOynZlxijKh9aCH9izhRVRvF3sk=; b=k3p6MOTDY+a5mEkFnKix3WIVan2ewb94aXtNCBPcabozqDfp2Bu7Q0uNHD04gxZ0q5 HYdkIIwK2nB8Wg2Qb7OT9ak4FXfccHHMkztEqya0DmdycqKjuKTH424P/jydUR2117R7 g9Ah+aakxUsxjqM4+TlEAGera9ltLF5guBVvAqTB40QjwUSdSDKsxl/KS8zwLmKPohTP jtoNImSpY2TQCT3eksW6u4pzj8HfiQkPeALgvZ/axuoi/yQEEH7K8tJoK5Tog1UUWULa RvVLFYBdDyn4GkSYJ66+yj7rctTluZE4e/RU3UqTlMxzjd9iQ74GHqC+qWaiABUanzQ9 xX5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684821468; x=1687413468; 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=QIDurKz3io++MSJ6DOynZlxijKh9aCH9izhRVRvF3sk=; b=gMpi3Snc3ZOGigwNK43DUH1bJSaf4nxdx1XN9Lv6mUfkB5xAs5q2LPIV7rCgxEEqNc 4IF/zlCfbI5ZjnPKtj3rsJuy7IJ3eXVqhXqDcIQ+QWvzQ6ZoDUSLUYk8e2V9tZuHGXqP Mw9QbeebyLdjIQKDh1P9NXmI2eHtmYYyurijLNK4Wn/aCEwUIkAQujANTzeufX5tO+uw mpoG1+exYL9eAcYJBAkoxA5tNhP4h7sc2rUdDBFIR1oBbQYXnZmX2O65buKKC41/4f27 1H+Z+2O8CbcR1HuWsSXvX7dBUX1Y3xQ9a5CITctSAtQOg502Z4OExVZAyumNjwPu4m8D eKsg== X-Gm-Message-State: AC+VfDyN95WpMYy7BTCbqWNhEt9C1iX/1ts/ZMK6TuZSNpRISQVS1qdo AuyWjcCW/tjTWPpavKncxg7fL7I6RmY= X-Google-Smtp-Source: ACHHUZ5inBvupPEn9CbUAPy0jDRFX7ewr2lO7qJ7vG37wlQCiee+iDBCxKlQFsU5Yq9dO4vErs5Tdw== X-Received: by 2002:a17:902:b093:b0:1a6:b971:faf6 with SMTP id p19-20020a170902b09300b001a6b971faf6mr10976039plr.35.1684821467704; Mon, 22 May 2023 22:57:47 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id y3-20020a17090322c300b001ab2a0733aasm5801231plg.39.2023.05.22.22.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 22:57:47 -0700 (PDT) From: Andy Tai Date: Mon, 22 May 2023 22:57:44 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x632.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.249, 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 2e6cd4b --- gnu/packages/machine-learning.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) base-commit: e3d3501f73333face5715383c925a9cba2f0772b prerequisite-patch-id: 40c26bda63a766b003facd4969c98c45046cbf12 diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 269bfd4459..b3d74bda48 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -405,7 +405,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "3cd8dde0d1357b7f11bdd25c45d5bf5e97e284a0") + (let ((commit "2e6cd4b02549e343bef3768e6b946f999c82e823") (revision "0")) (package (name "llama-cpp") @@ -418,7 +418,7 @@ (define-public llama-cpp (commit (string-append "master-" (string-take commit 7))))) (file-name (git-file-name name version)) (sha256 - (base32 "0i7c92cxqs31xklrn688978kk29agivgxjgvsb45wzm65gc6hm5c")))) + (base32 "0pyia26czpqdyncgx18j639xjxx02m1c5x4iwzqv5y09y5xkfdjp")))) (build-system cmake-build-system) (arguments (list @@ -446,11 +446,8 @@ (define-public llama-cpp (chmod (string-append bin script) #o555))) (mkdir-p bin) (make-script "convert-pth-to-ggml") - (make-script "convert-gptq-to-ggml") - (make-script "quantize.py") - (substitute* (string-append bin "quantize.py") - (("os\\.getcwd\\(\\), quantize_script_binary") - (string-append "\"" bin "\", quantize_script_binary")))))) + (make-script "convert-lora-to-ggml") + (make-script "convert")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) (replace 'install