-
-
Notifications
You must be signed in to change notification settings - Fork 35
Upgrade to XGBoost 2.1.0 #167
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
Changes from 79 commits
Commits
Show all changes
123 commits
Select commit
Hold shift + click to select a range
41956de
Upgrade to XGBoost 2.1.0
hcho3 f01972f
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
8cd97b9
Drop `rabit` install
jakirkham eee9c0e
List source directory contents before copying
jakirkham 7a47d9b
Remove CLI
hcho3 aa2382d
Fix buildno
hcho3 0cb0928
Require R 4.3+
hcho3 ffa745d
Require cross-r-base 4.3
hcho3 c875ff1
Consistently require R 4.3
hcho3 800bdbd
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and co…
hcho3 f4e8edd
Use evals instead of watchlist
hcho3 f1337b5
Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-f…
hcho3 e40c7a7
Merge remote-tracking branch 'origin/main' into xgb_210
hcho3 6ed6754
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and co…
hcho3 485748e
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and co…
hcho3 aab8872
Drop extra `conda_*`s from `conda-forge.yml`
jakirkham abd6f77
Merge branch 'main' into xgb_210
hcho3 c2290b5
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and co…
hcho3 e903154
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and co…
25fb6fb
Add `pin_subpackage` in `host` & `run`
jakirkham 57f1b1b
Ignore missing `ld64.so.2` linkage on `ppc64le`
jakirkham e3b4ef4
Require R 4.3+
jakirkham 702135d
Drop outdated CUDA skip (min is 11.8)
jakirkham 866c306
Move R skip into relevant packages
jakirkham e16c795
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and co…
7eb2411
Add MinGW compilers to top-level
jakirkham 0879870
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and co…
b524aed
Exclude R 3.4
hcho3 778a482
Explicitly skip windows for R
hcho3 e23f853
Use True instead of true
hcho3 2ea37be
Skip CUDA 11.8 for Windows
hcho3 8a7d594
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.1, and co…
hcho3 8120e40
Add missing_dso_whitelist for R package specifically
hcho3 0bef94b
Relax exact pins to `x.x.x`
jakirkham ca09d1c
Revert "Relax exact pins to `x.x.x`"
jakirkham e427580
Test `libxgboost` library is installed
jakirkham 80f2456
Test `xgboost` can be `import`ed
jakirkham 9e3a2c2
Add mutex no-op tests
jakirkham e2fa757
Add Python `import` tests
jakirkham fc11ee2
Add R equivalent of `import` tests
jakirkham 0d72bbe
Fix Windows `libxgboost` tests
jakirkham fd3194c
Use `PREFIX` in Windows `libxgboost` tests
jakirkham e381bfa
Test MinGW path for `libxgboost` on Windows
jakirkham 4b15964
Try Windows CUDA 11.8 again
jakirkham bda415f
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
bde32c5
Skip NVCC Windows environment activation
jakirkham 9d2eadf
Revert "Skip NVCC Windows environment activation"
jakirkham 98d8ba2
Lower case `not` in `bld.bat`
jakirkham a3eec4d
Space out `==` in `bld.bat`
jakirkham 16938dd
Pass `WIN32_LEAN_AND_MEAN` on CUDA 11.8
jakirkham 5cae8ef
Pass `WIN32_LEAN_AND_MEAN` to `nvcc` directly
jakirkham 114cce3
Try `-D` instead of `/D`
jakirkham 8b1604a
Use `CXXFLAGS` on Windows
jakirkham 1979c78
Use cross-python more consistently
jakirkham f12967a
Drop extra space
jakirkham 23ba9f3
Use `python` instead of env var
jakirkham 1487cfb
Move `test/script` after `test/imports`
jakirkham 4ecdf2f
Require Python 3.8+
jakirkham 297ec13
Drop cross-python throughout
jakirkham 0e90c76
Explicitly require Python & R in respective tests
jakirkham 6c4122d
Add `WIN32_LEAN_AND_MEAN` to nvcc flags too
jakirkham c91ed93
Revert to `PYTHON` env var
jakirkham 170d9c4
Add `CUDAFLAGS` on Windows too
jakirkham 0a70b12
Fix Windows CUDA 11.8 check
jakirkham 80e51a2
Use only `CUDAFLAGS` to set `WIN32_LEAN_AND_MEAN`
jakirkham eba7c96
Add mutex packages first
jakirkham c637e5f
Run test script on native builds only
jakirkham 1edd47f
Add `@echo on` to `bld.bat`
jakirkham c964dd4
Drop unneeded quotes in `bld.bat`
jakirkham 232b659
Type CMake args in `bld.bat`
jakirkham e0a5290
Drop selector from test script
jakirkham ab0501d
Test native builds only
jakirkham a2aaad4
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
7e2ccd0
Readd `cross-python` for building
jakirkham f705ae1
Use `cccl` to build `libxgboost`
jakirkham f8422de
Drop Windows CUDA 11.8 workaround
jakirkham e0b67b8
Drop commented Windows CUDA 11.8 `skip`
jakirkham 0d4897a
Add top-level `noarch: python` to disable matrix
jakirkham 1b47b51
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
c067944
Apply patch dmlc/xgboost#10624
hcho3 847d066
Update patch
hcho3 21f1c9d
Move `cccl` to `host`
jakirkham f15daa3
Refresh XGBoost CCCL patch
jakirkham 8fa589d
Squash patch
hcho3 d685506
Remove outdated CMake option
hcho3 dafc853
Remove install targets
jakirkham c9a3ae9
Switch to using source tarball
jakirkham a466561
Fix patch header
jakirkham e9521db
Fix patch format
jakirkham c08b35c
Update patch
hcho3 ad7fd0d
Show build command on Win
hcho3 5599b57
missing --
hcho3 0622240
Remove /m
hcho3 660f31a
Use -v
hcho3 3a77d97
Update patch
hcho3 5bee750
Fix lint
hcho3 bd7aa65
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.1, and co…
hcho3 fd2bca9
Revert "MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.1…
hcho3 3b96b9e
Revert "Fix lint"
hcho3 e971233
Add back CUDA include path, but as SYSTEM
hcho3 0350fc8
Set min Python once and fix lint
jakirkham a89803e
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
82d28a3
Try `AFTER` with CTK includes
jakirkham 0e0eb0d
Use CMake interface target with CCCL & CTK
jakirkham b07a9f2
Consolidate patches into a directory
jakirkham f7f1fce
Link `CUDA::cudart_static` instead
jakirkham 29250fa
Allow building with CCCL that's newer than CTK
hcho3 cc02f33
Exclude 2.4.0, 2.5.0 versions of CCCL
hcho3 bc5fec0
Update patches
hcho3 98aa52a
Switch to VS 2022
jakirkham 5a42d4a
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
25340c1
Downgrade to VS 2017
jakirkham e28655b
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
0229049
Revert `conda_build_config.yaml`
jakirkham 1249f1c
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
d46872a
On Windows, set `__cplusplus` to C++ standard
jakirkham 2ad8f99
Add Microsoft links to `/Zc:__cplusplus` comment
jakirkham 2bc4e87
Link Microsoft blog on `/Zc:__cplusplus`
jakirkham 1f90186
Pass `/Zc:__cplusplus` from `nvcc` to `cl`
jakirkham f7636eb
Update recipe/meta.yaml
hcho3 72e01f3
Drop Windows `__cplusplus` workaround
jakirkham f0e8fc3
Try bringing back `noarch: python`
hcho3 0349fc6
Tidy up patches
hcho3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,4 +18,4 @@ os_version: | |
| provider: | ||
| linux_aarch64: default | ||
| linux_ppc64le: default | ||
| test: native_and_emulated | ||
| test: native | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| From 59ac1090da5ba692238f4baf87d46a4c81b9282c Mon Sep 17 00:00:00 2001 | ||
| From: Hyunsu Cho <[email protected]> | ||
| Date: Wed, 1 Nov 2023 01:01:34 -0700 | ||
| From 7bb7bd609859057f80576fc156f4b3e19218a671 Mon Sep 17 00:00:00 2001 | ||
| From: Hyunsu Cho <[email protected]> | ||
| Date: Fri, 28 Jun 2024 17:40:28 -0700 | ||
| Subject: [PATCH] Enable latest libcxx on MacOS | ||
|
|
||
| --- | ||
| R-package/src/Makevars.in | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| R-package/src/Makevars.in | 3 ++- | ||
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/R-package/src/Makevars.in b/R-package/src/Makevars.in | ||
| index 9e7cbfed..8b3af0ae 100644 | ||
| index 93cfb8e5b..e24cfed93 100644 | ||
| --- a/R-package/src/Makevars.in | ||
| +++ b/R-package/src/Makevars.in | ||
| @@ -7,7 +7,7 @@ CXX_STD = CXX17 | ||
|
|
||
| XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\ | ||
| -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\ | ||
| - -DDMLC_LOG_CUSTOMIZE=1 | ||
| + -DDMLC_LOG_CUSTOMIZE=1 -D_LIBCPP_DISABLE_AVAILABILITY | ||
| @@ -10,7 +10,8 @@ XGB_RFLAGS = \ | ||
| -DDMLC_LOG_BEFORE_THROW=0 \ | ||
| -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) \ | ||
| -DDMLC_DISABLE_STDIN=1 \ | ||
| - -DDMLC_LOG_CUSTOMIZE=1 | ||
| + -DDMLC_LOG_CUSTOMIZE=1 \ | ||
| + -D_LIBCPP_DISABLE_AVAILABILITY | ||
|
|
||
| # disable the use of thread_local for 32 bit windows: | ||
| ifeq ($(R_OSTYPE)$(WIN),windows) | ||
| -- | ||
| 2.25.1 | ||
| 2.34.1 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| From 667a855dfa024ea392e60fa7f352a0781cb7f1e0 Mon Sep 17 00:00:00 2001 | ||
| From: Hyunsu Cho <[email protected]> | ||
| Date: Thu, 2 Nov 2023 08:12:43 -0700 | ||
| Subject: [PATCH] Undo dmlc/xgboost#9436 | ||
| From 3660a4216763d02d48cb1db63f5fee7ad02ad7d4 Mon Sep 17 00:00:00 2001 | ||
| From: Hyunsu Cho <[email protected]> | ||
| Date: Fri, 28 Jun 2024 17:38:34 -0700 | ||
| Subject: [PATCH] [PATCH] Undo dmlc/xgboost#9436 | ||
|
|
||
| --- | ||
| CMakeLists.txt | 9 --------- | ||
| cmake/Utils.cmake | 4 +--- | ||
| 2 files changed, 1 insertion(+), 12 deletions(-) | ||
| cmake/Utils.cmake | 1 - | ||
| 2 files changed, 10 deletions(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index d6b861ab..ca0125cb 100644 | ||
| index c4ca82937..dc0f7e654 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -253,15 +253,6 @@ add_subdirectory(${xgboost_SOURCE_DIR}/plugin) | ||
| @@ -301,15 +301,6 @@ add_subdirectory(${xgboost_SOURCE_DIR}/plugin) | ||
|
|
||
| if (PLUGIN_RMM) | ||
| if(PLUGIN_RMM) | ||
| find_package(rmm REQUIRED) | ||
| - | ||
| - # Patch the rmm targets so they reference the static cudart | ||
|
|
@@ -25,31 +25,21 @@ index d6b861ab..ca0125cb 100644 | |
| - 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 (PLUGIN_RMM) | ||
| endif() | ||
|
|
||
| #-- library | ||
| if(PLUGIN_SYCL) | ||
| diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake | ||
| index 08050205..98e96e30 100644 | ||
| index d555f5edf..8659df7c3 100644 | ||
| --- a/cmake/Utils.cmake | ||
| +++ b/cmake/Utils.cmake | ||
| @@ -177,8 +177,7 @@ function(xgboost_set_cuda_flags target) | ||
| set_target_properties(${target} PROPERTIES | ||
| CUDA_STANDARD 17 | ||
| CUDA_STANDARD_REQUIRED ON | ||
| - CUDA_SEPARABLE_COMPILATION OFF | ||
| - CUDA_RUNTIME_LIBRARY Static) | ||
| + CUDA_SEPARABLE_COMPILATION OFF) | ||
| endfunction(xgboost_set_cuda_flags) | ||
| @@ -240,7 +240,6 @@ macro(xgboost_target_link_libraries target) | ||
|
|
||
| macro(xgboost_link_nccl target) | ||
| @@ -280,7 +279,6 @@ macro(xgboost_target_link_libraries target) | ||
|
|
||
| if (USE_CUDA) | ||
| if(USE_CUDA) | ||
| xgboost_set_cuda_flags(${target}) | ||
| - target_link_libraries(${target} PUBLIC CUDA::cudart_static) | ||
| endif (USE_CUDA) | ||
| endif() | ||
|
|
||
| if (PLUGIN_RMM) | ||
| if(PLUGIN_RMM) | ||
| -- | ||
| 2.25.1 | ||
| 2.34.1 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #!/bin/bash | ||
|
|
||
| pushd ${SRC_DIR}/python-package | ||
| ${PYTHON} -m pip install . -vv --config-settings use_system_libxgboost=True | ||
| ${PYTHON} -m pip install . -vv --config-settings use_system_libxgboost=True | ||
| popd |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.