Integrated PR #29: use all.tests=TRUE for detecting number of cores o…

…n OpenBSD

R/nmf.R

@@ -1468,7 +1468,7 @@ function(x, rank, method
 								," [version ", getDoParVersion(),"]")
 				# show number of processes
 				if( getDoParWorkers() == 1 ) message("Mode: sequential [foreach:",getDoParName(),"]")
-				else message("Mode: parallel ", str_c("(", getDoParWorkers(), '/', parallel::detectCores()," core(s))"))
+				else message("Mode: parallel ", str_c("(", getDoParWorkers(), '/', getAllCores()," core(s))"))
 			}
 
 			# check shared memory capability

R/options.R

@@ -78,7 +78,7 @@ NULL
 	, gc=50
 	# define default parallel backend 
 	, parallel.backend= option_symlink('pbackend') # for backward compatibility
-	, pbackend= if( parallel::detectCores() > 1 ) 'par' else 'seq'
+	, pbackend= if( getAllCores() > 1 ) 'par' else 'seq'
 	# toogle verbosity
 	, verbose=FALSE
 	# toogle debug mode

R/parallel.R

@@ -16,7 +16,7 @@ NULL
 # specified by the user
 getMaxCores <- function(limit=TRUE){
 	#ceiling(parallel::detectCores()/2)
-	nt <- n <- parallel::detectCores()
+	nt <- n <- getAllCores()
 	# limit to number of cores specified in options if asked for
 	if( limit ){
 		if( !is.null(nc <- getOption('cores')) ) n <- nc # global option

R/utils.R

@@ -43,6 +43,12 @@ rmAttributes <- function(x){
 	x
 }
 
+# returns total number of available cores
+getAllCores <- function(){
+    isOpenBSD <- grepl('openbsd', R.version$os, ignore.case = TRUE)
+    parallel::detectCores(all.tests = isOpenBSD)
+}
+
 #' \code{str_args} formats the arguments of a function using \code{\link{args}}, 
 #' but returns the output as a string.
 #' 

inst/tests/runit.parallel.r

@@ -266,7 +266,7 @@ test.nmf <- function(){
 
 	.check('SEQ', .pbackend='SEQ')
 	# Multicore
-	if( parallel::detectCores() > 1 ) 
+	if( NMF:::getAllCores() > 1 ) 
 		.check('P2', .options='P2')
 
 	# SNOW-type from char spec