Skip to content

Commit 3601c10

Browse files
author
Dmitry Razdoburdin
committed
merge branch release_2.1.0 from dmlc/xgboost
2 parents 3760532 + 62e7923 commit 3601c10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+302
-136
lines changed

‎.github/workflows/jvm_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
3232
with:
33-
miniforge-variant: Mambaforge
33+
miniforge-variant: Miniforge3
3434
miniforge-version: latest
3535
activate-environment: jvm_tests
3636
environment-file: tests/ci_build/conda_env/jvm_tests.yml

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
submodules: 'true'
8282
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
8383
with:
84-
miniforge-variant: Mambaforge
84+
miniforge-variant: Miniforge3
8585
miniforge-version: latest
8686
activate-environment: linux_sycl_test
8787
environment-file: tests/ci_build/conda_env/linux_sycl_test.yml
@@ -123,7 +123,7 @@ jobs:
123123
submodules: 'true'
124124
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
125125
with:
126-
miniforge-variant: Mambaforge
126+
miniforge-variant: Miniforge3
127127
miniforge-version: latest
128128
activate-environment: cpp_test
129129
environment-file: tests/ci_build/conda_env/cpp_test.yml

‎.github/workflows/python_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
submodules: 'true'
2727
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
2828
with:
29-
miniforge-variant: Mambaforge
29+
miniforge-variant: Miniforge3
3030
miniforge-version: latest
3131
activate-environment: python_lint
3232
environment-file: tests/ci_build/conda_env/python_lint.yml
@@ -58,7 +58,7 @@ jobs:
5858
submodules: 'true'
5959
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
6060
with:
61-
miniforge-variant: Mambaforge
61+
miniforge-variant: Miniforge3
6262
miniforge-version: latest
6363
activate-environment: sdist_test
6464
environment-file: tests/ci_build/conda_env/sdist_test.yml
@@ -130,7 +130,7 @@ jobs:
130130

131131
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
132132
with:
133-
miniforge-variant: Mambaforge
133+
miniforge-variant: Miniforge3
134134
miniforge-version: latest
135135
activate-environment: macos_cpu_test
136136
environment-file: tests/ci_build/conda_env/macos_cpu_test.yml
@@ -227,7 +227,7 @@ jobs:
227227

228228
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
229229
with:
230-
miniforge-variant: Mambaforge
230+
miniforge-variant: Miniforge3
231231
miniforge-version: latest
232232
activate-environment: linux_cpu_test
233233
environment-file: tests/ci_build/conda_env/linux_cpu_test.yml
@@ -280,7 +280,7 @@ jobs:
280280

281281
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
282282
with:
283-
miniforge-variant: Mambaforge
283+
miniforge-variant: Miniforge3
284284
miniforge-version: latest
285285
activate-environment: linux_sycl_test
286286
environment-file: tests/ci_build/conda_env/linux_sycl_test.yml

‎.github/workflows/python_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: brew install libomp
3535
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
3636
with:
37-
miniforge-variant: Mambaforge
37+
miniforge-variant: Miniforge3
3838
miniforge-version: latest
3939
python-version: 3.9
4040
use-mamba: true

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,13 @@ credentials.csv
139139
.bloop
140140

141141
# python tests
142+
*.bin
142143
demo/**/*.txt
143144
*.dmatrix
144145
.hypothesis
145146
__MACOSX/
146147
model*.json
148+
/tests/python/models/models/
147149

148150
# R tests
149151
*.htm

‎CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(PLUGIN_SYCL)
44
string(REPLACE " -isystem ${CONDA_PREFIX}/include" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
55
endif()
66

7-
project(xgboost LANGUAGES CXX C VERSION 2.1.3)
7+
project(xgboost LANGUAGES CXX C VERSION 2.1.4)
88
include(cmake/Utils.cmake)
99
list(APPEND CMAKE_MODULE_PATH "${xgboost_SOURCE_DIR}/cmake/modules")
1010

@@ -325,7 +325,6 @@ if(PLUGIN_RMM)
325325
list(REMOVE_ITEM rmm_link_libs CUDA::cudart)
326326
list(APPEND rmm_link_libs CUDA::cudart_static)
327327
set_target_properties(rmm::rmm PROPERTIES INTERFACE_LINK_LIBRARIES "${rmm_link_libs}")
328-
get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES)
329328
endif()
330329

331330
if(PLUGIN_SYCL)

‎R-package/DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: xgboost
22
Type: Package
33
Title: Extreme Gradient Boosting
4-
Version: 2.1.3.1
5-
Date: 2024-11-26
4+
Version: 2.1.4.1
5+
Date: 2025-02-06
66
Authors@R: c(
77
person("Tianqi", "Chen", role = c("aut"),
88
email = "tianqi.tchen@gmail.com"),

‎R-package/configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.71 for xgboost 2.1.3.
3+
# Generated by GNU Autoconf 2.71 for xgboost 2.1.4.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -607,8 +607,8 @@ MAKEFLAGS=
607607
# Identity of this package.
608608
PACKAGE_NAME='xgboost'
609609
PACKAGE_TARNAME='xgboost'
610-
PACKAGE_VERSION='2.1.3'
611-
PACKAGE_STRING='xgboost 2.1.3'
610+
PACKAGE_VERSION='2.1.4'
611+
PACKAGE_STRING='xgboost 2.1.4'
612612
PACKAGE_BUGREPORT=''
613613
PACKAGE_URL=''
614614

@@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then
12591259
# Omit some internal or obsolete options to make the list less imposing.
12601260
# This message is too long to be a string in the A/UX 3.1 sh.
12611261
cat <<_ACEOF
1262-
\`configure' configures xgboost 2.1.3 to adapt to many kinds of systems.
1262+
\`configure' configures xgboost 2.1.4 to adapt to many kinds of systems.
12631263
12641264
Usage: $0 [OPTION]... [VAR=VALUE]...
12651265
@@ -1321,7 +1321,7 @@ fi
13211321

13221322
if test -n "$ac_init_help"; then
13231323
case $ac_init_help in
1324-
short | recursive ) echo "Configuration of xgboost 2.1.3:";;
1324+
short | recursive ) echo "Configuration of xgboost 2.1.4:";;
13251325
esac
13261326
cat <<\_ACEOF
13271327
@@ -1404,7 +1404,7 @@ fi
14041404
test -n "$ac_init_help" && exit $ac_status
14051405
if $ac_init_version; then
14061406
cat <<\_ACEOF
1407-
xgboost configure 2.1.3
1407+
xgboost configure 2.1.4
14081408
generated by GNU Autoconf 2.71
14091409
14101410
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1603,7 +1603,7 @@ cat >config.log <<_ACEOF
16031603
This file contains any messages produced by compilers while
16041604
running configure, to aid debugging if configure makes a mistake.
16051605
1606-
It was created by xgboost $as_me 2.1.3, which was
1606+
It was created by xgboost $as_me 2.1.4, which was
16071607
generated by GNU Autoconf 2.71. Invocation command line was
16081608
16091609
$ $0$ac_configure_args_raw
@@ -3709,7 +3709,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
37093709
# report actual input values of CONFIG_FILES etc. instead of their
37103710
# values after options handling.
37113711
ac_log="
3712-
This file was extended by xgboost $as_me 2.1.3, which was
3712+
This file was extended by xgboost $as_me 2.1.4, which was
37133713
generated by GNU Autoconf 2.71. Invocation command line was
37143714
37153715
CONFIG_FILES = $CONFIG_FILES
@@ -3773,7 +3773,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
37733773
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
37743774
ac_cs_config='$ac_cs_config_escaped'
37753775
ac_cs_version="\\
3776-
xgboost config.status 2.1.3
3776+
xgboost config.status 2.1.4
37773777
configured by $0, generated by GNU Autoconf 2.71,
37783778
with options \\"\$ac_cs_config\\"
37793779

‎R-package/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
AC_PREREQ(2.69)
44

5-
AC_INIT([xgboost],[2.1.3],[],[xgboost],[])
5+
AC_INIT([xgboost],[2.1.4],[],[xgboost],[])
66

77
: ${R_HOME=`R RHOME`}
88
if test -z "${R_HOME}"; then

‎cmake/Utils.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ function(compute_cmake_cuda_archs archs)
5555

5656
# Set up defaults based on CUDA varsion
5757
if(NOT CMAKE_CUDA_ARCHITECTURES)
58-
if(CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
58+
if(CUDA_VERSION VERSION_GREATER_EQUAL "12.8")
59+
set(CMAKE_CUDA_ARCHITECTURES 50 60 70 80 90 100 120)
60+
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
5961
set(CMAKE_CUDA_ARCHITECTURES 50 60 70 80 90)
6062
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
6163
set(CMAKE_CUDA_ARCHITECTURES 50 60 70 80)

‎demo/dask/gpu_training.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def using_quantile_device_dmatrix(client: Client, X: da.Array, y: da.Array) -> d
5050
.. versionadded:: 1.2.0
5151
5252
"""
53-
X = dask_cudf.from_dask_dataframe(dd.from_dask_array(X))
54-
y = dask_cudf.from_dask_dataframe(dd.from_dask_array(y))
53+
X = dd.from_dask_array(X).to_backend("cudf")
54+
y = dd.from_dask_array(y).to_backend("cudf")
5555

5656
# `DaskQuantileDMatrix` is used instead of `DaskDMatrix`, be careful that it can not
5757
# be used for anything else other than training unless a reference is specified. See

‎include/xgboost/version_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
#define XGBOOST_VER_MAJOR 2 /* NOLINT */
88
#define XGBOOST_VER_MINOR 1 /* NOLINT */
9-
#define XGBOOST_VER_PATCH 3 /* NOLINT */
9+
#define XGBOOST_VER_PATCH 4 /* NOLINT */
1010

1111
#endif // XGBOOST_VERSION_CONFIG_H_

‎jvm-packages/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
<packaging>pom</packaging>
1111
<name>XGBoost JVM Package</name>
1212
<description>JVM Package for XGBoost</description>

‎jvm-packages/xgboost4j-example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111
<name>xgboost4j-example</name>
1212
<artifactId>xgboost4j-example_2.12</artifactId>
13-
<version>2.1.3</version>
13+
<version>2.1.4</version>
1414
<packaging>jar</packaging>
1515
<build>
1616
<plugins>

‎jvm-packages/xgboost4j-flink/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111

1212
<name>xgboost4j-flink</name>
1313
<artifactId>xgboost4j-flink_2.12</artifactId>
14-
<version>2.1.3</version>
14+
<version>2.1.4</version>
1515
<properties>
1616
<flink-ml.version>2.2.0</flink-ml.version>
1717
</properties>

‎jvm-packages/xgboost4j-gpu/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111
<artifactId>xgboost4j-gpu_2.12</artifactId>
1212
<name>xgboost4j-gpu</name>
13-
<version>2.1.3</version>
13+
<version>2.1.4</version>
1414
<packaging>jar</packaging>
1515

1616
<dependencies>

‎jvm-packages/xgboost4j-spark-gpu/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111
<name>xgboost4j-spark-gpu</name>
1212
<artifactId>xgboost4j-spark-gpu_2.12</artifactId>

‎jvm-packages/xgboost4j-spark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111
<name>xgboost4j-spark</name>
1212
<artifactId>xgboost4j-spark_2.12</artifactId>

‎jvm-packages/xgboost4j/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>ml.dmlc</groupId>
88
<artifactId>xgboost-jvm_2.12</artifactId>
9-
<version>2.1.3</version>
9+
<version>2.1.4</version>
1010
</parent>
1111
<name>xgboost4j</name>
1212
<artifactId>xgboost4j_2.12</artifactId>
13-
<version>2.1.3</version>
13+
<version>2.1.4</version>
1414
<packaging>jar</packaging>
1515

1616
<dependencies>

‎plugin/sycl/common/hist_util.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "../data/gradient_index.h"
1010
#include "hist_util.h"
1111

12-
#include <CL/sycl.hpp>
12+
#include <sycl/sycl.hpp>
1313

1414
namespace xgboost {
1515
namespace sycl {

‎plugin/sycl/common/hist_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "../../src/common/hist_util.h"
1616
#include "../data/gradient_index.h"
1717

18-
#include <CL/sycl.hpp>
18+
#include <sycl/sycl.hpp>
1919

2020
namespace xgboost {
2121
namespace sycl {

‎plugin/sycl/common/partition_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "../data/gradient_index.h"
2626
#include "../tree/expand_entry.h"
2727

28-
#include <CL/sycl.hpp>
28+
#include <sycl/sycl.hpp>
2929

3030
namespace xgboost {
3131
namespace sycl {

‎plugin/sycl/common/row_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "../data.h"
1717

18-
#include <CL/sycl.hpp>
18+
#include <sycl/sycl.hpp>
1919

2020
namespace xgboost {
2121
namespace sycl {

‎plugin/sycl/data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "../../src/common/threading_utils.h"
2424

25-
#include "CL/sycl.hpp"
25+
#include <sycl/sycl.hpp>
2626

2727
namespace xgboost {
2828
namespace sycl {

‎plugin/sycl/data/gradient_index.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "gradient_index.h"
1010

11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212

1313
namespace xgboost {
1414
namespace sycl {

‎plugin/sycl/data/gradient_index.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "../data.h"
1111
#include "../../src/common/hist_util.h"
1212

13-
#include <CL/sycl.hpp>
13+
#include <sycl/sycl.hpp>
1414

1515
namespace xgboost {
1616
namespace sycl {

‎plugin/sycl/device_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <string>
1111
#include <unordered_map>
1212

13-
#include <CL/sycl.hpp>
13+
#include <sycl/sycl.hpp>
1414

1515
#pragma GCC diagnostic push
1616
#pragma GCC diagnostic ignored "-Wtautological-constant-compare"

0 commit comments

Comments
 (0)