Browse code

(1.47.1) Configure script checks to see if R is using openblas. If it is then it disables the internal preprocessCore threading code.

Ben Bolstad authored on 12/05/2019 15:32:40
Showing2 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: preprocessCore
2
-Version: 1.47.0
2
+Version: 1.47.1
3 3
 Title: A collection of pre-processing functions
4 4
 Author: Ben Bolstad <bmb@bmbolstad.com>
5 5
 Maintainer: Ben Bolstad <bmb@bmbolstad.com>
... ...
@@ -2960,8 +2960,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
2960 2960
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2961 2961
 
2962 2962
 
2963
-
2964
-
2965 2963
 # Checks for libraries.
2966 2964
 use_pthreads=no
2967 2965
 
... ...
@@ -3340,6 +3338,19 @@ if test "x$use_pthread_stack_min" = xno; then
3340 3338
 fi
3341 3339
 
3342 3340
 
3341
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if R is using openblas" >&5
3342
+$as_echo_n "checking if R is using openblas... " >&6; }
3343
+BLAS_LIBS=`"${R_HOME}/bin/R" CMD config BLAS_LIBS`
3344
+if echo "${BLAS_LIBS}" | grep openblas > /dev/null; then
3345
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: openblas found. preprocessCore threading will be disabled" >&5
3346
+$as_echo "openblas found. preprocessCore threading will be disabled" >&6; }
3347
+    use_pthreads=no
3348
+else
3349
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: openblas not found. preprocessCore threading will not be disabled" >&5
3350
+$as_echo "openblas not found. preprocessCore threading will not be disabled" >&6; }
3351
+fi
3352
+
3353
+
3343 3354
 # Check whether --enable-threading was given.
3344 3355
 if test "${enable_threading+set}" = set; then :
3345 3356
   enableval=$enable_threading;
... ...
@@ -3347,6 +3358,7 @@ fi
3347 3358
 
3348 3359
 
3349 3360
 
3361
+
3350 3362
 if test "x$enable_threading" != "xno" ; then :
3351 3363
 
3352 3364
 	    if test "x${use_pthreads}" = "xno"; then
... ...
@@ -3370,8 +3382,8 @@ $as_echo "$as_me: Enabling threading for preprocessCore" >&6;}
3370 3382
 
3371 3383
 else
3372 3384
 
3373
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling threading for\ preprocessCore" >&5
3374
-$as_echo "$as_me: Disabling threading for\ preprocessCore" >&6;}
3385
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling threading for preprocessCore" >&5
3386
+$as_echo "$as_me: Disabling threading for preprocessCore" >&6;}
3375 3387
 
3376 3388
 fi
3377 3389