Skip to content

Commit 210c51b

Browse files
committed
[backport][R] Fix winbuilder check warnings. (#11830)
1 parent dff3968 commit 210c51b

File tree

11 files changed

+28
-15
lines changed

11 files changed

+28
-15
lines changed

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/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

R-package/src/init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ extern SEXP XGDMatrixCreateFromDF_R(SEXP, SEXP, SEXP);
5858
extern SEXP XGDMatrixGetStrFeatureInfo_R(SEXP, SEXP);
5959
extern SEXP XGDMatrixNumCol_R(SEXP);
6060
extern SEXP XGDMatrixNumRow_R(SEXP);
61-
extern SEXP XGProxyDMatrixCreate_R();
61+
extern SEXP XGProxyDMatrixCreate_R(void);
6262
extern SEXP XGProxyDMatrixSetDataDense_R(SEXP, SEXP);
6363
extern SEXP XGProxyDMatrixSetDataCSR_R(SEXP, SEXP);
6464
extern SEXP XGProxyDMatrixSetDataColumnar_R(SEXP, SEXP);
6565
extern SEXP XGDMatrixCreateFromCallback_R(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
6666
extern SEXP XGQuantileDMatrixCreateFromCallback_R(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
6767
extern SEXP XGDMatrixFree_R(SEXP);
68-
extern SEXP XGGetRNAIntAsDouble();
68+
extern SEXP XGGetRNAIntAsDouble(void);
6969
extern SEXP XGDMatrixGetQuantileCut_R(SEXP);
7070
extern SEXP XGDMatrixNumNonMissing_R(SEXP);
7171
extern SEXP XGDMatrixGetDataAsCSR_R(SEXP);

ops/script/test_r_package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def pkgroot(path: str) -> None:
4848
)
4949

5050
shutil.copytree("R-package", dest)
51+
os.remove(dest / "bootstrap.R")
5152
# core
5253
shutil.copytree("src", dest / "src" / "src")
5354
shutil.copytree("include", dest / "src" / "include")

src/data/sparse_page_source.cc

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/**
2-
* Copyright 2021-2024, XGBoost Contributors
2+
* Copyright 2021-2025, XGBoost Contributors
33
*/
44
#include "sparse_page_source.h"
55

6-
#include <cstdio> // for remove
7-
#include <filesystem> // for exists
8-
#include <numeric> // for partial_sum
9-
#include <string> // for string
6+
#include <cstdio> // for remove
7+
#include <filesystem> // for exists, path, is_directory
8+
#include <numeric> // for partial_sum
9+
#include <string> // for string
10+
#include <string_view> // for string_view
1011

1112
#include "../collective/communicator-inl.h" // for IsDistributed, GetRank
1213

@@ -31,7 +32,13 @@ void TryDeleteCacheFile(const std::string& file) {
3132
}
3233

3334
std::string MakeCachePrefix(std::string cache_prefix) {
34-
cache_prefix = cache_prefix.empty() ? "DMatrix" : cache_prefix;
35+
std::string_view constexpr kDftname{"DMatrix"};
36+
cache_prefix = cache_prefix.empty() ? kDftname : cache_prefix;
37+
// Use the directory if one exists
38+
if (std::filesystem::is_directory(cache_prefix)) {
39+
cache_prefix = (std::filesystem::path{cache_prefix} / kDftname).string(); // NOLINT
40+
}
41+
// Avoid conflicts in distributed environments.
3542
if (collective::IsDistributed()) {
3643
cache_prefix += ("-r" + std::to_string(collective::GetRank()));
3744
}

0 commit comments

Comments
 (0)