From patchwork Mon Aug 14 08:24:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 52831 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 68B0127BBEA; Mon, 14 Aug 2023 09:25:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 333A627BBE2 for ; Mon, 14 Aug 2023 09:25:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVSsq-0004mj-Vr; Mon, 14 Aug 2023 04:25: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 1qVSso-0004mS-Gm for guix-patches@gnu.org; Mon, 14 Aug 2023 04:25:02 -0400 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 1qVSso-0006ty-7n for guix-patches@gnu.org; Mon, 14 Aug 2023 04:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVSso-0002gr-3w for guix-patches@gnu.org; Mon, 14 Aug 2023 04:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64953] [PATCH v2] gnu: llama-cpp: Update to 0.0.0-0.f31b539. References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Aug 2023 08:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64953 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64953@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 64953-submit@debbugs.gnu.org id=B64953.169200149410323 (code B ref 64953); Mon, 14 Aug 2023 08:25:02 +0000 Received: (at 64953) by debbugs.gnu.org; 14 Aug 2023 08:24:54 +0000 Received: from localhost ([127.0.0.1]:32772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVSsf-0002gP-MX for submit@debbugs.gnu.org; Mon, 14 Aug 2023 04:24:54 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:50183) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVSsd-0002g9-6R for 64953@debbugs.gnu.org; Mon, 14 Aug 2023 04:24:52 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-564a0d2d35eso2243757a12.0 for <64953@debbugs.gnu.org>; Mon, 14 Aug 2023 01:24:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692001485; x=1692606285; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=6Pdi50PVo+L0RTq2Of+2b9+RhZInGaHGsZlYovl8GdM=; b=JW9B7eyxoUOwkyHxUl7pLWeSXEQP4LeBLeOLZqPZA5eSkqxL6d7KRWQPgc6qpsx1Dc 6/KQzNBrknEskc7zoCo+/VmMMQ4bBn8pD4rg4nKSr3A7of5dbWRqtSLjEBE+U+xIGTk9 3y4NhSFkbG7Vax+hpsRLIyfFSY2o+Qt/B4o7cL6/i/8PlfVOlAQhcOPkteHh/9L/lLOk +XKPSgrJ+UIjWwIrWZhVnbCXePFjR8IRubc1HkG7hHvj0ByrEJPUYuk60zxoCy+/q9XX GreScNpQsommyo/6AJnmtWXPa8WG1colD1cATmVibb2bkJ3WWA4ZYlyytGNuauYKpAWc EkDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692001485; x=1692606285; 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=6Pdi50PVo+L0RTq2Of+2b9+RhZInGaHGsZlYovl8GdM=; b=RjPP1aABJJePP8IQWNU1d6ukv5eAS1hh9sTqZ8J2njrmKU637Kvnw0DLjuc+aK8PsH CB75b+nLZTuXeMQE1fCkkfIuJsz5rGSjelDv/Cc/roztHXdn+DYfi8GKGShdYIomFfMs VSKv5Igm0nP6pIsBIlO3VmMrwD5lNNXXhmRGWEPwHNqBqnzPPR8nhtJ10NnvvWjsPf7l SV1HOVmc+r8kO1D1dED3Tyd3pOv4YpNKEUHWfgaPxKyHxhMyRVNZZJ+S824KsG70yrgY ZTGu5skQetlz9c72P/82sRnaFVR2vKh2sSI5mr4I/NjDF/M36WppOGaCPghKNQPUW3Xm fNYQ== X-Gm-Message-State: AOJu0YxeE/rj4lTB41w20zniBOHbzEiiQVDcfPe5aES76Mv9/iluzCAn aHa6djkWXaZCY+ZfrzO0cpZ3xR/0x7mA7w== X-Google-Smtp-Source: AGHT+IGtvY7lw9Mois6RIL8FM+yQgh7eZ6HDJFVgRu/QlvZsaWgD7NdA19xX6O/3hbW6xm9PKAH8og== X-Received: by 2002:a17:90a:df98:b0:262:fba6:59b5 with SMTP id p24-20020a17090adf9800b00262fba659b5mr5442453pjv.24.1692001484624; Mon, 14 Aug 2023 01:24:44 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id p2-20020a17090a284200b00264044cca0fsm17756331pjf.1.2023.08.14.01.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 01:24:44 -0700 (PDT) From: Andy Tai Date: Mon, 14 Aug 2023 01:24:40 -0700 Message-ID: <1848ba131c4ed7ece9f33abab4df3efa00e63dcd.1692001411.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 From: Nicolas Graves * gnu/packages/machine-learning.scm (llama-cpp): Update to 0.0.0-0.f31b539. [#:phases](install-python-scripts): Adapt python scripts. (install): Remove deleted quantize script installation. --- gnu/packages/machine-learning.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) base-commit: b15381460ed74e72792ff182dd2ca7a06ba59b0c diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b5db0aa3b8..8d89ef2208 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -408,7 +408,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "3cd8dde0d1357b7f11bdd25c45d5bf5e97e284a0") + (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") (revision "0")) (package (name "llama-cpp") @@ -421,7 +421,7 @@ (define-public llama-cpp (commit (string-append "master-" (string-take commit 7))))) (file-name (git-file-name name version)) (sha256 - (base32 "0i7c92cxqs31xklrn688978kk29agivgxjgvsb45wzm65gc6hm5c")))) + (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p")))) (build-system cmake-build-system) (arguments (list @@ -449,18 +449,13 @@ (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 (lambda _ - (let ((bin (string-append #$output "/bin/"))) - (install-file "bin/quantize" bin) - (copy-file "bin/main" (string-append bin "llama")))))))) + (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) (inputs (list python)) (propagated-inputs (list python-numpy python-pytorch python-sentencepiece))