Merge pull request #314 from thibautjombart/no-parallel-ftw

Set all parallel = FALSE
thibautjombart · Sep 26, 2021 · b8b7b3b · b8b7b3b
2 parents e03d873 + a740a7e
commit b8b7b3b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+			CHANGES IN ADEGENET VERSION 2.1.5
+
+PARALLEL COMPUTATION
+
+ - parallel computation defaults to `FALSE` from now on to avoid frustrating
+   errors on windows machines.
+
 			CHANGES IN ADEGENET VERSION 2.1.4
 
 DOCUMENTATION

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: adegenet
 Title: Exploratory Analysis of Genetic and Genomic Data
-Version: 2.1.4
+Version: 2.1.5
 Authors@R: 
     c(person(given = "Thibaut",
              family = "Jombart",
@@ -102,7 +102,7 @@ Suggests:
     poppr
 Encoding: UTF-8
 LazyLoad: yes
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 Collate:
     'adegenet.package.R'
     'datasets.R'

diff --git a/R/import.R b/R/import.R
@@ -1415,7 +1415,7 @@ extract.PLINKmap <- function(file, x = NULL){
 #' @export
 #' @rdname read.PLINK
 read.PLINK <- function(file, map.file=NULL, quiet=FALSE, chunkSize=1000,
-                       parallel=require("parallel"), n.cores=NULL, ...){
+                       parallel=FALSE, n.cores=NULL, ...){
     ## HANDLE ARGUMENTS ##
     ext <- .readExt(file)
     ext <- toupper(ext)
@@ -1529,7 +1529,7 @@ read.PLINK <- function(file, map.file=NULL, quiet=FALSE, chunkSize=1000,
 ## Function fasta2genlight
 ###########################
 fasta2genlight <- function(file, quiet=FALSE, chunkSize=1000, saveNbAlleles=FALSE,
-                       parallel=require("parallel"), n.cores=NULL, ...){
+                       parallel=FALSE, n.cores=NULL, ...){
     ## HANDLE ARGUMENTS ##
     ext <- .readExt(file)
     ext <- toupper(ext)

diff --git a/man/fasta2genlight.Rd b/man/fasta2genlight.Rd
@@ -18,8 +18,8 @@
   on parallel architectures (needs the package \code{parallel}).
 }
 \usage{
-fasta2genlight(file, quiet=FALSE, chunkSize = 1000, saveNbAlleles=FALSE,
-               parallel = require("parallel"), n.cores = NULL, \dots)
+fasta2genlight(file, quiet = FALSE, chunkSize = 1000, saveNbAlleles = FALSE,
+               parallel = FALSE, n.cores = NULL, \dots)
 }
 \arguments{
   \item{file}{ a character string giving the path to the file to

diff --git a/man/read.PLINK.Rd b/man/read.PLINK.Rd