From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8HAJHQjlmGQggAAASxT56A (envelope-from ) for ; Mon, 26 Jun 2023 03:08:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id lsAAHQjlmGSoeAAAauVa8A (envelope-from ) for ; Mon, 26 Jun 2023 03:08:24 +0200 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 1804A11FDB for ; Mon, 26 Jun 2023 03:08:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDai4-0007l0-Hq; Sun, 25 Jun 2023 21:08:04 -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 1qDai2-0007kb-NE for guix-patches@gnu.org; Sun, 25 Jun 2023 21:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDai2-0004dK-EC for guix-patches@gnu.org; Sun, 25 Jun 2023 21:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDai2-0004fC-AI for guix-patches@gnu.org; Sun, 25 Jun 2023 21:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48785] [PATCH v6 2/3] gnu: lightgbm: Update to 3.3.5. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Jun 2023 01:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48785 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48785@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48785-submit@debbugs.gnu.org id=B48785.168774165817874 (code B ref 48785); Mon, 26 Jun 2023 01:08:02 +0000 Received: (at 48785) by debbugs.gnu.org; 26 Jun 2023 01:07:38 +0000 Received: from localhost ([127.0.0.1]:44023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDahd-0004eD-Hm for submit@debbugs.gnu.org; Sun, 25 Jun 2023 21:07:38 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDahb-0004du-Fv for 48785@debbugs.gnu.org; Sun, 25 Jun 2023 21:07:36 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id ED186240027 for <48785@debbugs.gnu.org>; Mon, 26 Jun 2023 03:07:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687741650; bh=i9J74ScobBm4bwFk0vB9UfSJm5RSteNw5pKq5xTDODA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=eeWgyVysRGxZARqpPp36vnSEdGgzqCRsFz6NGTJUzmzCnpR/b4iE15UY/Lx72Okn4 OR/iWuESl9mvpnCdnx0cNqmhT9so/XKbz3BBV8ZLduASjKkkXeUC+klMhDtVdviPaQ Rpm4av2jFjukFK8FtAGKcE40TVmJfiEJW+Vx3TVKmP2fXc1Hw12KG0JXfDrMXc5ZjX cSUnI+WKXq+CZ/eDTzkIra0tsF6TiTAdjMV5K4QLuoHAFUq8D/aqlT5iReuEpw58lE zpFQdQc44dMa/HsRgCNptOHgkGdINc9lj8bzjtVXVU+U8Dl1tSmdvdBoQlUONpsdEX RtS1tC6wGfV+g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qq8p56yVDz6tww; Mon, 26 Jun 2023 03:07:25 +0200 (CEST) From: Vinicius Monego Date: Mon, 26 Jun 2023 01:06:34 +0000 Message-Id: <20230626010635.129221-2-monego@posteo.net> In-Reply-To: <20230626010635.129221-1-monego@posteo.net> References: <20230626010635.129221-1-monego@posteo.net> 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687741704; a=rsa-sha256; cv=none; b=EZ4kL/Vy4J0beBR6xV0Yb/oQZ528+J1KR2O+sizv2k8HovhaRSH+v0yBjDke9I8DRwtjzo XYu1x3Xvl4ut7nQhcAfEFflkwqAkV2BjmJqPCq0ik1WWudgD+W+EBh1jOLNc9iAVmVsML1 GlJAdYUC13tenowpeIkuNPueYnnp41F1eMkxunzNMvFES9FlUrzNL11yTSEo7ae1T6+gJk PU8tTMJ5l61x9fdP3r34J7s+MtffRl3AwENOfB4ls00ncHJ9cM0+Aa3HC23y1dGREgsgD6 XEqLGIxPSpIYuX8r2e6Iz167zH7HwI2zW7/hNDSQ1Kor/oxmP5iexMvIaYaVVg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=eeWgyVys; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=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=1687741704; 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=a0TYcc0uKMyBrK8wR33tSbku43632rJAmb8UWL1zosk=; b=GAavnRYORQjdp8NNt7lBHM5O1RKc+nUGWIZBrVPcmq5qsPw8/XZ1sIyXln3YDqIpef1zu5 HDRAoYFa9z7b+KcPI3w6jicTK0OvQMdRnsCMtwoIraB4nHuvRc5DG7XDzZg2FZ+q3cqmYb CucR4dTqdZQvshTNgiWHWhoW0axC2GWZIS4J2brGD3pTvWlE2L5NKdjfAP6E8qPhyIp1YQ bBZiTNsNeZscPQEP1CxQqYFiLt5heFuBEJC+kVDmeDk3ToO4d/oTLYnlj+7JlFyRx55ZQl guxiVXsFpJBlCxqidvgen1AvutQzaYfMMWrTfTVHOSexD+OCM5UFlS6SECJEGA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=eeWgyVys; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=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" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -1.65 X-Spam-Score: -1.65 X-Migadu-Queue-Id: 1804A11FDB X-TUID: OmdgmKA57nsj * gnu/packages/machine-learning.scm (lightgbm): Update to 3.3.5. [source]: Add patch. [native-inputs]: Add opencl-headers. [inputs]: Add boost, eigen, fast-double-parser, fmt, ocl-icd. [propagated-inputs]: Remove python-numpy, python-scipy. [arguments]: Add #:tests?, #:test-target. Pass "-DBUILD_CPP_TEST=OFF" and "-DUSE_GPU=ON" to #:configure-flags. Don't override the check phase. Use G-expressions. * gnu/packages/patches/lightgbm-use-system-libraries.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 46 +++++++-------- .../lightgbm-use-system-libraries.patch | 57 +++++++++++++++++++ 3 files changed, 80 insertions(+), 24 deletions(-) create mode 100644 gnu/packages/patches/lightgbm-use-system-libraries.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4566f1b4a4..4445a08fb7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1527,6 +1527,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/libcdio-glibc-compat.patch \ + %D%/packages/patches/lightgbm-use-system-libraries.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-infodocs-target.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8fbb0274d4..17de467f46 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -88,9 +88,11 @@ (define-module (gnu packages machine-learning) #:use-module (gnu packages ninja) #:use-module (gnu packages ocaml) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages opencl) #:use-module (gnu packages parallel) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -1800,31 +1802,27 @@ (define-public python-autograd (define-public lightgbm (package (name "lightgbm") - (version "2.0.12") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Microsoft/LightGBM") - (commit (string-append "v" version)))) - (sha256 - (base32 - "0jlvyn7k81dzrh9ij3zw576wbgiwmmr26rzpdxjn1dbpc3njpvzi")) - (file-name (git-file-name name version)))) - (native-inputs - (list python-pytest python-nose)) - (inputs - (list openmpi)) - (propagated-inputs - (list python-numpy python-scipy)) + (version "3.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Microsoft/LightGBM") + (commit (string-append "v" version)))) + (patches + (search-patches "lightgbm-use-system-libraries.patch")) + (sha256 + (base32 "0fljcnlj02pn2y5lxq16rsg6hm0wq4adzrl52i0s8whpcdrgsc0a")) + (file-name (git-file-name name version)))) (arguments - `(#:configure-flags - '("-DUSE_MPI=ON") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (with-directory-excursion "../source" - (invoke "pytest" "tests/c_api_test/test_.py"))))))) + (list + #:tests? #f ; FIXME: googletest is not found by CMake + #:test-target "testlightgbm" + #:configure-flags #~(list "-DBUILD_CPP_TEST=OFF" + "-DUSE_GPU=ON" ;using OpenCL + "-DUSE_MPI=ON"))) + (native-inputs (list opencl-headers)) + (inputs (list boost eigen fast-double-parser fmt ocl-icd openmpi)) (build-system cmake-build-system) (home-page "https://github.com/Microsoft/LightGBM") (synopsis "Gradient boosting framework based on decision tree algorithms") diff --git a/gnu/packages/patches/lightgbm-use-system-libraries.patch b/gnu/packages/patches/lightgbm-use-system-libraries.patch new file mode 100644 index 0000000000..c0665cfff9 --- /dev/null +++ b/gnu/packages/patches/lightgbm-use-system-libraries.patch @@ -0,0 +1,57 @@ +From 894648291b9629d51785e4fd1cae820d2858e039 Mon Sep 17 00:00:00 2001 +From: Vinicius Monego +Date: Mon, 31 May 2021 21:23:52 -0300 +Subject: [PATCH] Use system libraries. + +--- + CMakeLists.txt | 11 ++++++++--- + include/LightGBM/utils/common.h | 4 ++-- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b845f36..560e477 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,9 +93,6 @@ if(USE_SWIG) + endif() + endif(USE_SWIG) + +-SET(EIGEN_DIR "${PROJECT_SOURCE_DIR}/external_libs/eigen") +-include_directories(${EIGEN_DIR}) +- + # See https://gitlab.com/libeigen/eigen/-/blob/master/COPYING.README + ADD_DEFINITIONS(-DEIGEN_MPL2_ONLY) + +@@ -399,6 +396,14 @@ if(USE_SWIG) + endif() + endif(USE_SWIG) + ++find_package (Eigen3 3.3 REQUIRED NO_MODULE) ++TARGET_LINK_LIBRARIES (lightgbm Eigen3::Eigen) ++TARGET_LINK_LIBRARIES (_lightgbm Eigen3::Eigen) ++ ++find_package(fmt) ++TARGET_LINK_LIBRARIES(lightgbm fmt::fmt) ++TARGET_LINK_LIBRARIES(_lightgbm fmt::fmt) ++ + if(USE_MPI) + TARGET_LINK_LIBRARIES(lightgbm ${MPI_CXX_LIBRARIES}) + TARGET_LINK_LIBRARIES(_lightgbm ${MPI_CXX_LIBRARIES}) +diff --git a/include/LightGBM/utils/common.h b/include/LightGBM/utils/common.h +index 4357357..00101a5 100644 +--- a/include/LightGBM/utils/common.h ++++ b/include/LightGBM/utils/common.h +@@ -32,9 +32,9 @@ + + #if (!((defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)))) + #define FMT_HEADER_ONLY +-#include "../../../external_libs/fmt/include/fmt/format.h" ++#include "fmt/format.h" + #endif +-#include "../../../external_libs/fast_double_parser/include/fast_double_parser.h" ++#include "fast_double_parser.h" + + #ifdef _MSC_VER + #include +-- +2.31.1 -- 2.34.1