From patchwork Sun May 12 00:05:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 64362 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 D813927BBEA; Sun, 12 May 2024 01:07:27 +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 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 A212E27BBE9 for ; Sun, 12 May 2024 01:07:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5wk7-00072n-7n; Sat, 11 May 2024 20:07:07 -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 1s5wk3-00072C-Cv for guix-patches@gnu.org; Sat, 11 May 2024 20:07:03 -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 1s5wk2-0007nT-TS for guix-patches@gnu.org; Sat, 11 May 2024 20:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5wk2-00089h-0i for guix-patches@gnu.org; Sat, 11 May 2024 20:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70883] [PATCH v3] gnu: llama-cpp: Update to commit fed010. References: <7c2a1ab89edc065ae01fa817955ec92b8f49b575.1715454561.git.atai@atai.org> In-Reply-To: <7c2a1ab89edc065ae01fa817955ec92b8f49b575.1715454561.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2024 00:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70883 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70883@debbugs.gnu.org Cc: Andy Tai Received: via spool by 70883-submit@debbugs.gnu.org id=B70883.171547237631340 (code B ref 70883); Sun, 12 May 2024 00:07:01 +0000 Received: (at 70883) by debbugs.gnu.org; 12 May 2024 00:06:16 +0000 Received: from localhost ([127.0.0.1]:51212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5wjI-00089Q-1p for submit@debbugs.gnu.org; Sat, 11 May 2024 20:06:16 -0400 Received: from mail-ot1-f47.google.com ([209.85.210.47]:53318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5wjG-00089K-4l for 70883@debbugs.gnu.org; Sat, 11 May 2024 20:06:14 -0400 Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-6f0fd87da53so304691a34.2 for <70883@debbugs.gnu.org>; Sat, 11 May 2024 17:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715472308; x=1716077108; 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=kiDni0a7VqY/kmbDEv7nDDJXk3vejIr+zFL1PAyMq8g=; b=aMCDt819SlDzzXzzDvhLB9bT0YijV9Zfd0hOvoLiXR85rVbo2VQlMkPkL1ulfMHIVL zi+V+EuZqs9j3/58AYt+Yc8Pc/0H0gZNTIcGeiE7WROo0ZYwSWIfp2ZlSO22nLiEFhsk fxOlVCkMK6LA2l0EVHVqMhk2rlciTnQ84VSDKgOj4O1mUoyBoykbf3+C/slFRjLjQG/z 1HjTY1z2SAysH/Myt7jgTfzlu2EtCb5T2Wi6GybknBGeEaZPKmegJyGaoCHwJNObLXyc TMEhLNnibP+fHqyTz3Y9CwdkiM+tzuQEQo11Df+km5NLozC0wTQK21zJBHKmXQHjREJW PZQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715472308; x=1716077108; 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=kiDni0a7VqY/kmbDEv7nDDJXk3vejIr+zFL1PAyMq8g=; b=uwyvVWhrFwGYQQq4gMpEmX8Ex580zrmJIf+CHU0OenjSdY9l/gsazoIZ278t66uKEr FvLI1rEsFptVp2Ax2iwAhSu+DWYWhJw969igq61hr3ASzviJ6LvLYXe+l2cgXRZapy8Y 2n/8CuoYbWvCaAx7ePSH3Zn+ITZHpa+p3HLLSKcNoVU3nfC5ZE5C6q+7rXaNtXASVzXC b5AiRGxDWEIDhLSgMmReOt0zClVK7/+fNqkCjVtzCgVGqovLL4nGnPSEhCPNLEXm10Ja hiKQJUmjQPAKiaGNslCabpFgHpyFnclj/VQ2QgHtgZTnHda9oT+IjCoVqc8Unr961em3 M5dA== X-Gm-Message-State: AOJu0YwHXxjsqPO2j5Aaf6T5LlqGOA5WpPpiYCYFqjk3vHjjSX/0oOUY ILZPyyhgqKWKKyepqyT9QbbDd8lstm3TQ03O//nAe25CMKHj7kByOYEFhQ== X-Google-Smtp-Source: AGHT+IGLXGUS+q8Fm2CpHiO9x+VY3FRj+4xhwMUCxozQHS70lYjuPiOtdB/poSNXm7j+FNr5VWGrIQ== X-Received: by 2002:a9d:4b03:0:b0:6ea:1bba:9622 with SMTP id 46e09a7af769-6f0e92d07d5mr6816856a34.35.1715472308167; Sat, 11 May 2024 17:05:08 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net. [98.37.226.154]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-63411530b0esm5278227a12.88.2024.05.11.17.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 17:05:07 -0700 (PDT) From: Andy Tai Date: Sat, 11 May 2024 17:05:02 -0700 Message-Id: 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 fed010 as last update was in February and new changes for new models and memory leaks fixes since then. [arguments]: <#:phases>: Add 'disable-unrunable-tests' phase. Change replacement of 'install to be a post-install 'install-main' phase so libraries and header files are normally installed. Change-Id: Ia6532945f588747c4d58fdb7611d6a9c3c596705 --- gnu/packages/machine-learning.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5 diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7ff8c098b1..53603e7133 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -524,8 +524,8 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc") - (revision "1")) + (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659") + (revision "2")) (package (name "llama-cpp") (version (git-version "0.0.0" revision commit)) @@ -537,7 +537,7 @@ (define-public llama-cpp (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1ag1jash84hasz10h0piw72a8ginm8kzvhihbzzljz96gq2kjm88")))) + (base32 "16rm9gy0chd6k07crm8rkl2j3hg7y7h0km7k6c8q7bmm2jrd64la")))) (build-system cmake-build-system) (arguments (list @@ -559,6 +559,15 @@ (define-public llama-cpp (guix build python-build-system)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-unrunable-tests + ; test-eval-callback downloads ML model from network, cannot run + ; in Guix build environment + (lambda _ + (substitute* '("examples/eval-callback/CMakeLists.txt") + (("add_test") "#add_test")) + (substitute* '("examples/eval-callback/CMakeLists.txt") + (("set_property") "#set_property")) + #t)) (add-before 'install 'install-python-scripts (lambda _ (let ((bin (string-append #$output "/bin/"))) @@ -581,7 +590,7 @@ (define-public llama-cpp (make-script "convert")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) - (replace 'install + (add-after 'install 'install-main (lambda _ (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) (inputs (list python))