From patchwork Wed Jul 10 13:47:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 66103 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 C68FF27BBE9; Wed, 10 Jul 2024 14:48: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6C47727BBE2 for ; Wed, 10 Jul 2024 14:48:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRXfq-0005fg-Ns; Wed, 10 Jul 2024 09:47:59 -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 1sRXfo-0005e0-DK for guix-patches@gnu.org; Wed, 10 Jul 2024 09:47:56 -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 1sRXfo-0006bN-40 for guix-patches@gnu.org; Wed, 10 Jul 2024 09:47:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRXfu-0002l0-1K for guix-patches@gnu.org; Wed, 10 Jul 2024 09:48:02 -0400 Subject: bug#71219: [PATCH v5] gnu: llama-cpp: Update commit and configure flags for shared library build. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2024 13:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 71219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andy Tai Cc: 71219-done@debbugs.gnu.org Mail-Followup-To: 71219@debbugs.gnu.org, ludo@gnu.org, atai@atai.org Received: via spool by 71219-done@debbugs.gnu.org id=D71219.172061927810584 (code D ref 71219); Wed, 10 Jul 2024 13:48:01 +0000 Received: (at 71219-done) by debbugs.gnu.org; 10 Jul 2024 13:47:58 +0000 Received: from localhost ([127.0.0.1]:55150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRXfq-0002ke-66 for submit@debbugs.gnu.org; Wed, 10 Jul 2024 09:47:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRXfm-0002kP-6I for 71219-done@debbugs.gnu.org; Wed, 10 Jul 2024 09:47:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRXfX-0006WY-K4; Wed, 10 Jul 2024 09:47:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Gv8mW0g17zGcNd/EKELAphztjSI7npIs124VL1fEwWM=; b=o/YKLDu3aVcmvnxG/8zH wr46O5EO4LLMunlGsbfwP8QpirDXeVwYfG0f6FU+pfauSwP1nBZvZov9ouuYC3Nnf7pQ8maGc1t97 iNqF4NR0aCE2n8hGY+3/8MFvmLz9p4A9CZL8nASKiYI7AKTeRLyrU0GsrQN3eexDSU5gdIqmleD74 BnlzOzgyUM3ZjYX8rHqEqT5iPJUOd7/dKjQmJrNtnHwESEl8gy2ODkFPpPE68ukUcjMZxnnciP0DT uylNkWE8Cb+/DIAv9WBdGG9rPK3TmEbvukA02dQ/pM38ybaYIBzXM4ZaUDs1qBsPh5a0zaw+QIvkS ilaGxR4PExy0/Q==; From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: (Andy Tai's message of "Tue, 11 Jun 2024 05:02:13 -0700") References: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> Date: Wed, 10 Jul 2024 15:47:36 +0200 Message-ID: <87msmp7407.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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 Hi Andy, Andy Tai skribis: > * 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 Applied with the indentation changes shown below. Thanks! Ludo’. diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a2be0bf9c8..1cb6586e81 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -567,18 +567,22 @@ (define-public llama-cpp (arguments (list #: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") + #~(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. - "-DLLAMA_AVX2=OFF" - "-DLLAMA_AVX512=OFF" - "-DLLAMA_AVX512_VBMI=OFF" - "-DLLAMA_AVX512_VNNI=OFF") + "-DLLAMA_NATIVE=OFF" ;no '-march=native' + "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. + "-DLLAMA_AVX2=OFF" + "-DLLAMA_AVX512=OFF" + "-DLLAMA_AVX512_VBMI=OFF" + "-DLLAMA_AVX512_VNNI=OFF") #:modules '((ice-9 textual-ports) (guix build utils)