Skip to content
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.

Sign up for GitHub

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

fix model fit for spark tbls #1047

Merged
merged 3 commits into from
Jan 17, 2024
Merged

fix model fit for spark tbls #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d12ee60
fix model fit for spark tbls
simonpcouch Jan 16, 2024
cb66545
merge upstream
simonpcouch Jan 16, 2024
f27f0bb
Merge branch 'main' into spark-1045
simonpcouch Jan 17, 2024
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: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# parsnip (development version)

* Fixed bug in fitting some model types with the `"spark"` engine (#1045).

* Fixed issue in `mlp()` metadata where the `stop_iter` engine argument had been mistakenly protected for the `"brulee"` engine. (#1050)

* `.filter_eval_time()` was moved to the survival standalone file.
Expand Down
10 changes: 9 additions & 1 deletion R/arguments.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,11 @@ min_cols <- function(num_cols, source) {
#' @export
#' @rdname min_cols
min_rows <- function(num_rows, source, offset = 0) {
n <- nrow(source)
if (inherits(source, "tbl_spark")) {
n <- nrow_spark(source)
} else {
n <- nrow(source)
}

if (num_rows > n - offset) {
msg <- paste0(num_rows, " samples were requested but there were ", n,
Expand All @@ -340,3 +344,7 @@ min_rows <- function(num_rows, source, offset = 0) {
as.integer(num_rows)
}

nrow_spark <- function(source) {
rlang::check_installed("sparklyr")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that sparklyr is a parsnip Suggests. :)

sparklyr::sdf_nrow(source)
}
7 changes: 7 additions & 0 deletions tests/testthat/test_boost_tree.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ test_that('bad input', {
## -----------------------------------------------------------------------------

test_that('argument checks for data dimensions', {
skip_if_not_installed("sparklyr")
library(sparklyr)
skip_if(nrow(spark_installed_versions()) == 0)

spec <-
boost_tree(mtry = 1000, min_n = 1000, trees = 5) %>%
Expand All @@ -36,6 +39,10 @@ test_that('argument checks for data dimensions', {

args <- translate(spec)$method$fit$args
expect_equal(args$min_instances_per_node, expr(min_rows(1000, x)))

sc = spark_connect(master = "local")
cars = copy_to(sc, mtcars, overwrite = TRUE)
expect_equal(min_rows(10, cars), 10)
})

test_that('boost_tree can be fit with 1 predictor if validation is used', {
Expand Down
Loading