Skip to content

Commit 37a9dcd

Browse files
committed
Switch to logger.info()
1 parent b8cadfe commit 37a9dcd

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

singlecell/resources/chunks/MergeSeurat.R

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ doDiet <- exists('doDiet') && doDiet
33
mergeBatch <- function(dat) {
44
toMerge <- list()
55
for (datasetId in names(dat)) {
6-
message(paste0('Loading: ', datasetId))
6+
logger::log_info(paste0('Loading: ', datasetId))
77
if (doDiet) {
88
toMerge[[datasetId]] <- Seurat::DietSeurat(readSeuratRDS(dat[[datasetId]]))
99
gc()
@@ -36,40 +36,40 @@ if (length(seuratObjects) == 1) {
3636
numBatches <- ceiling(length(seuratObjects) / batchSize)
3737
mergedObjectFiles <- list()
3838
for (i in 1:numBatches) {
39-
message(paste0('Merging batch ', i, ' of ', numBatches))
39+
logger::log_info(paste0('Merging batch ', i, ' of ', numBatches))
4040
start <- 1 + (i-1)*batchSize
4141
end <- min(start+batchSize-1, length(seuratObjects))
42-
message(paste0('processing: ', start, ' to ', end, ' of ', length(seuratObjects)))
42+
logger::log_info(paste0('processing: ', start, ' to ', end, ' of ', length(seuratObjects)))
4343

4444
fn <- paste0('mergeBatch.', i, '.rds')
4545
saveRDS(mergeBatch(seuratObjects[start:end]), file = fn)
4646
mergedObjectFiles[[i]] <- fn
4747

48-
print('mem used:')
49-
print(pryr::mem_used())
48+
logger::log_info('mem used:')
49+
logger::log_info(pryr::mem_used())
5050
gc()
5151
}
5252

53-
print('Done with batches')
53+
logger::log_info('Done with batches')
5454
if (length(mergedObjectFiles) == 1) {
5555
seuratObj <- readRDS(mergedObjectFiles[[1]])
5656
unlink(mergedObjectFiles[[1]])
5757
} else {
58-
message('performing final merge')
58+
logger::log_info('performing final merge')
5959
seuratObj <- readRDS(mergedObjectFiles[[1]])
6060
unlink(mergedObjectFiles[[1]])
6161

6262
for (i in 2:length(mergedObjectFiles)) {
63-
print(paste0('Merging final file ', i, ' of ', length(mergedObjectFiles)))
63+
logger::log_info(paste0('Merging final file ', i, ' of ', length(mergedObjectFiles)))
6464
seuratObj <- merge(x = seuratObj, y = readRDS(mergedObjectFiles[[i]]), project = seuratObj@project.name)
6565
if (HasSplitLayers(seuratObj)) {
6666
seuratObj <- MergeSplitLayers(seuratObj)
6767
}
6868

6969
unlink(mergedObjectFiles[[i]])
7070

71-
print('mem used:')
72-
print(pryr::mem_used())
71+
logger::log_info(paste0('mem used after merge batch ' , i , ' of ', length(mergedObjectFiles)))
72+
logger::log_info(pryr::mem_used())
7373
gc()
7474
}
7575
}

0 commit comments

Comments
 (0)