From patchwork Sat May 11 19:10:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 27402 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 DE65227BBEA; Sat, 11 May 2024 20:11:23 +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 AF07727BBE2 for ; Sat, 11 May 2024 20:11:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5s7d-0004tv-5Q; Sat, 11 May 2024 15:11: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 1s5s7a-0004tg-Sg for guix-patches@gnu.org; Sat, 11 May 2024 15:11: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 1s5s7a-0004kv-Ka for guix-patches@gnu.org; Sat, 11 May 2024 15:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5s7a-0005Al-0l for guix-patches@gnu.org; Sat, 11 May 2024 15:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70883] [PATCH] gnu: llama-cpp: Update to commit fed010. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 19:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70883 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70883@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171545461919871 (code B ref -1); Sat, 11 May 2024 19:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 May 2024 19:10:19 +0000 Received: from localhost ([127.0.0.1]:50051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5s6s-0005AR-TY for submit@debbugs.gnu.org; Sat, 11 May 2024 15:10:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:38476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5s6q-0005AL-V5 for submit@debbugs.gnu.org; Sat, 11 May 2024 15:10:17 -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 1s5s6q-0004p5-Lf for guix-patches@gnu.org; Sat, 11 May 2024 15:10:16 -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 1s5s6o-0004i5-BO for guix-patches@gnu.org; Sat, 11 May 2024 15:10:16 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1eca195a7c8so27115475ad.2 for ; Sat, 11 May 2024 12:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715454612; x=1716059412; 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=it97gygeQ4Bqzg1y3EKNbi8wRjRhlHDaBo7ZYsRXGPM=; b=dNzUv0tUCEbDI/+hba9NMTz+Xa/tu4rli2B3O9JpyIK2gOJVGjY++t9jU0AuJd6Xws hbLZVxmRKAzGdU9q2B6vcNWfmN9KKLVQUFe3aA4YczZBGHau2/Sx2i9/+UE2pQhGj+9g o5ICX7K+gRiv0PwzDxbu531/rJ8yv0EtOuoPaMlpICcsIqR3n9hW5utE9vh75Vnj67VZ S/O6HKAZWEtIkALSobPB7LRCwdYM3FveARFaJu/bY0X54TbppMMExuD4iecE8eMvSwkQ AkjA5lfdio5t+5jCMTm5/sTTQGgpuxXNndOtiliAjTglWnGJ9OFVX78yfTS/efZmEpyq uhkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715454612; x=1716059412; 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=it97gygeQ4Bqzg1y3EKNbi8wRjRhlHDaBo7ZYsRXGPM=; b=nk+a85bzS8nozE51crT3XrgPDTe/IPtjsR0Z+yIvOVab4r8rDfgrTTmMDLjSE3YuPV k/1Sr4OZOdy+hJr9kxumDhIbpMcxseI13GX3eY4vHWh8PUewHD58w16hUP7RqbWMPKFM GBF723+swPq/xq9rGwLVK7fibObpp+wJMrfPzE1atsCEjOkGjgziJShJZkl67CbiR5vr mVawYOFPdLzaZ3aiHlAh123obtFgt6zBFXUhAgeWrErZPlNZ2iOw8+DuqbdFVgXw/S9Q Ho6Ugca/OcIUQguFM7Ds+fCxU+6NHAx1ZECx/YgJSen/4MJI2lb4qwzLTMcceuZ/0hkR 6iqg== X-Gm-Message-State: AOJu0Ywgwxjvg4O6nXk+1G3SFk54L7yWN7vuG0GthQYwi/OUIkkpaddn bTvp6KDJn2FmkvRz74odbHSkUGji03+GLPcos+uF1FXXD6guegLqT854rw== X-Google-Smtp-Source: AGHT+IEU+ID6rxdXK5cnnDEjGmvLP3SX5MEjNb9SJONDrlI0Tc7L1tfIxe0y0BUfyJDPRAzjiXIzpA== X-Received: by 2002:a17:902:f64c:b0:1e4:54d1:a159 with SMTP id d9443c01a7336-1ef4404957amr78307405ad.47.1715454612451; Sat, 11 May 2024 12:10:12 -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 d9443c01a7336-1ef0b9d161csm52004065ad.3.2024.05.11.12.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 12:10:12 -0700 (PDT) From: Andy Tai Date: Sat, 11 May 2024 12:10:07 -0700 Message-Id: <7c2a1ab89edc065ae01fa817955ec92b8f49b575.1715454561.git.atai@atai.org> X-Mailer: git-send-email 2.34.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 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-Id: Ia6532945f588747c4d58fdb7611d6a9c3c596705 --- gnu/packages/machine-learning.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5 diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7ff8c098b1..b737707a75 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/")))