Skip to content

Fix ordered BatchtoolsParam iteration without reduction #288

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

Draft
LeonidasZhak wants to merge 1 commit into
base: devel
Choose a base branch
from
Draft

Fix ordered BatchtoolsParam iteration without reduction #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions R/BatchtoolsParam-class.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,6 @@ setMethod("bpiterate", c("ANY", "ANY", "BatchtoolsParam"),
FUN <- match.fun(FUN)

if (missing(REDUCE)) {
if (reduce.in.order)
stop("REDUCE must be provided when 'reduce.in.order = TRUE'")
if (!missing(init))
stop("REDUCE must be provided when 'init' is given")
}
Expand Down
13 changes: 13 additions & 0 deletions inst/unitTests/test_BatchtoolsParam.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,12 +423,25 @@ test_BatchtoolsParam_bpiterate <- function() {
target <- list(105, 205, 305, 405, 505)
checkIdentical(target, res)

## Test ordered results without REDUCE on multicore
param <- BatchtoolsParam()
res <- bpiterate(ITER=ITER(), FUN=FUN, k=5,
reduce.in.order=TRUE,
BPPARAM=param)
checkIdentical(target, res)

## socket cluster
param <- BatchtoolsParam(cluster="socket")
res <- bpiterate(ITER=ITER(), FUN=FUN, k=5, BPPARAM=param)
## Check Identical result
checkIdentical(target, res)

## Test ordered results without REDUCE on socket
res <- bpiterate(ITER=ITER(), FUN=FUN, k=5,
reduce.in.order=TRUE,
BPPARAM=param)
checkIdentical(target, res)

## Test REDUCE on socket
res <- bpiterate(ITER=ITER(), FUN=FUN, k=5,
REDUCE=`+`,
Expand Down