Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[R] Fix CRAN error for Mac OS X (#4672)

Browse Source 
* fix cran error for mac os x

* ignore float on windows check for now
This commit is contained in:
Tong He 2019-07-17 17:55:52 -07:00 committed by GitHub
parent 1595e3f57b
commit 8ac8fbef29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
R-package/DESCRIPTION
View File

@ -52,7 +52,9 @@ Suggests:
vcd (>= 1.3), vcd (>= 1.3),
testthat, testthat,
lintr, lintr,
igraph (>= 1.0.1) igraph (>= 1.0.1),
jsonlite,
float
Depends: Depends:
R (>= 3.3.0) R (>= 3.3.0)
Imports: Imports:

1
R-package/cleanup
View File

@ -1,3 +1,4 @@
#!/bin/sh #!/bin/sh
rm -f src/Makevars rm -f src/Makevars
rm -f CMakeLists.txt

2
R-package/tests/testthat/test_callbacks.R
View File

@ -236,7 +236,7 @@ test_that("early stopping using a specific metric works", {
expect_equal(length(pred), 1611) expect_equal(length(pred), 1611)
logloss_pred <- sum(-ltest * log(pred) - (1 - ltest) * log(1 - pred)) / length(ltest) logloss_pred <- sum(-ltest * log(pred) - (1 - ltest) * log(1 - pred)) / length(ltest)
logloss_log <- bst$evaluation_log[bst$best_iteration, test_logloss] logloss_log <- bst$evaluation_log[bst$best_iteration, test_logloss]
expect_equal(logloss_log, logloss_pred, tolerance = 5e-6) expect_equal(logloss_log, logloss_pred, tolerance = 1e-5)
}) })
test_that("early stopping xgb.cv works", { test_that("early stopping xgb.cv works", {

2
R-package/vignettes/xgboostfromJSON.Rmd
View File

@ -70,7 +70,7 @@ First let's dump the model to JSON:
```{r} ```{r}
bst_json <- xgb.dump(bst, with_stats = FALSE, dump_format='json') bst_json <- xgb.dump(bst, with_stats = FALSE, dump_format='json')
bst_from_json <- jsonlite::fromJSON(bst_json, simplifyDataFrame = FALSE) bst_from_json <- fromJSON(bst_json, simplifyDataFrame = FALSE)
node <- bst_from_json[[1]] node <- bst_from_json[[1]]
cat(bst_json) cat(bst_json)
``` ```

1
appveyor.yml
View File

@ -106,6 +106,7 @@ test_script:
# mingw R package: run the R check (which includes unit tests), and also keep the built binary package # mingw R package: run the R check (which includes unit tests), and also keep the built binary package
- if /i "%target%" == "rmingw" ( - if /i "%target%" == "rmingw" (
set _R_CHECK_CRAN_INCOMING_=FALSE&& set _R_CHECK_CRAN_INCOMING_=FALSE&&
set _R_CHECK_FORCE_SUGGESTS_=FALSE&&
R.exe CMD check xgboost*.tar.gz --no-manual --no-build-vignettes --as-cran --install-args=--build R.exe CMD check xgboost*.tar.gz --no-manual --no-build-vignettes --as-cran --install-args=--build
) )
# MSVC R package: run only the unit tests # MSVC R package: run only the unit tests