From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wG41D+6/2GC5MwEAgWs5BA (envelope-from ) for ; Sun, 27 Jun 2021 20:14:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YEHvCu6/2GCvTAAAB5/wlQ (envelope-from ) for ; Sun, 27 Jun 2021 18:14:06 +0000 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 5F8A01C80B for ; Sun, 27 Jun 2021 20:14:05 +0200 (CEST) Received: from localhost ([::1]:55460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxYig-0005BE-Dk for larch@yhetil.org; Sun, 27 Jun 2021 13:37:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxYiM-0004V7-MJ for guix-patches@gnu.org; Sun, 27 Jun 2021 13:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxYiM-0002wG-Er for guix-patches@gnu.org; Sun, 27 Jun 2021 13:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxYiM-0006bu-BI for guix-patches@gnu.org; Sun, 27 Jun 2021 13:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48388] [PATCH v3 2/3] gnu: Add xgboost. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Jun 2021 17:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48388 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48388@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48388-submit@debbugs.gnu.org id=B48388.162481539525354 (code B ref 48388); Sun, 27 Jun 2021 17:37:02 +0000 Received: (at 48388) by debbugs.gnu.org; 27 Jun 2021 17:36:35 +0000 Received: from localhost ([127.0.0.1]:50340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxYhu-0006am-52 for submit@debbugs.gnu.org; Sun, 27 Jun 2021 13:36:34 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxYhs-0006aW-CR for 48388@debbugs.gnu.org; Sun, 27 Jun 2021 13:36:33 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id BAB642400FC for <48388@debbugs.gnu.org>; Sun, 27 Jun 2021 19:36:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1624815386; bh=S9mfeahNo5Hkic/abvFhNcrOY9vnZnye5McLefaiU0E=; h=From:To:Cc:Subject:Date:From; b=RErBS6aEXQrh0dcBeWmhhxA+VcbFPsVCubyzw0lgcwg65WS92h0m2os1IvYl29iXR QZrvkueJ9eOYwheFqCWZ0TsEfOWUd9r4DmN257Z6yhAU54/XmnELpX6KGlL42ID+zv VhKv8wkaRWGmlF3kSU+2MZqRPkkPCQrpAib31edTzrunBDdyCARupnQQf6rHdAL6FW uxiKRzshm5URjQWY4J2C80IsNMbSJ0hezj32l0p3hmykNrIkW3BpSjJWSb+B44Oclb GnxBLH9Gf5wzsfYcCNIr648zLtxleuBJtwVPK+hYU1FLiII3OAAVGmL/2krXfgbPks K9dktxbMNnrqg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4GCdFj3C68z6tmQ; Sun, 27 Jun 2021 19:36:25 +0200 (CEST) From: Vinicius Monego Date: Sun, 27 Jun 2021 17:30:46 +0000 Message-Id: <20210627173047.2576-2-monego@posteo.net> In-Reply-To: <20210627173047.2576-1-monego@posteo.net> References: <20210627173047.2576-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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624817645; 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=qU0qM4Dj00gOTS4KsDpbXI3UPW32d1Ja3+YAEr4WVGE=; b=dz4JnXTlPREtDZISItx3KX4waNO7ZsjvIbuWdrTQgdnpsycE+nihhsV/ERrNhAQNxTLXIl 9Wv/GWNM6C029RM6/A6NBXGqD36z3sB3rRHDY8xU5xf1pzCEzDsn8RxC6E+bPkR82YLRGm lka0XVEi0IL9G6qmDZMtKgYTYtgzcPKnJTAqpn9t5j0yfW+YiLdvFF92h4MnuuKMwkFrp5 nC+LVJKFyPeGQZUeExRKft+4FOEOiM+UIUGUykQ6c2XFc8B+6JEkNK+Ih2FlktVKoQ7Vgk HkPvHv47ptOn0Ja85WfXKVKwaYTsTjHkkNgHvZXkTQVYQjb33AZnCXjvbxK6NQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624817645; a=rsa-sha256; cv=none; b=ZfWrfleboAJYK9KmhIgf+iRHU6sRIJcPAl/qVsjoVNYy+ya2EHSObp7qCP4p/7pbdMR/+m 90IHP5GrT7tePPSzJrj9jckJjY/mUnNUTO/4ADX0wN9SQ3Q7yhvO5gY0fl9QdUfgLAuK+1 ssvmO+nmdCOV7yj4s+aSK/o2Ug4mAIJuaV6IRpdn2bSCjYZXUtxuMuvF6tEBT1skqDjk4e 6FaX5ZFhyGmU19zSRgEN9xZ3Nas8/ieIVnifOks0J8Hqtq5PtN1P3BgvpfMpy95GvnKtu1 4uGSyjfMkiucOX6Kw3JIuT2qpJdnhijqqU0iQcnGiXyEMYqJwjEP66tqu68eNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=RErBS6aE; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=RErBS6aE; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5F8A01C80B X-Spam-Score: 5.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: UuqkxSSobB9Y * gnu/packages/machine-learning.scm (xgboost): New variable. * gnu/packages/patches/xgboost-use-system-dmlc-core.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- Removed the python patch, updated to 1.4.2 and removed "in C++" from synopsis. gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 32 +++++++++++++++++ .../xgboost-use-system-dmlc-core.patch | 34 +++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 gnu/packages/patches/xgboost-use-system-dmlc-core.patch diff --git a/gnu/local.mk b/gnu/local.mk index f7ff9af997..19db9787dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ + %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 9d6c5505f7..bbdfba960e 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1959,6 +1959,38 @@ offers the bricks to build efficient and scalable distributed machine learning libraries.") (license license:asl2.0)))) +(define-public xgboost + (package + (name "xgboost") + (version "1.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dmlc/xgboost") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "xgboost-use-system-dmlc-core.patch")) + (sha256 + (base32 "00liz816ahk9zj3jv3m2fqwlf6xxfbgvpmpl72iklx32vl192w5d")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DGOOGLE_TEST=ON"))) + (native-inputs + `(("googletest" ,googletest) + ("python" ,python-wrapper))) + (inputs + `(("dmlc-core" ,dmlc-core))) + (home-page "https://xgboost.ai/") + (synopsis "Gradient boosting (GBDT, GBRT or GBM) library") + (description + "XGBoost is an optimized distributed gradient boosting library designed +to be highly efficient, flexible and portable. It implements machine learning +algorithms under the Gradient Boosting framework. XGBoost provides a parallel +tree boosting (also known as GBDT, GBM) that solve many data science problems +in a fast and accurate way.") + (license license:asl2.0))) + (define-public python-iml (package (name "python-iml") diff --git a/gnu/packages/patches/xgboost-use-system-dmlc-core.patch b/gnu/packages/patches/xgboost-use-system-dmlc-core.patch new file mode 100644 index 0000000000..c654694fec --- /dev/null +++ b/gnu/packages/patches/xgboost-use-system-dmlc-core.patch @@ -0,0 +1,34 @@ +From 34167cc105e47589b86b6f62da76e0ab744002dd Mon Sep 17 00:00:00 2001 +From: Vinicius Monego +Date: Tue, 11 May 2021 19:35:30 -0300 +Subject: [PATCH] Use dmlc-core from Guix. + +--- +This patch is a subset of the following Debian patch: https://sources.debian.org/src/xgboost/1.2.1-1/debian/patches/cmake.patch/ + +Rabit is now developed as part of xgboost, so we don't build it separately. + + CMakeLists.txt | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6cc19fbd..3b42bc17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,11 +150,9 @@ endif (USE_OPENMP) + + # dmlc-core + msvc_use_static_runtime() +-add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) +-set_target_properties(dmlc PROPERTIES +- CXX_STANDARD 14 +- CXX_STANDARD_REQUIRED ON +- POSITION_INDEPENDENT_CODE ON) ++add_library(dmlc SHARED IMPORTED) ++find_library(DMLC_LIBRARY dmlc) ++set_property(TARGET dmlc PROPERTY IMPORTED_LOCATION "${DMLC_LIBRARY}") + if (MSVC) + target_compile_options(dmlc PRIVATE + -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) +-- +2.31.1 -- 2.32.0