From d94bbae2d4f0d1cddfb8d508c450b629686a42d8 Mon Sep 17 00:00:00 2001 From: nperez Date: Fri, 21 Aug 2020 10:09:58 +0200 Subject: [PATCH 1/4] .chunk is to be found in startR --- inst/chunking/load_process_save_chunk.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/chunking/load_process_save_chunk.R b/inst/chunking/load_process_save_chunk.R index c50c79b..e68b869 100644 --- a/inst/chunking/load_process_save_chunk.R +++ b/inst/chunking/load_process_save_chunk.R @@ -52,7 +52,7 @@ for (input in 1:length(data)) { split_dims_to_alter <- which(names(split_dims[[k]]) %in% names_dims_to_alter) chunks_split_dims[split_dims_to_alter] <- unlist(chunks[names(split_dims[[k]])[split_dims_to_alter]]) chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] - start_call[[names(split_dims)[k]]] <- .chunk(chunks_indices_split_dims, chunks_split_dims, + start_call[[names(split_dims)[k]]] <- startR:::.chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { @@ -63,7 +63,7 @@ for (input in 1:length(data)) { } if (length(dims_to_alter) > 0) { for (call_dim in names_dims_to_alter) { - start_call[[call_dim]] <- .chunk(chunk_indices[call_dim], chunks[[call_dim]], + start_call[[call_dim]] <- startR:::.chunk(chunk_indices[call_dim], chunks[[call_dim]], eval(start_call[[call_dim]])) } } -- GitLab From f9c573a80da982a09e58a354b8856111ddc604cc Mon Sep 17 00:00:00 2001 From: aho Date: Fri, 21 Aug 2020 10:31:03 +0200 Subject: [PATCH 2/4] Rename .chunk() back to chunk() --- R/ByChunks.R | 4 ++-- R/Utils.R | 2 +- inst/chunking/load_process_save_chunk.R | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/ByChunks.R b/R/ByChunks.R index 5f0bba5..1aa2ac5 100644 --- a/R/ByChunks.R +++ b/R/ByChunks.R @@ -691,7 +691,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', split_dims_to_alter <- which(names(split_dims[[k]]) %in% names_dims_to_alter) chunks_split_dims[split_dims_to_alter] <- unlist(chunks[names(split_dims[[k]])[split_dims_to_alter]]) chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] - start_call[[names(split_dims)[k]]] <- .chunk(chunks_indices_split_dims, chunks_split_dims, + start_call[[names(split_dims)[k]]] <- chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { @@ -704,7 +704,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', if (length(dims_to_alter) > 0) { for (call_dim in names(attr(start_call, 'Dimensions'))[dims_to_alter]) { - start_call[[call_dim]] <- .chunk(chunk_indices[call_dim], chunks[[call_dim]], + start_call[[call_dim]] <- chunk(chunk_indices[call_dim], chunks[[call_dim]], eval(start_call[[call_dim]])) } } diff --git a/R/Utils.R b/R/Utils.R index a4255c1..c690539 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -1,6 +1,6 @@ #'@import abind #'@importFrom ClimProjDiags Subset -.chunk <- function(chunk, n_chunks, selectors) { +chunk <- function(chunk, n_chunks, selectors) { if (any(chunk > n_chunks)) { stop("Requested chunk index out of bounds.") } diff --git a/inst/chunking/load_process_save_chunk.R b/inst/chunking/load_process_save_chunk.R index e68b869..a8a31a8 100644 --- a/inst/chunking/load_process_save_chunk.R +++ b/inst/chunking/load_process_save_chunk.R @@ -52,7 +52,7 @@ for (input in 1:length(data)) { split_dims_to_alter <- which(names(split_dims[[k]]) %in% names_dims_to_alter) chunks_split_dims[split_dims_to_alter] <- unlist(chunks[names(split_dims[[k]])[split_dims_to_alter]]) chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] - start_call[[names(split_dims)[k]]] <- startR:::.chunk(chunks_indices_split_dims, chunks_split_dims, + start_call[[names(split_dims)[k]]] <- chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { @@ -63,7 +63,7 @@ for (input in 1:length(data)) { } if (length(dims_to_alter) > 0) { for (call_dim in names_dims_to_alter) { - start_call[[call_dim]] <- startR:::.chunk(chunk_indices[call_dim], chunks[[call_dim]], + start_call[[call_dim]] <- chunk(chunk_indices[call_dim], chunks[[call_dim]], eval(start_call[[call_dim]])) } } -- GitLab From ce26022cbfdca602ab6e5c061dc488bb515d8cc2 Mon Sep 17 00:00:00 2001 From: aho Date: Fri, 21 Aug 2020 10:37:48 +0200 Subject: [PATCH 3/4] export chunk.R --- NAMESPACE | 1 + R/Utils.R | 1 + 2 files changed, 2 insertions(+) diff --git a/NAMESPACE b/NAMESPACE index a3ad75f..d1f23a1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -14,6 +14,7 @@ export(SelectorChecker) export(Sort) export(Start) export(Step) +export(chunk) export(indices) export(values) import(abind) diff --git a/R/Utils.R b/R/Utils.R index c690539..7a42afd 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -1,5 +1,6 @@ #'@import abind #'@importFrom ClimProjDiags Subset +#'@export chunk <- function(chunk, n_chunks, selectors) { if (any(chunk > n_chunks)) { stop("Requested chunk index out of bounds.") -- GitLab From 578ee055eace3046787eb22333b57ab248e61eb1 Mon Sep 17 00:00:00 2001 From: aho Date: Fri, 21 Aug 2020 10:52:06 +0200 Subject: [PATCH 4/4] Try adding startR:: before chunk() --- inst/chunking/load_process_save_chunk.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/chunking/load_process_save_chunk.R b/inst/chunking/load_process_save_chunk.R index a8a31a8..82d452c 100644 --- a/inst/chunking/load_process_save_chunk.R +++ b/inst/chunking/load_process_save_chunk.R @@ -52,7 +52,7 @@ for (input in 1:length(data)) { split_dims_to_alter <- which(names(split_dims[[k]]) %in% names_dims_to_alter) chunks_split_dims[split_dims_to_alter] <- unlist(chunks[names(split_dims[[k]])[split_dims_to_alter]]) chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] - start_call[[names(split_dims)[k]]] <- chunk(chunks_indices_split_dims, chunks_split_dims, + start_call[[names(split_dims)[k]]] <- startR::chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { @@ -63,7 +63,7 @@ for (input in 1:length(data)) { } if (length(dims_to_alter) > 0) { for (call_dim in names_dims_to_alter) { - start_call[[call_dim]] <- chunk(chunk_indices[call_dim], chunks[[call_dim]], + start_call[[call_dim]] <- startR::chunk(chunk_indices[call_dim], chunks[[call_dim]], eval(start_call[[call_dim]])) } } -- GitLab