Windows

Author: snoweye

DESCRIPTION

@@ -40,20 +40,10 @@ License: GPL (>= 2) | file LICENSE
 Encoding: UTF-8
 LazyData: true
 ByteCompile: true
-Depends:
-    R (>= 3.1.0),
-    methods
-Imports:
-    Matrix,
-    Rcpp, 
-    mlapi (>= 0.1.0), 
-    data.table (>= 1.10.0), 
-    futile.logger,
-    RhpcBLASctl
-LinkingTo:
-    Rcpp, 
-    RcppArmadillo
-Suggests:
-    testthat,
-    float
+Depends: R (>= 3.1.0), methods
+Imports: Matrix, Rcpp, mlapi (>= 0.1.0), data.table (>= 1.10.0),
+        futile.logger, RhpcBLASctl, float (>= 0.1-2)
+LinkingTo: Rcpp, RcppArmadillo
+Suggests: testthat
 RoxygenNote: 6.0.1
+NeedsCompilation: yes

NAMESPACE

@@ -20,5 +20,6 @@ import(Rcpp)
 import(data.table)
 import(futile.logger)
 import(methods)
+import(float)
 importFrom(stats,rnorm)
 useDynLib(rsparse)

R/configure.R

@@ -3,3 +3,17 @@
 rm -rf src/Makevars
 
 rm -rf R/configure.R
+
+rm -rf autom4te.cache
+rm -rf ./src/Makevars
+rm -rf ./src/Makedeps
+rm -rf ./src/Makeconf
+rm -rf ./src/*.dylib
+rm -rf ./src/*.so*
+rm -rf ./src/*.o
+rm -rf ./src/*.d
+rm -rf ./src/*.dll
+rm -rf ./src/*.a
+rm -rf ./src/*.rc
+rm -rf ./src/*.rds
+rm -rf ./src-*

cleanup

@@ -586,6 +586,7 @@ ac_subst_vars='SINGLE_PRECISION_BLAS_AVAILABLE
 SINGLE_PRECISION_LAPACK_AVAILABLE
 LTLIBOBJS
 LIBOBJS
+FLOAT_LIBS
 DSINGLE_PRECISION_LAPACK_AVAILABLE
 ARMA_BLAS
 OPENMP_CXXFLAGS
@@ -620,6 +621,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -693,6 +695,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -945,6 +948,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1082,7 +1094,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1235,6 +1247,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1885,6 +1898,7 @@ fi
 R_SCMD="${R_HOME}/bin/R CMD config"
 BLAS_LIBS=`${R_SCMD} BLAS_LIBS`
 LAPACK_LIBS=`${R_SCMD} LAPACK_LIBS`
+FLOAT_LIBS=`${R_HOME}/bin/Rscript -e "float:::ldflags()"`
 
 # Check tools.
 # Extract the first word of "echo", so it can be a program name with args.
@@ -1973,10 +1987,14 @@ fi
 ### ship LAPACK symbols in the blas.[so|dylib|dll] file.
 
 # Check Rblas.
-if test "X${echo_ok}" = "Xyes" -a "X${grep_ok}" = "Xyes"; then
-  useRblas=`echo ${BLAS_LIBS} | grep "\-lRblas"`
-  if test "X${useRblas}" = "X"; then
-    ac_ext=c
+if test -f "${FLOAT_LIBS}" ; then
+  HAVESBLAS="yes"
+  HAVESLAPACK="yes"
+else
+  if test "X${echo_ok}" = "Xyes" -a "X${grep_ok}" = "Xyes"; then
+    useRblas=`echo ${BLAS_LIBS} | grep "\-lRblas"`
+    if test "X${useRblas}" = "X"; then
+      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2808,7 +2826,7 @@ else
   HAVESBLAS=no
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgetrf_ in -lblas" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgetrf_ in -lblas" >&5
 $as_echo_n "checking for sgetrf_ in -lblas... " >&6; }
 if ${ac_cv_lib_blas_sgetrf_+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -2850,10 +2868,10 @@ else
   HAVESLAPACK=no
 fi
 
-  else
-    LDFLAGS_OLD="${LDFLAGS}"
-    LDFLAGS="${LDFLAGS} ${BLAS_LIBS}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lRblas" >&5
+    else
+      LDFLAGS_OLD="${LDFLAGS}"
+      LDFLAGS="${LDFLAGS} ${BLAS_LIBS}"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgemm_ in -lRblas" >&5
 $as_echo_n "checking for sgemm_ in -lRblas... " >&6; }
 if ${ac_cv_lib_Rblas_sgemm_+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -2895,7 +2913,7 @@ else
   HAVESBLAS=no
 fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgetrf_ in -lRblas" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sgetrf_ in -lRblas" >&5
 $as_echo_n "checking for sgetrf_ in -lRblas... " >&6; }
 if ${ac_cv_lib_Rblas_sgetrf_+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -2937,10 +2955,11 @@ else
   HAVESLAPACK=no
 fi
 
-    LDFLAGS="${LDFLAGS_OLD}"
+      LDFLAGS="${LDFLAGS_OLD}"  # WCC: do you need a "if-else-fi" to check?
+    fi
+  else
+    HAVESBLAS="no"
   fi
-else
-  HAVESBLAS="no"
 fi
 
 
@@ -3411,6 +3430,7 @@ $as_echo "$ac_cv_prog_cxx_openmp" >&6; }
 
 
 
+
 ac_config_files="$ac_config_files src/Makevars"
 
 cat >confcache <<\_ACEOF

configure

@@ -12,6 +12,7 @@ fi
 R_SCMD="${R_HOME}/bin/R CMD config"
 BLAS_LIBS=`${R_SCMD} BLAS_LIBS`
 LAPACK_LIBS=`${R_SCMD} LAPACK_LIBS`
+FLOAT_LIBS=`${R_HOME}/bin/Rscript -e "float:::ldflags()"`
 
 # Check tools.
 AC_CHECK_PROG([echo_ok], [echo], [yes], [no], ,)
@@ -26,20 +27,25 @@ AC_CHECK_PROG([grep_ok], [grep], [yes], [no], ,)
 ### ship LAPACK symbols in the blas.[so|dylib|dll] file.
 
 # Check Rblas.
-if test "X${echo_ok}" = "Xyes" -a "X${grep_ok}" = "Xyes"; then
-  useRblas=`echo ${BLAS_LIBS} | grep "\-lRblas"`
-  if test "X${useRblas}" = "X"; then
-    AC_CHECK_LIB(blas, [sgemm_], [HAVESBLAS=yes], [HAVESBLAS=no])
-    AC_CHECK_LIB(blas, [sgetrf_], [HAVESLAPACK=yes], [HAVESLAPACK=no])
+if test -f "${FLOAT_LIBS}" ; then
+  HAVESBLAS="yes"
+  HAVESLAPACK="yes"
+else
+  if test "X${echo_ok}" = "Xyes" -a "X${grep_ok}" = "Xyes"; then
+    useRblas=`echo ${BLAS_LIBS} | grep "\-lRblas"`
+    if test "X${useRblas}" = "X"; then
+      AC_CHECK_LIB(blas, [sgemm_], [HAVESBLAS=yes], [HAVESBLAS=no])
+      AC_CHECK_LIB(blas, [sgetrf_], [HAVESLAPACK=yes], [HAVESLAPACK=no])
+    else
+      LDFLAGS_OLD="${LDFLAGS}"
+      LDFLAGS="${LDFLAGS} ${BLAS_LIBS}"
+      AC_CHECK_LIB(Rblas, [sgemm_], [HAVESBLAS=yes], [HAVESBLAS=no])
+      AC_CHECK_LIB(Rblas, [sgetrf_], [HAVESLAPACK=yes], [HAVESLAPACK=no])
+      LDFLAGS="${LDFLAGS_OLD}"  # WCC: do you need a "if-else-fi" to check?
+    fi
   else
-    LDFLAGS_OLD="${LDFLAGS}"
-    LDFLAGS="${LDFLAGS} ${BLAS_LIBS}"
-    AC_CHECK_LIB(Rblas, [sgemm_], [HAVESBLAS=yes], [HAVESBLAS=no])
-    AC_CHECK_LIB(Rblas, [sgetrf_], [HAVESLAPACK=yes], [HAVESLAPACK=no])
-    LDFLAGS="${LDFLAGS_OLD}"
+    HAVESBLAS="no"
   fi
-else
-  HAVESBLAS="no"
 fi
 
 
@@ -130,6 +136,7 @@ dnl this the meat of R's m4/openmp.m4
 AC_SUBST(OPENMP_CXXFLAGS)
 AC_SUBST(ARMA_BLAS)
 AC_SUBST(DSINGLE_PRECISION_LAPACK_AVAILABLE)
+AC_SUBST(FLOAT_LIBS)
 AC_OUTPUT(src/Makevars)
 
 AC_SUBST(SINGLE_PRECISION_LAPACK_AVAILABLE)

configure.ac

@@ -1,4 +1,4 @@
 PKG_CXXFLAGS = @OPENMP_CXXFLAGS@ -DARMA_32BIT_WORD @ARMA_BLAS@ @DSINGLE_PRECISION_LAPACK_AVAILABLE@
-PKG_LIBS = @OPENMP_CXXFLAGS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS = @OPENMP_CXXFLAGS@ @FLOAT_LIBS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 CXX_STD = CXX11

configure.win

@@ -1,4 +1,7 @@
+R_SCMD = ${R_HOME}/bin${R_ARCH_BIN}/Rscript -e
+FLOAT_LIBS = $(shell ${R_SCMD} "float:::ldflags()")
+
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_32BIT_WORD -DARMA_DONT_USE_BLAS
-PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(FLOAT_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 CXX_STD = CXX11