From patchwork Wed Jun 30 20:09:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 30844 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 EADAC27BC83; Wed, 30 Jun 2021 21:11:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1FD5027BC81 for ; Wed, 30 Jun 2021 21:11:12 +0100 (BST) Received: from localhost ([::1]:42594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lygYB-0007jn-2l for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 16:11:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lygY3-0007hR-31 for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lygY2-0002Od-RU for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lygY2-00040I-O6 for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48785] [PATCH v2 1/3] gnu: Add fast-double-parser. References: <20210601220510.78230-1-monego@posteo.net> In-Reply-To: <20210601220510.78230-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:11: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.162508385515363 (code B ref 48785); Wed, 30 Jun 2021 20:11:02 +0000 Received: (at 48785) by debbugs.gnu.org; 30 Jun 2021 20:10:55 +0000 Received: from localhost ([127.0.0.1]:58848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygXq-0003zT-Fm for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:10:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:34959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygXn-0003z0-Ha for 48785@debbugs.gnu.org; Wed, 30 Jun 2021 16:10:48 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1FE5F2400FF for <48785@debbugs.gnu.org>; Wed, 30 Jun 2021 22:10:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625083841; bh=SlJ1JnrX4wopV3KE+YzkfuYXmv/YWbVZ48vnAbXes4c=; h=From:To:Cc:Subject:Date:From; b=Q3TWwbt2C8iYw/fHgRgsLO32xgtu/0Pah4bs6tf75Lg3oEBLuJyzYget9LrNsar78 +MxE4CmK89hl+igIFaSsvndEU6c9cmgQhrurFr7J7kGofHGfE95Ge+W9mEJVT53yTm m85Qxgv7gTPePPvV6kOKbErTXcz6k9zgUZOgskDmqPnwdMCyTHvAk5Ou9rPTRe6jc+ aQ/aM60DKYEwj2wOkPFhi27XxlJ006prJcG27tSwWUUeDTG0FNwnLH945AMNb62EWE V8NaGPE5nIlU5urZcz1w4Rsqg9nzQ8g21wPA9vHKTwa/G9Fpc4iqhmYWbryN2yfHhF Ie5denQmZk2FA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GFXXH39bCz6tm5; Wed, 30 Jun 2021 22:10:38 +0200 (CEST) From: Vinicius Monego Date: Wed, 30 Jun 2021 20:09:17 +0000 Message-Id: <20210630200919.912223-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (fast-double-parser): New variable. --- gnu/packages/cpp.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 54f9da4b27..3ca184b4b0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Alexandros Theodotou @@ -330,6 +330,42 @@ functions, class methods, and stl containers. @end enumerate\n") (license license:bsd-3))) +(define-public fast-double-parser + (package + (name "fast-double-parser") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lemire/fast_double_parser") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10mfpy4i7lpavghb15s4d0920nlwsac1ri2sxkcqbrj9iq94qj71")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'install ;no install target, have to do it manually + (lambda* (#:key outputs #:allow-other-keys) + (let ((out-include (string-append (assoc-ref outputs "out") + "/include"))) + (mkdir-p out-include) + (copy-file "../source/include/fast_double_parser.h" + (string-append out-include + "/fast_double_parser.h")))))))) + (home-page "https://github.com/lemire/fast_double_parser") + (synopsis "Parse strings into double (binary64) floating-point values") + (description "Fast function to parse strings containing decimal numbers +into double-precision (binary64) floating-point values. That is, given the +string \"1.0e10\", it should return a 64-bit floating-point value equal to +10000000000. The function will match exactly (down the smallest bit) the +result of a standard function like @code{strtod}.") + ;; Dual-licensed, either license applies. + (license (list license:asl2.0 + license:boost1.0)))) + (define-public fifo-map (let* ((commit "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9") (revision "0") From patchwork Wed Jun 30 20:09:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 30845 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 8423427BC81; Wed, 30 Jun 2021 21:11:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 08EB827BC78 for ; Wed, 30 Jun 2021 21:11:12 +0100 (BST) Received: from localhost ([::1]:42574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lygYA-0007ir-VM for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 16:11:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lygY2-0007hC-TR for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47304) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lygY2-0002OE-Eu for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lygY2-00040B-Bc for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48785] [PATCH v2 2/3] gnu: lightgbm: Update to 3.2.1. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:11: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.162508385015346 (code B ref 48785); Wed, 30 Jun 2021 20:11:02 +0000 Received: (at 48785) by debbugs.gnu.org; 30 Jun 2021 20:10:50 +0000 Received: from localhost ([127.0.0.1]:58845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygXp-0003zR-VO for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:10:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygXo-0003z6-5d for 48785@debbugs.gnu.org; Wed, 30 Jun 2021 16:10:48 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 83C5D240100 for <48785@debbugs.gnu.org>; Wed, 30 Jun 2021 22:10:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625083842; bh=vUq34YNoD4lmGRUeSWi6/2cVs4wCOx898hXfYjvPpPk=; h=From:To:Cc:Subject:Date:From; b=Lz1CaCtkMi41Jai+dY+P3WDXCUrXaXH3f/q3E5XZ+plNKCIL97uBrjdo0b1ZNgV+T 1S0nquk9SvDQKNE5Z7aszOe4wJiF/TQnVpadZU/O3VjwO5XubNSNRmuo2gqsQvuvmj sk0Rt1IXSNcUkmyEPXkDNEzJvJC4un4PiLf0J/tUJaqxiKpgz78BfXl/Ew96aCiyrr toJpgxTm2zh24S5TMh2elzwNRee6GR8cYqT7kwtEzTTyfwOxmwO8SeUCxIlktEMBmq Wp2Sz9rOA3qFwsuLRwEvKGWRVH0vt/coFg8emOGyudQ7XPYZEvQztUEclp3H3PuQNa vkxku4J210R+w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GFXXK0W4gz6tm5; Wed, 30 Jun 2021 22:10:40 +0200 (CEST) From: Vinicius Monego Date: Wed, 30 Jun 2021 20:09:18 +0000 Message-Id: <20210630200919.912223-2-monego@posteo.net> In-Reply-To: <20210630200919.912223-1-monego@posteo.net> References: <20210630200919.912223-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/machine-learning.scm (lightgbm): Update to 3.2.1. [source]: Add patch. Make cosmetic changes. [native-inputs]: Add googletest, opencl-headers. [inputs]: Add boost, eigen, fast-double-parser, fmt, ocl-icd. [propagated-inputs]: Remove. [arguments]: Add #:tests?, #:test-target. Pass "-DBUILD_CPP_TEST=OFF" and "-DUSE_GPU=ON" to #:configure-flags. Do not replace check phase. * gnu/packages/patches/lightgbm-use-system-libraries.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- Removed the python patch. gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 56 ++++++++++-------- .../lightgbm-use-system-libraries.patch | 58 +++++++++++++++++++ 3 files changed, 91 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 19db9787dc..fa30cc7e9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1386,6 +1386,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.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-support-for-Pinebook-Pro.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b8d79821e0..04d1fa0c4d 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cmake) + #:use-module (gnu packages cpp) #:use-module (gnu packages cran) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) @@ -70,8 +71,10 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages ocaml) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages opencl) #: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 python) #:use-module (gnu packages python-build) @@ -1058,33 +1061,38 @@ main intended application of Autograd is gradient-based optimization.") (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)))) + (version "3.2.1") + (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 "1fchiiwl3pz1kpi0kbfanif6c6b688wmmjjbqz4ff4djc6g2sg7z")) + (file-name (git-file-name name version)))) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-nose" ,python-nose))) + `(("googletest" ,googletest) + ("opencl-headers" ,opencl-headers))) (inputs - `(("openmpi" ,openmpi))) - (propagated-inputs - `(("python-numpy" ,python-numpy) - ("python-scipy" ,python-scipy))) + `(("boost" ,boost) + ("eigen" ,eigen) + ("fast-double-parser" ,fast-double-parser) + ("fmt" ,fmt) + ("ocl-icd" ,ocl-icd) + ("openmpi" ,openmpi))) (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"))))))) + `(;; FIXME: With 'find_package(GTest CONFIG)' (default), googletest + ;; is not found by CMake. If we replace CONFIG with REQUIRED, the + ;; test files fail to link with googletest in the build phase. + #:tests? #f + #:test-target "testlightgbm" + #:configure-flags + (list "-DBUILD_CPP_TEST=OFF" + "-DUSE_GPU=ON" ;using OpenCL + "-DUSE_MPI=ON"))) (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..115ca02775 --- /dev/null +++ b/gnu/packages/patches/lightgbm-use-system-libraries.patch @@ -0,0 +1,58 @@ +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 + From patchwork Wed Jun 30 20:09:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 30846 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 4A68627BC81; Wed, 30 Jun 2021 21:11:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0D91927BC78 for ; Wed, 30 Jun 2021 21:11:20 +0100 (BST) Received: from localhost ([::1]:43214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lygYJ-00089W-4f for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 16:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lygY3-0007i6-Eo for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47306) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lygY3-0002PJ-7E for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lygY3-00040Q-3y for guix-patches@gnu.org; Wed, 30 Jun 2021 16:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48785] [PATCH v2 3/3] gnu: Add python-lightgbm. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:11:03 +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.162508385715371 (code B ref 48785); Wed, 30 Jun 2021 20:11:03 +0000 Received: (at 48785) by debbugs.gnu.org; 30 Jun 2021 20:10:57 +0000 Received: from localhost ([127.0.0.1]:58850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygXw-0003zr-Hh for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:10:56 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygXq-0003z9-8u for 48785@debbugs.gnu.org; Wed, 30 Jun 2021 16:10:51 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 50E1B240026 for <48785@debbugs.gnu.org>; Wed, 30 Jun 2021 22:10:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1625083844; bh=hNCxpMTcYNyZbcxKjoeVAoS/rwmBamIGzHW750mFe9I=; h=From:To:Cc:Subject:Date:From; b=CdvJrPNB2Q0sqbGXVnuNNNEzbjzc+RuUM5I1e9nfBKY2pr4BvaUqUDpEGzae16qVh iaPPVwblZNUgK+S9ZehzoZkC0njKjnrtSJVlfS9DIZCTDtHWIWf8YrxpVZGTvwl/Xc hD8iYYNEMe6S15xQP0ajKPzIYAIzJDt1TzyiHeFK0WcPA3IQhzIre+CLEMDyw01I1a uhoBYfIBl3yLMbNYF7hPf3YEqbW8pbQiYgFLPFaaPcDMEMQcwp3l+J6n2tMnB2vIIS umoXXG6AFXWNgm6aZ0KNH2hqZSH5hgnpVlk94LhEO5yWwLz6XUQBOtjO0ExP5nuwK3 Q5AU+6fsea3jw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GFXXL5DLXz6tm5; Wed, 30 Jun 2021 22:10:42 +0200 (CEST) From: Vinicius Monego Date: Wed, 30 Jun 2021 20:09:19 +0000 Message-Id: <20210630200919.912223-3-monego@posteo.net> In-Reply-To: <20210630200919.912223-1-monego@posteo.net> References: <20210630200919.912223-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/machine-learning.scm (python-lightgbm): New variable. --- Replace patch changes with code in 'preparations phase and added phase 'install-liblightgbm gnu/packages/machine-learning.scm | 59 +++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 04d1fa0c4d..79bf0bbbfd 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1109,6 +1109,65 @@ the following advantages: @end itemize\n") (license license:expat))) +(define-public python-lightgbm + (package + (inherit lightgbm) + (name "python-lightgbm") + (source (package-source lightgbm)) + (build-system python-build-system) + (arguments + `(#:configure-flags (list "--precompile") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'preparations + (lambda _ + (setenv "HOME" "/tmp") ;to write a log file + ;; Move Python files to source root to silence some warnings. + (rename-file "python-package/setup.py" "setup.py") + (rename-file "python-package/README.rst" "README.rst") + (rename-file "python-package/lightgbm" "lightgbm") + ;; Install version file to read the library's version. + (with-output-to-file "lightgbm/VERSION.txt" + (lambda () + (display ,(package-version lightgbm)))) + ;; Skip building the shared library. + (substitute* "setup.py" + (("'install_lib': CustomInstallLib,") "")))) + (add-after 'install 'install-liblightgbm + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pylib (string-append out "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages")) + (lgbdir (string-append pylib "/lightgbm")) + (lib-lightgbm (string-append (assoc-ref inputs "lightgbm") + "/lib/lib_lightgbm.so"))) + ;; This symlink is necessary for tests. + (symlink lib-lightgbm "lightgbm/lib_lightgbm.so") + ;; And this one for runtime. + (mkdir-p (string-append lgbdir "/lib")) + (symlink lib-lightgbm (string-append lgbdir + "/lib_lightgbm.so"))))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest" + "tests/python_package_test"))))))) + (native-inputs + `(("python-psutil" ,python-psutil) + ("python-pytest" ,python-pytest) + ("python-wheel" ,python-wheel))) + (inputs + `(("lightgbm" ,lightgbm))) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-scipy" ,python-scipy) + ("python-scikit-learn" ,python-scikit-learn))) + (synopsis "Python frontend for LightGBM"))) + (define-public vowpal-wabbit ;; Language bindings not included. (package