Browse code

write_block_to_sink() was replaced with write_block() in DelayedArray 0.7.15

Peter Hickey authored on 28/06/2018 16:03:26
Showing 5 changed files

... ...
@@ -28,7 +28,7 @@ Imports:
28 28
     DelayedMatrixStats (>= 1.3.1),
29 29
     permute,
30 30
     limma,
31
-    DelayedArray (>= 0.7.6),
31
+    DelayedArray (>= 0.7.15),
32 32
     Rcpp,
33 33
     BiocParallel,
34 34
     readr,
... ...
@@ -101,9 +101,12 @@ makeClusters <- function(hasGRanges, maxGap = 10^8) {
101 101
     }
102 102
     # Write to coef_sink and se.coef_sink while respecting the IPC lock.
103 103
     ipclock(sink_lock)
104
-    write_block_to_sink(as.matrix(coef), coef_sink, grid[[b]])
104
+    write_block(x = coef_sink, viewport = grid[[b]], block = as.matrix(coef))
105 105
     if (keep.se) {
106
-        write_block_to_sink(as.matrix(se.coef), se.coef_sink, grid[[b]])
106
+        write_block(
107
+            x = se.coef_sink,
108
+            viewport = grid[[b]],
109
+            block = as.matrix(se.coef))
107 110
     }
108 111
     ipcunlock(sink_lock)
109 112
     NULL
... ...
@@ -142,7 +142,7 @@ blockApplyWithRealization <- function(x, FUN, ..., sink = NULL, x_grid = NULL,
142 142
         block_ans <- FUN(block, ...)
143 143
         # NOTE: This is the only part different from DelayedArray::blockApply()
144 144
         if (!is.null(sink)) {
145
-            write_block_to_sink(block_ans, sink, sink_viewport)
145
+            write_block(x = sink, viewport = sink_viewport, block = block_ans)
146 146
             block_ans <- NULL
147 147
         }
148 148
         if (DelayedArray:::get_verbose_block_processing()) {
... ...
@@ -84,7 +84,7 @@
84 84
             x = block_x,
85 85
             x_rowRanges = block_rowRanges,
86 86
             ans_rowRanges = ans_rowRanges)
87
-        write_block_to_sink(block_ans, sink, sink_viewport)
87
+        write_block(x = sink, viewport = sink_viewport, block = block_ans)
88 88
     }
89 89
 
90 90
     as(sink, "DelayedArray")
... ...
@@ -238,8 +238,8 @@
238 238
     }
239 239
     # Write to M_sink and Cov_sink while respecting the IPC lock.
240 240
     ipclock(sink_lock)
241
-    write_block_to_sink(M, M_sink, grid[[b]])
242
-    write_block_to_sink(Cov, Cov_sink, grid[[b]])
241
+    write_block(x = M_sink, viewport = grid[[b]], block = M)
242
+    write_block(x = Cov_sink, viewport = grid[[b]], block = Cov)
243 243
     ipcunlock(sink_lock)
244 244
     NULL
245 245
 }