Skip to content
Browse files

workaround for vecLib without --with-lapack

git-svn-id: https://svn.r-project.org/R/trunk@60929 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 609dafa commit 053c00d1d39a0659427bdd811750cfd35a3db42a ripley committed
Showing with 12 additions and 9 deletions.
  1. +4 −0 doc/NEWS.Rd
  2. +3 −3 doc/manual/R-admin.texi
  3. +2 −5 m4/R.m4
  4. +3 −1 src/modules/lapack/Makefile.in
View
4 doc/NEWS.Rd
@@ -992,6 +992,10 @@
\item \code{as.data.frame.matrix()} could return invalid data
frame with no \code{row.names} attribute for 0-row matrix. (Reported
by Hervé Pagès.)
+
+ \item Compilation with the \code{vecLib} or \code{Accelerate}
+ frameworks on OS X without using that also for LAPACK is more
+ likely to be successful.
}
}
}
View
6 doc/manual/R-admin.texi
@@ -4150,9 +4150,9 @@ The @code{vecLib} library can be used @emph{via} the configuration options
@noindent
to provide higher-performance versions of the @acronym{BLAS} and LAPACK
routines. (Use of @code{vecLib} without @option{--with-lapack} has
-resulted in segfaults.) You can replace @code{vecLib} by
-@code{Accelerate}: in recent versions of OS X the former is a wrapper
-for the latter.
+resulted in segfaults: there is workaround as from @R{} 2.15.2.) You
+can replace @code{vecLib} by @code{Accelerate}: in recent versions of OS
+X the former is a wrapper for the latter.
Note that the Apple versions of GCC (and those on
@uref{http://r.research.att.com}) are based on version 4.2 from
View
7 m4/R.m4
@@ -2685,11 +2685,8 @@ fi
AC_MSG_RESULT([yes])
## for vecLib we have a work-around by using cblas_..._sub
use_veclib_g95fix=yes
- ## The fix may not work with internal lapack, because
- ## the lapack dylib won't have the fixed functions.
- ## those are available to the lapack module only.
- # use_lapack=yes
- # with_lapack=""
+ ## The fix may not work with internal lapack, but
+ ## is more likely to in R >= 2.15.2.
else
AC_MSG_RESULT([no])
BLAS_LIBS=
View
4 src/modules/lapack/Makefile.in
@@ -19,9 +19,11 @@ SOURCES = $(SOURCES_C) $(SOURCES_F)
OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)
HEADERS = Lapack.h
+## Sources for the -lRlapack. On OSX this may be linked directly to
+## vecLib/Accelerate, so needs the zdot* fix.
LIBSOURCES = dlamch.f dlapack.f \
@COMPILE_FORTRAN_DOUBLE_COMPLEX_FALSE@ cmplx.f
-LIBOBJECTS = $(LIBSOURCES:.f=.o)
+LIBOBJECTS = $(LIBSOURCES:.f=.o) @USE_VECLIB_G95FIX_TRUE@ vecLibg95f.o vecLibg95c.o
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = \

0 comments on commit 053c00d

Please sign in to comment.
Something went wrong with that request. Please try again.