From 61cc6f07e07423b9bd325bd322df27513473bef3 Mon Sep 17 00:00:00 2001 From: Nicolau Manubens Date: Mon, 19 Nov 2018 18:19:45 +0100 Subject: [PATCH] Updated multiApply to v2.0.0. --- DESCRIPTION | 2 +- R/ByChunks.R | 2 +- inst/chunking/load_process_save_chunk.R | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4a54654..a7bdd2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,7 +11,7 @@ Imports: abind, bigmemory, future, - multiApply, + multiApply (>= 2.0.0), parallel Suggests: easyNCDF, diff --git a/R/ByChunks.R b/R/ByChunks.R index 6b4fd07..c43f4d1 100644 --- a/R/ByChunks.R +++ b/R/ByChunks.R @@ -624,7 +624,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', t_begin_compute <- Sys.time() result <- multiApply::Apply(data, target_dims = attr(step_fun, 'TargetDims'), - AtomicFun = step_fun, ..., + fun = step_fun, ..., output_dims = attr(step_fun, 'OutputDims'), ncores = threads_compute) if (!found_first_result) { diff --git a/inst/chunking/load_process_save_chunk.R b/inst/chunking/load_process_save_chunk.R index 5606b00..c552aa2 100644 --- a/inst/chunking/load_process_save_chunk.R +++ b/inst/chunking/load_process_save_chunk.R @@ -81,7 +81,7 @@ res <- do.call("Apply", c( list(data, target_dims = attr(fun, 'TargetDims'), - AtomicFun = fun, + fun = fun, output_dims = attr(fun, 'OutputDims'), ncores = threads_compute), params -- GitLab