Skip to content

Update to v.2.1.4 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/jvm_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: jvm_tests
environment-file: tests/ci_build/conda_env/jvm_tests.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
submodules: 'true'
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: linux_sycl_test
environment-file: tests/ci_build/conda_env/linux_sycl_test.yml
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
submodules: 'true'
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: cpp_test
environment-file: tests/ci_build/conda_env/cpp_test.yml
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
submodules: 'true'
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: python_lint
environment-file: tests/ci_build/conda_env/python_lint.yml
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
submodules: 'true'
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: sdist_test
environment-file: tests/ci_build/conda_env/sdist_test.yml
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: macos_cpu_test
environment-file: tests/ci_build/conda_env/macos_cpu_test.yml
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:

- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: linux_cpu_test
environment-file: tests/ci_build/conda_env/linux_cpu_test.yml
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:

- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
activate-environment: linux_sycl_test
environment-file: tests/ci_build/conda_env/linux_sycl_test.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: brew install libomp
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
python-version: 3.9
use-mamba: true
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,13 @@ credentials.csv
.bloop

# python tests
*.bin
demo/**/*.txt
*.dmatrix
.hypothesis
__MACOSX/
model*.json
/tests/python/models/models/

# R tests
*.htm
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if(PLUGIN_SYCL)
string(REPLACE " -isystem ${CONDA_PREFIX}/include" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()

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

Expand Down Expand Up @@ -327,7 +327,6 @@ if(PLUGIN_RMM)
list(REMOVE_ITEM rmm_link_libs CUDA::cudart)
list(APPEND rmm_link_libs CUDA::cudart_static)
set_target_properties(rmm::rmm PROPERTIES INTERFACE_LINK_LIBRARIES "${rmm_link_libs}")
get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES)
endif()

if(PLUGIN_SYCL)
Expand Down
4 changes: 2 additions & 2 deletions R-package/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: xgboost
Type: Package
Title: Extreme Gradient Boosting
Version: 2.1.3.1
Date: 2024-11-26
Version: 2.1.4.1
Date: 2025-02-06
Authors@R: c(
person("Tianqi", "Chen", role = c("aut"),
email = "tianqi.tchen@gmail.com"),
Expand Down
18 changes: 9 additions & 9 deletions R-package/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for xgboost 2.1.3.
# Generated by GNU Autoconf 2.71 for xgboost 2.1.4.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
Expand Down Expand Up @@ -607,8 +607,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xgboost'
PACKAGE_TARNAME='xgboost'
PACKAGE_VERSION='2.1.3'
PACKAGE_STRING='xgboost 2.1.3'
PACKAGE_VERSION='2.1.4'
PACKAGE_STRING='xgboost 2.1.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xgboost 2.1.3 to adapt to many kinds of systems.
\`configure' configures xgboost 2.1.4 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1321,7 +1321,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xgboost 2.1.3:";;
short | recursive ) echo "Configuration of xgboost 2.1.4:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1404,7 +1404,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xgboost configure 2.1.3
xgboost configure 2.1.4
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1603,7 +1603,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by xgboost $as_me 2.1.3, which was
It was created by xgboost $as_me 2.1.4, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3709,7 +3709,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xgboost $as_me 2.1.3, which was
This file was extended by xgboost $as_me 2.1.4, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -3773,7 +3773,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
xgboost config.status 2.1.3
xgboost config.status 2.1.4
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion R-package/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

AC_PREREQ(2.69)

AC_INIT([xgboost],[2.1.3],[],[xgboost],[])
AC_INIT([xgboost],[2.1.4],[],[xgboost],[])

: ${R_HOME=`R RHOME`}
if test -z "${R_HOME}"; then
Expand Down
4 changes: 3 additions & 1 deletion cmake/Utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ function(compute_cmake_cuda_archs archs)

# Set up defaults based on CUDA varsion
if(NOT CMAKE_CUDA_ARCHITECTURES)
if(CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
if(CUDA_VERSION VERSION_GREATER_EQUAL "12.8")
set(CMAKE_CUDA_ARCHITECTURES 50 60 70 80 90 100 120)
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "11.8")
set(CMAKE_CUDA_ARCHITECTURES 50 60 70 80 90)
elseif(CUDA_VERSION VERSION_GREATER_EQUAL "11.0")
set(CMAKE_CUDA_ARCHITECTURES 50 60 70 80)
Expand Down
4 changes: 2 additions & 2 deletions demo/dask/gpu_training.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def using_quantile_device_dmatrix(client: Client, X: da.Array, y: da.Array) -> d
.. versionadded:: 1.2.0

"""
X = dask_cudf.from_dask_dataframe(dd.from_dask_array(X))
y = dask_cudf.from_dask_dataframe(dd.from_dask_array(y))
X = dd.from_dask_array(X).to_backend("cudf")
y = dd.from_dask_array(y).to_backend("cudf")

# `DaskQuantileDMatrix` is used instead of `DaskDMatrix`, be careful that it can not
# be used for anything else other than training unless a reference is specified. See
Expand Down
2 changes: 1 addition & 1 deletion include/xgboost/version_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

#define XGBOOST_VER_MAJOR 2 /* NOLINT */
#define XGBOOST_VER_MINOR 1 /* NOLINT */
#define XGBOOST_VER_PATCH 3 /* NOLINT */
#define XGBOOST_VER_PATCH 4 /* NOLINT */

#endif // XGBOOST_VERSION_CONFIG_H_
2 changes: 1 addition & 1 deletion jvm-packages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
<packaging>pom</packaging>
<name>XGBoost JVM Package</name>
<description>JVM Package for XGBoost</description>
Expand Down
4 changes: 2 additions & 2 deletions jvm-packages/xgboost4j-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
</parent>
<name>xgboost4j-example</name>
<artifactId>xgboost4j-example_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
<packaging>jar</packaging>
<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions jvm-packages/xgboost4j-flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
</parent>

<name>xgboost4j-flink</name>
<artifactId>xgboost4j-flink_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
<properties>
<flink-ml.version>2.2.0</flink-ml.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions jvm-packages/xgboost4j-gpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
</parent>
<artifactId>xgboost4j-gpu_2.12</artifactId>
<name>xgboost4j-gpu</name>
<version>2.1.3</version>
<version>2.1.4</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion jvm-packages/xgboost4j-spark-gpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
</parent>
<name>xgboost4j-spark-gpu</name>
<artifactId>xgboost4j-spark-gpu_2.12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jvm-packages/xgboost4j-spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
</parent>
<name>xgboost4j-spark</name>
<artifactId>xgboost4j-spark_2.12</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions jvm-packages/xgboost4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost-jvm_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
</parent>
<name>xgboost4j</name>
<artifactId>xgboost4j_2.12</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
<packaging>jar</packaging>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/common/hist_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "../data/gradient_index.h"
#include "hist_util.h"

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/common/hist_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "../../src/common/hist_util.h"
#include "../data/gradient_index.h"

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/common/partition_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "../data/gradient_index.h"
#include "../tree/expand_entry.h"

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/common/row_set.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "../data.h"

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/data.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

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

#include "CL/sycl.hpp"
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/data/gradient_index.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "gradient_index.h"

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/data/gradient_index.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "../data.h"
#include "../../src/common/hist_util.h"

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/device_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <unordered_map>

#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wtautological-constant-compare"
Expand Down
2 changes: 1 addition & 1 deletion plugin/sycl/objective/multiclass_obj.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "../../../src/objective/multiclass_param.h"

#include "../device_manager.h"
#include <CL/sycl.hpp>
#include <sycl/sycl.hpp>

namespace xgboost {
namespace sycl {
Expand Down
Loading