From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OL7yDE0g6GFWaAEAgWs5BA (envelope-from ) for ; Wed, 19 Jan 2022 15:29:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id Z0iKBU0g6GGqEwEAG6o9tA (envelope-from ) for ; Wed, 19 Jan 2022 15:29:33 +0100 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 F172B3FEF4 for ; Wed, 19 Jan 2022 15:28:31 +0100 (CET) Received: from localhost ([::1]:49640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nABwt-000709-4Q for larch@yhetil.org; Wed, 19 Jan 2022 09:28:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nABGp-0003cv-49 for guix-patches@gnu.org; Wed, 19 Jan 2022 08:45:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nABGo-0003go-NQ for guix-patches@gnu.org; Wed, 19 Jan 2022 08:45:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nABGo-0008KJ-M3 for guix-patches@gnu.org; Wed, 19 Jan 2022 08:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53363] [PATCH] gnu: xgboost: Update to 1.5.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jan 2022 13:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53363 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53363@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164259988031942 (code B ref -1); Wed, 19 Jan 2022 13:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jan 2022 13:44:40 +0000 Received: from localhost ([127.0.0.1]:53016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nABGS-0008J2-6s for submit@debbugs.gnu.org; Wed, 19 Jan 2022 08:44:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:57126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nABGN-0008Ij-BX for submit@debbugs.gnu.org; Wed, 19 Jan 2022 08:44:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nABGK-0002mk-Ug for guix-patches@gnu.org; Wed, 19 Jan 2022 08:44:33 -0500 Received: from mout02.posteo.de ([185.67.36.66]:34455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nABGH-0003aD-9Q for guix-patches@gnu.org; Wed, 19 Jan 2022 08:44:32 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5B3D1240101 for ; Wed, 19 Jan 2022 14:44:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1642599865; bh=3xD1R26CmdxQZv1BXi2eapYce63RwUIEn2PatRMgfNI=; h=From:To:Cc:Subject:Date:From; b=HjdwuAfJeOc/ueEkVj9rAiAVOgr8NICP17H9qv7l0enhS4mQ4ic212mY5QONQDhte D5fWxTOy6l0TUvVQaJXh8iYAjicYmHvhhqXkI0n1aYDeZkODcex75AQYsf0tkZszaT mMjcFzdo3uwRwjLKRkdXlY/Boo8AQvKKvBnCrDI9f9yIrWGmN5bPRDwoAqSp3DFjDv cYi2kG0DgYfL0/G7Et+ThLOrF6P1LqxSkP7gPP7ViuvYrmFCrcmeioiA/Le/XzpgZE kM0SC8GrpKGbYylhiN3E1vj168+0vZy8VOr+k7HTDGaYUov21FBHqQ42cjQ5/ITp5M LWQm5xJ6sDDSw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Jf6Lw3FwBz9rxK; Wed, 19 Jan 2022 14:44:23 +0100 (CET) From: Vinicius Monego Date: Wed, 19 Jan 2022 13:43:56 +0000 Message-Id: <20220119134356.36919-1-monego@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642602512; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=LfZMN3grKGGH2FrKIOumu5gD5wEthKPNf3f1tw5Rrlo=; b=rgK4aR+P2AumNHrL115lnLV/ahHQnF8YYEdoIlMHM+kq6VByNpaiGeS51/BaFxIv69aalN U6MuRGUZIkrfsUUgjalxJQUr5athMLb/udjMu2NjKk1XNUJcnwW5wHN3qK97W+Q4mzyELD cRlJnqZDMrqW32jfStia/opA2NzkznNR8KuIiqoB/YNqXMOMGmN1ilnLaCXLec4iDJCv3I PgRNl75CqtNFDY64vZzrnLRuYVShGqHQZMkiDYs7BFFJgOjR2qnQWvO/EnAXaNb6HqzMXB fBhGxhuthsxT6VbcrNwl4nm76VMX9YyU1/ERTYju3w8r1jgBneu0lEcY8Z1tYw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642602512; a=rsa-sha256; cv=none; b=JcZ/5HMGh1jZdmyVmIUbcKKvpYS7zmMbJXZKRj9/Ca7Gk333UKPoyFEtcSaL3KQEupyDRs MaVUIFGVsKfuJ5eZEYXDpD32TYXa0fmzbHsOG/w7r1jygApTungXw5S3b9URsiHjz260jD LsfQJPON0XV4U+SjuXhoHSqkqnz+txwgHrpZa5gLezXMy5l4obZ4MTXjgskYKgctnOBS73 JceL15/ulDQC+KYy38FJBHFu7OmmuCT2olM6lTQkjntssusD3Zyn1/C7IH5ZCZTuRxfvnc gC13jNHZu8GLjpE0dn4uBHyv62GqRVZZFSEiNpKFSArBtB3/wtij+mv64QrNzQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=HjdwuAfJ; 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-Spam-Score: -2.22 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=HjdwuAfJ; 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-Queue-Id: F172B3FEF4 X-Spam-Score: -2.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: u93DO2FQA2J4 * gnu/packages/machine-learning.scm (xgboost, python-xgboost): Update to 1.5.2. (python-xgboost): Enable previously failing test. * gnu/packages/patches/xgboost-use-system-dmlc-core.patch: Update patch. --- gnu/packages/machine-learning.scm | 8 ++- .../xgboost-use-system-dmlc-core.patch | 53 ++++++++++--------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e5dbba21dd..318c7a0c17 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Edouard Klein -;;; Copyright © 2020, 2021 Vinicius Monego +;;; Copyright © 2020, 2021, 2022 Vinicius Monego ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -2497,7 +2497,7 @@ learning libraries.") (define-public xgboost (package (name "xgboost") - (version "1.4.2") + (version "1.5.2") (source (origin (method git-fetch) @@ -2507,7 +2507,7 @@ learning libraries.") (file-name (git-file-name name version)) (patches (search-patches "xgboost-use-system-dmlc-core.patch")) (sha256 - (base32 "00liz816ahk9zj3jv3m2fqwlf6xxfbgvpmpl72iklx32vl192w5d")))) + (base32 "0qx04y7cz8z7qv6bk9q7d7ba9b7xzj53l83l2x9ykdwhzacc3dn0")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DGOOGLE_TEST=ON"))) @@ -2580,8 +2580,6 @@ in a fast and accurate way.") " and not test_cv_no_shuffle" " and not test_cv" " and not test_training" - ;; FIXME: May pass in the next version. - " and not test_pandas" ;; "'['./runexp.sh']' returned non-zero exit status 1" " and not test_cli_binary_classification")))))))) (native-inputs diff --git a/gnu/packages/patches/xgboost-use-system-dmlc-core.patch b/gnu/packages/patches/xgboost-use-system-dmlc-core.patch index c654694fec..6b2a1651a5 100644 --- a/gnu/packages/patches/xgboost-use-system-dmlc-core.patch +++ b/gnu/packages/patches/xgboost-use-system-dmlc-core.patch @@ -1,34 +1,35 @@ -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) +# This patch was imported from Debian: https://sources.debian.org/src/xgboost/1.5.1-1/debian/patches/cmake-dmlc-core.patch/ +Index: xgboost/CMakeLists.txt +=================================================================== +--- xgboost.orig/CMakeLists.txt ++++ xgboost/CMakeLists.txt +@@ -164,7 +164,9 @@ endif (USE_NCCL) + # 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 + if (TARGET dmlc_unit_tests) +@@ -222,7 +224,7 @@ set_target_properties(runxgboost PROPERT + #-- End CLI for xgboost + + # Common setup for all targets +-foreach(target xgboost objxgboost dmlc runxgboost) ++foreach(target xgboost objxgboost runxgboost) + xgboost_target_properties(${target}) + xgboost_target_link_libraries(${target}) + xgboost_target_defs(${target}) +@@ -273,7 +275,7 @@ install(DIRECTORY ${xgboost_SOURCE_DIR}/ + # + # https://github.com/dmlc/xgboost/issues/6085 + if (BUILD_STATIC_LIB) +- set(INSTALL_TARGETS xgboost runxgboost objxgboost dmlc) ++ set(INSTALL_TARGETS xgboost runxgboost objxgboost) + else (BUILD_STATIC_LIB) + set(INSTALL_TARGETS xgboost runxgboost) + endif (BUILD_STATIC_LIB) base-commit: 36f4745dc10e5d0e8b2a62cd2c8439629debae4f -- 2.30.2