From patchwork Sat Sep 25 19:36:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33289 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 06D8427BBE1; Sat, 25 Sep 2021 20:38:36 +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,RCVD_IN_MSPIKE_H2,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 7BAC927BBE3 for ; Sat, 25 Sep 2021 20:38:35 +0100 (BST) Received: from localhost ([::1]:40592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUDVK-0005G9-Cp for patchwork@mira.cbaines.net; Sat, 25 Sep 2021 15:38:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUDUo-0005Fq-DC for guix-patches@gnu.org; Sat, 25 Sep 2021 15:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUDUo-0004NK-5f for guix-patches@gnu.org; Sat, 25 Sep 2021 15:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUDUo-0004Ee-0p for guix-patches@gnu.org; Sat, 25 Sep 2021 15:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48388] [PATCH v5 2/3] gnu: Add xgboost. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Sep 2021 19:38:01 +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.163259864516215 (code B ref 48388); Sat, 25 Sep 2021 19:38:01 +0000 Received: (at 48388) by debbugs.gnu.org; 25 Sep 2021 19:37:25 +0000 Received: from localhost ([127.0.0.1]:34810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUDUC-0004DT-Pp for submit@debbugs.gnu.org; Sat, 25 Sep 2021 15:37:25 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUDU9-0004D2-V0 for 48388@debbugs.gnu.org; Sat, 25 Sep 2021 15:37:22 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C4498240104 for <48388@debbugs.gnu.org>; Sat, 25 Sep 2021 21:37:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1632598635; bh=xnMoUZ8vJTV2dOAgopDJf8GN6iHrCij0cUzeZYvOOMo=; h=From:To:Cc:Subject:Date:From; b=eXSIByJ6aGJHe16QWWEC+is99r2sE0HvrSs7/SIwnSxBw81SNAhZ7nCcI+optIlLx lzE9snRFhPImW078Zj6XrX97Vdk/vfGO/QyU7KBLrkyRpsXoylIrEGa2TQsoEmso+2 K2oQnfmJHQLpevcV9paWT7RbMN8l9ubw3dfLABzvCpage+LUqLNcSIaOqxbWmNasN4 W5k0QkK1sByff9s8m23Yq/HIaS2+JbXoxv9DR/mlhzCgXeBxpiXcLoYL/lhkAlnix2 kGqSY/9mIixsCrltOZDnI0OHxnzhe4Mz9clfVEBjXi27eS0fmICoGaQ90BVaI//CJJ dFsWq9N2mfmuw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HGzgZ3wRSz6tm4; Sat, 25 Sep 2021 21:37:13 +0200 (CEST) From: Vinicius Monego Date: Sat, 25 Sep 2021 19:36:50 +0000 Message-Id: <20210925193651.155981-2-monego@posteo.net> In-Reply-To: <20210925193651.155981-1-monego@posteo.net> References: <20210925193651.155981-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 (xgboost): New variable. * gnu/packages/patches/xgboost-use-system-dmlc-core.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- 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 7d706f6f6e..22fc393f0e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1888,6 +1888,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/xnnpack-system-libraries.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a4768211a0..454088b1a5 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2338,6 +2338,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