Skip to content

Commit 4b4c14a

Browse files
committed
Merge remote-tracking branch 'origin/master' into test_latest_rapids
2 parents f33ee3b + 0b67a40 commit 4b4c14a

File tree

152 files changed

+2592
-1167
lines changed

Some content is hidden

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

152 files changed

+2592
-1167
lines changed

.github/runs-on.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ runners:
2222
cpu: 16
2323
family: ["c7i-flex", "c7i", "c7a", "c5", "c5a"]
2424
image: linux-amd64
25+
spot: "false"
2526
linux-amd64-gpu:
2627
family: ["g4dn.xlarge"]
2728
image: linux-amd64
@@ -34,6 +35,7 @@ runners:
3435
cpu: 16
3536
family: ["c6g", "c7g"]
3637
image: linux-arm64
38+
spot: "false"
3739
windows-gpu:
3840
family: ["g4dn.2xlarge"]
3941
image: windows-amd64
@@ -42,3 +44,4 @@ runners:
4244
cpu: 32
4345
family: ["c7i-flex", "c7i", "c7a", "c5", "c5a"]
4446
image: windows-amd64
47+
spot: "false"

.github/workflows/jvm_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ jobs:
149149
uses: actions/cache@v4
150150
with:
151151
path: ~/.m2
152-
key: ${{ runner.os }}-m2-${{ hashFiles('./jvm-packages/pom.xml') }}
153-
restore-keys: ${{ runner.os }}-m2-${{ hashFiles('./jvm-packages/pom.xml') }}
152+
key: ${{ runner.os }}-m2-${{ hashFiles('/jvm-packages/pom.xml') }}
153+
restore-keys: ${{ runner.os }}-m2-${{ hashFiles('/jvm-packages/pom.xml') }}
154154
- name: Test XGBoost4J (Core) on macos
155155
if: matrix.os == 'macos-15-intel'
156156
run: |

R-package/R/utils.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ xgb.createFolds <- function(y, k) {
482482
#' \url{https://xgboost.readthedocs.io/en/latest/tutorials/saving_model.html}.
483483
#'
484484
#' @examples
485+
#' \dontshow{RhpcBLASctl::omp_set_num_threads(1)}
485486
#' data(agaricus.train, package = "xgboost")
486487
#'
487488
#' bst <- xgb.train(

R-package/R/xgb.Booster.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ xgb.get.handle <- function(object) {
252252
#' \url{https://arxiv.org/abs/1706.06060}
253253
#'
254254
#' @examples
255+
#' \dontshow{RhpcBLASctl::omp_set_num_threads(1)}
255256
#' ## binary classification:
256257
#'
257258
#' data(agaricus.train, package = "xgboost")

R-package/R/xgb.DMatrix.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,9 @@ setinfo.xgb.DMatrix <- function(object, name, info) {
10631063
if (name == "label") {
10641064
if (NROW(info) != nrow(object))
10651065
stop("The length of labels must equal to the number of rows in the input data")
1066+
if (is.factor(info)) {
1067+
stop("'label' must be a numeric variable.")
1068+
}
10661069
.Call(XGDMatrixSetInfo_R, object, name, info)
10671070
return(TRUE)
10681071
}

R-package/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3353,7 +3353,7 @@ fi
33533353

33543354
ac_config_files="$ac_config_files src/Makevars"
33553355

3356-
ac_config_headers="$ac_config_headers config.h"
3356+
ac_config_headers="$ac_config_headers src/config.h"
33573357

33583358
cat >confcache <<\_ACEOF
33593359
# This file is a shell script that caches the results of configure
@@ -4041,7 +4041,7 @@ for ac_config_target in $ac_config_targets
40414041
do
40424042
case $ac_config_target in
40434043
"src/Makevars") CONFIG_FILES="$CONFIG_FILES src/Makevars" ;;
4044-
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
4044+
"src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
40454045
40464046
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
40474047
esac

R-package/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,5 @@ AC_SUBST(BACKTRACE_LIB)
122122
AC_SUBST(XGBOOST_BUILTIN_PREFETCH_PRESENT)
123123
AC_SUBST(XGBOOST_MM_PREFETCH_PRESENT)
124124
AC_CONFIG_FILES([src/Makevars])
125-
AC_CONFIG_HEADERS([config.h])
125+
AC_CONFIG_HEADERS([src/config.h])
126126
AC_OUTPUT

R-package/man/a-compatibility-note-for-saveRDS-save.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

R-package/man/predict.xgb.Booster.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

R-package/config.h.in renamed to R-package/src/config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* config.h.in. Generated from configure.ac by autoheader. */
1+
/* src/config.h.in. Generated from configure.ac by autoheader. */
22

33
/* Define if building universal (internal helper macro) */
44
#undef AC_APPLE_UNIVERSAL_BUILD

0 commit comments

Comments
 (0)