From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2EmRC3KBaGZjoQAA62LTzQ:P1 (envelope-from ) for ; Tue, 11 Jun 2024 16:55:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2EmRC3KBaGZjoQAA62LTzQ (envelope-from ) for ; Tue, 11 Jun 2024 18:55:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=G59RYubM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718124914; a=rsa-sha256; cv=none; b=RkYFrYSvOgSjaLgGXF9gaFRU2VW2B1WztQVCpMGiyi6OJAJEKDBrPMzbJdicbRG/jCzJr1 XaGm0kzDUZSNdPDi/1QI4u/tx3kyPezaPnfQ1Ps9iJOIaYD/ywJ9VYV3CO6ovN7obRR2I5 XmkvYqoWWsyo7zNO7nMLowHSt876uV5SgbUHXcKPbK6Po8FQ6Qki2E5xvQ4eY5OsxzGLsr fALKuXAnkbNhuXoJgX01kK9MVb0EAfk2EMNeh7sE5V9k3uxymDhigymSXT2atS2lMqF1Yh f2TdYyK6m6Sv17uL3LPV/HCEXXT7cdiZGZynvl8DAFSL6gn5lcVjoDP48Igw6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=G59RYubM; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718124914; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nidB8Ocux6Bd0xK/iUIZ8g5BXLUYsun8K4vVa9tutHw=; b=Gqm4sSZjjrktmhVdXHxBHu6NvnkfZrzZZyfl50xi/T6AwSu6UuJJyv8ivXComLzx7ctbMk k0c7DbZc6P4HYlwjuZCSBrVo/9BEjkKc73oQkxeRrqBmUXPPVbXQOT33nyrL8BBosTgZd/ g2DAULS4TXbCzu0csz7S2ckFUrAsUostSau66c5wSZWGi2Ye7xkq6GvcoLhLUKLrZ88ORD 52asVMCHxMNbkt2Uv/yhRWM15VkzJMS37eWwuza0WqpqkzWdOZc8Jm34eIO1IlEktRZXVG qp5U5T4Q1oZJo1Yw9NU/qc1xvtMNKIjxImBcMrF+qW4QbSg6dYgKCSpUopicaA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6E1E265CCA for ; Tue, 11 Jun 2024 18:55:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sH4m3-0006vP-Rl; Tue, 11 Jun 2024 12:55: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 1sH4m0-0006v3-BH for guix-patches@gnu.org; Tue, 11 Jun 2024 12:55:04 -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 1sH4lz-0008VS-MM for guix-patches@gnu.org; Tue, 11 Jun 2024 12:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sH4ly-0005Sg-0B for guix-patches@gnu.org; Tue, 11 Jun 2024 12:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71219] [PATCH v5] gnu: llama-cpp: Update commit and configure flags for shared library build. References: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> In-Reply-To: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Jun 2024 16:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71219@debbugs.gnu.org Cc: Andy Tai Received: via spool by 71219-submit@debbugs.gnu.org id=B71219.171812484920917 (code B ref 71219); Tue, 11 Jun 2024 16:55:01 +0000 Received: (at 71219) by debbugs.gnu.org; 11 Jun 2024 16:54:09 +0000 Received: from localhost ([127.0.0.1]:36155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4l7-0005RJ-HV for submit@debbugs.gnu.org; Tue, 11 Jun 2024 12:54:09 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:50685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4l5-0005Ql-EF for 71219@debbugs.gnu.org; Tue, 11 Jun 2024 12:54:07 -0400 Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-440609dd118so14575681cf.1 for <71219@debbugs.gnu.org>; Tue, 11 Jun 2024 09:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718124783; x=1718729583; 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=nidB8Ocux6Bd0xK/iUIZ8g5BXLUYsun8K4vVa9tutHw=; b=G59RYubMAZ+O3aUKctKZUQFjcVwnoI/LRGe2Mh4xOv5U9+AR6slE2l7/yzpAgtsj7X 1uG9Oet/nGk/A2OqdRMDYlvpljwClukBjM0IL3VmRGAK4PQ17n67CKWnYAfTDNCcC9uZ r11vmjEISK7j4dV2RNHEHS6IolObIepSL4VeQkrYRmgMgzV8+8m/fbApyEB1MeO12xmt LIH06MZxn1xEejIRB5kM55JubDegYlqCIKiwngeUu2vNkzmxijhHSidz1GNYHDUY7dV2 +ndYe7ydGApJYQV2SgbVmpDT8qRftu//v5OaEcS7h/hsFIOYs7qfcyues5MpweAELY5p /94g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718124783; x=1718729583; 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=nidB8Ocux6Bd0xK/iUIZ8g5BXLUYsun8K4vVa9tutHw=; b=sl3v+hKVvSqYjncrIpeC7h6OmV4kDXcwRm1goF/jJz6xLgy7+biTMQ1bxKPJeQXgNg z1DWCbnWKqqBD3b+jmLEpmCmpFI1b8UW4tmmVgzETM3eXeGA3IIIR/AXlm3mo+SkbBtq BA+qZDmVgWu1pIA15+aQbEdZQ+0cic9JyShPYC5OF7a+MwZFe0xG93L9vOtSzaGfmqxb eMGF40YZ4GxdqV6NheZpVM/QwrLTdY8UhuKj9FsZ6yQ+OTSnafLwfjyQsTwkOoc749mn LUnH57axgfq4UbwNkoKQgoooRRDpWwuPX7wRPtZHK+QBWyzXH+Ygwbu0MBmm+zgpPEaY JIHw== X-Gm-Message-State: AOJu0YzUrijwiYxt+Mtm/3vPKSXV1IA0W1fBtceAZXzkOkceyXzI91hD rszg6gKjCi0xBK2Q6BAPYdo6XhAmGRECErj5Z8pRql1R6lF1Eo3snVsh/Q== X-Google-Smtp-Source: AGHT+IG9paT9YCm7mIoSg5for+hZCHmKj9pmOXqmvpiaR+6iVw+ZI6naqasjh/1MT+uvqpgk4SHTEw== X-Received: by 2002:a05:6a21:195:b0:1b8:831f:c684 with SMTP id adf61e73a8af0-1b8831fc91fmr1816553637.53.1718107338152; Tue, 11 Jun 2024 05:02:18 -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 d2e1a72fcca58-7041b841247sm6532027b3a.140.2024.06.11.05.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 05:02:17 -0700 (PDT) From: Andy Tai Date: Tue, 11 Jun 2024 05:02:13 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 6E1E265CCA X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.84 X-Spam-Score: -0.84 X-TUID: fPMmJVpq+Uhj * gnu/packages/machine-learning.scm (lama-cpp): Update to commit a5735e with pkg-config support. [arguments](configure-flags): Add cmake configure flag for shared library build and adjust arguments to make openblas found by cmake. (phases) 'install-python-scripts: Remove references to deleted scripts and add new ones upsteeam. Change-Id: I7c4bc219a22aa9a949e811b340c7cf745b176d14 --- gnu/packages/machine-learning.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a385ddc18c..f433f8cd65 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -524,7 +524,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659") + (let ((commit "a5735e4426b19a3ebd0c653ad8ac01420458ee95") (revision "2")) (package (name "llama-cpp") @@ -537,12 +537,16 @@ (define-public llama-cpp (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "16rm9gy0chd6k07crm8rkl2j3hg7y7h0km7k6c8q7bmm2jrd64la")))) + (base32 "0nx55wchwf204ld6jygfn37cjrzc4lspwn5v0qk8i6p92499bv0h")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~'("-DLLAMA_BLAS=ON" + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + "-DLLAMA_BLAS=ON" "-DLLAMA_BLAS_VENDOR=OpenBLAS" + (string-append "-DBLAS_INCLUDE_DIRS=" #$(this-package-input "openblas") "/include") + (string-append "-DBLAS_LIBRARIES=" #$(this-package-input "openblas") "/lib/libopenblas.so") "-DLLAMA_NATIVE=OFF" ;no '-march=native' "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. @@ -584,14 +588,14 @@ (define-public llama-cpp (mkdir-p bin) (make-script "convert-hf-to-gguf") (make-script "convert-llama-ggml-to-gguf") - (make-script "convert-lora-to-ggml") - (make-script "convert-persimmon-to-gguf") - (make-script "convert")))) + (make-script "convert-hf-to-gguf-update.py")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'install-main (lambda _ - (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) + (with-directory-excursion (string-append #$output "/bin") + (symlink "main" "llama")))) + ))) (inputs (list python)) (native-inputs (list pkg-config)) (propagated-inputs base-commit: bc8a41f4a8d9f1f0525d7bc97c67ed3c8aea3111 -- 2.45.1