From patchwork Tue May 28 01:57:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 27965 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 97F0127BBE9; Tue, 28 May 2024 02:59:20 +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=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 1007527BBE2 for ; Tue, 28 May 2024 02:59:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBm76-0000hH-0d; Mon, 27 May 2024 21:58:56 -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 1sBm73-0000gy-Vn for guix-patches@gnu.org; Mon, 27 May 2024 21:58:54 -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 1sBm73-0005A2-NJ for guix-patches@gnu.org; Mon, 27 May 2024 21:58:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sBm7C-0002su-6j for guix-patches@gnu.org; Mon, 27 May 2024 21:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71219] [PATCH v2] gnu: llama-cpp: Update 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, 28 May 2024 01:59:02 +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.171686154011081 (code B ref 71219); Tue, 28 May 2024 01:59:02 +0000 Received: (at 71219) by debbugs.gnu.org; 28 May 2024 01:59:00 +0000 Received: from localhost ([127.0.0.1]:45478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBm79-0002se-TV for submit@debbugs.gnu.org; Mon, 27 May 2024 21:59:00 -0400 Received: from mail-pf1-f178.google.com ([209.85.210.178]:55467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBm77-0002sQ-Ce for 71219@debbugs.gnu.org; Mon, 27 May 2024 21:58:57 -0400 Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-70109d34a16so224861b3a.2 for <71219@debbugs.gnu.org>; Mon, 27 May 2024 18:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716861462; x=1717466262; 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=gEJShkrTkiXsAOVRzdrEnPvXjAiO6ZokQc6R4FKroEQ=; b=fOOQeFT94mn+kWs+TiQxdNEB3kTzSTO+/w0M6D89CM9EceLhhzrWkU7c98cxRMBmPj +H6/Q6cbOGkmOWz5A6rbnDIBtvDW2k/JtkBe3NXtZA/5gpKewguhRFUumaXzDwXgQShP Ke0kXeeQ6n7gvmwa4+fubCbQseetySYPc/MwpzDhmT1eBRmaQBnQI+8NcO4lnnoaR5mI 5vdUShaY61RCdF0KzljBeNZXl3KrY8WmBnqjWiTyY22yj7D6atoYVMZPsfiTDvAH8JSe lIJVVOPHYTfsKosSVgcQfhxEh/x4T1ZHWhiok3As41Imtjpi7trtHZtKiOmteZo1B6ek UvFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716861462; x=1717466262; 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=gEJShkrTkiXsAOVRzdrEnPvXjAiO6ZokQc6R4FKroEQ=; b=n5UQ22VqyJJA0s9cx2+dlf+N/Hmi/RlWpE7JJDOeScudUnwDx34jHrjx9YGjjdpZiw JYMWrKYLYK42YbuxkOjJ+cgqntv3x3wpH28qsiGANP6gcIbXCDjPB16Ec0AVaPuRu6/t 2tp/y2wj2R/IUZc2BBrkMvIu/fnoiUAXY4hVl+K15zYmz3Yzrhabd4YTX04A9T0n6Z42 DCG0X1Rd9lq71UIZAenY8I7Jwr9QEru3IU/uQGIBqakUd99VfBPhTdT1PQrZzffKc9HQ fHFUv3fquPmZRGNOn0XaRZwP0Rzkt7uTWAiulFsbMPKkqtSwG54qNhyJhPE+yaPK1bgQ 2biw== X-Gm-Message-State: AOJu0YxmORkpa4aY97584s898LqFvM+RsT9eLvkgTgMZL+mJiIZBou0b WjS+tfKfMS6TJzbt/W/rTBZLNIVO3fALMTt+FCVzoguPSyjW846bkYAsOg== X-Google-Smtp-Source: AGHT+IE2o0itheS6XQq21R74zXAa0Ae9z0EOAFmLXG03nfkHR207UDUZ4PscpiRE55dOFAxlKMtXyw== X-Received: by 2002:a05:6a21:2705:b0:1b0:119c:7583 with SMTP id adf61e73a8af0-1b212e3a743mr9825776637.56.1716861461760; Mon, 27 May 2024 18:57:41 -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-68226549417sm6590155a12.71.2024.05.27.18.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 May 2024 18:57:40 -0700 (PDT) From: Andy Tai Date: Mon, 27 May 2024 18:57:38 -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 (lama-cpp): [arguments](configure-flags): add cmake configure flag for shared library build. Change-Id: I7c4bc219a22aa9a949e811b340c7cf745b176d14 --- gnu/packages/machine-learning.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: 0f3a25a25e212bfa8ab9db37d267fb260a087e5d diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a385ddc18c..8a332a8b6f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -541,7 +541,8 @@ (define-public llama-cpp (build-system cmake-build-system) (arguments (list - #:configure-flags #~'("-DLLAMA_BLAS=ON" + #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON" + "-DLLAMA_BLAS=ON" "-DLLAMA_BLAS_VENDOR=OpenBLAS" "-DLLAMA_NATIVE=OFF" ;no '-march=native' @@ -591,7 +592,9 @@ (define-public llama-cpp (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