workarounds for externalBLAS missing the 2025 additions

git-svn-id: https://svn.r-project.org/R/trunk@87889 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

configure

@@ -775,6 +775,8 @@ LIBR1
 LIBR0
 BLAS_SHLIB_FALSE
 BLAS_SHLIB_TRUE
+BUILD_2025BLAS_FALSE
+BUILD_2025BLAS_TRUE
 RMATH_HAVE_WORKING_LOG1P
 LIBOBJS
 ALLOCA
@@ -1096,6 +1098,7 @@ enable_lto
 enable_java
 with_blas
 with_lapack
+with_2025blas
 with_readline
 with_pcre2
 with_pcre1
@@ -1907,6 +1910,7 @@ Optional Packages:
                           it [unset]
   --with-lapack           use system LAPACK library (if available), or specify
                           it [unset]
+  --with-2025blas         compile 2025 BLAS additions into Rlapack [no]
   --with-readline         use readline library [yes]
   --with-pcre2            use PCRE2 library (if available) [yes]
   --with-pcre1            use PCRE1 library (if available and PCRE2 is not)
@@ -4839,6 +4843,22 @@ esac
 fi
 
 
+
+# Check whether --with-2025blas was given.
+if test ${with_2025blas+y}
+then :
+  withval=$with_2025blas; if test "${withval}" = no; then
+  use_2025blas=no
+else
+  use_2025blas=yes
+fi
+
+else case e in #(
+  e) use_2025blas=no ;;
+esac
+fi
+
+
 ## Readline.
 
 # Check whether --with-readline was given.
@@ -27529,7 +27549,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_verb"
-(eval echo $as_me:27532: \"$ac_link\") >&5
+(eval echo $as_me:27552: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -27607,7 +27627,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_cv_prog_c_v"
-(eval echo $as_me:27610: \"$ac_link\") >&5
+(eval echo $as_me:27630: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -51532,6 +51552,20 @@ if test "${acx_blas_ok}" != "yes"; then
   esac
 fi
 
+if test "${use_2025blas}" = yes; then
+   if test "${acx_lapack_ok}" = "yes"; then
+     as_fn_error $? "--with-2025blas cannot be used with --with-lapack" "$LINENO" 5
+  fi
+fi
+ if test "${use_2025blas}" = yes; then
+  BUILD_2025BLAS_TRUE=
+  BUILD_2025BLAS_FALSE='#'
+else
+  BUILD_2025BLAS_TRUE='#'
+  BUILD_2025BLAS_FALSE=
+fi
+
+
  if test "x${use_blas_shlib}" = xyes; then
   BLAS_SHLIB_TRUE=
   BLAS_SHLIB_FALSE='#'
@@ -64097,6 +64131,10 @@ if test -z "${USE_EXPORTFILES_TRUE}" && test -z "${USE_EXPORTFILES_FALSE}"; then
   as_fn_error $? "conditional \"USE_EXPORTFILES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_2025BLAS_TRUE}" && test -z "${BUILD_2025BLAS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_2025BLAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BLAS_SHLIB_TRUE}" && test -z "${BLAS_SHLIB_FALSE}"; then
   as_fn_error $? "conditional \"BLAS_SHLIB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

@@ -426,6 +426,11 @@ AC_ARG_WITH([lapack],
 [R_ARG_USE(lapack)],
 [use_lapack=unset])
 
+AC_ARG_WITH([2025blas],
+[AS_HELP_STRING([--with-2025blas],[compile 2025 BLAS additions into Rlapack @<:@no@:>@])],
+[R_ARG_USE(2025blas)],
+[use_2025blas=no])
+
 ## Readline.
 AC_ARG_WITH([readline],
 [AS_HELP_STRING([--with-readline],[use readline library @<:@yes@:>@])],
@@ -2403,6 +2408,13 @@ if test "${acx_blas_ok}" != "yes"; then
   esac
 fi
 
+if test "${use_2025blas}" = yes; then
+   if test "${acx_lapack_ok}" = "yes"; then
+     AC_MSG_ERROR([--with-2025blas cannot be used with --with-lapack])
+  fi
+fi
+AM_CONDITIONAL(BUILD_2025BLAS, [test "${use_2025blas}" = yes])
+
 AM_CONDITIONAL(BLAS_SHLIB, [test "x${use_blas_shlib}" = xyes])
 
 case "${host_os}" in

doc/NEWS.Rd

@@ -207,11 +207,14 @@
       \I{Ella Kaye}, \I{Heather Turner}, and \I{Kristen Gorman}.
 
       \item The bundled BLAS and LAPACK sources have been updated to
-      those shipped with LAPACK 3.12.1.  This is mainly bug fixes, but
-      includes a handful of new ancillary routines, including two new
-      BLAS routines \code{dgemmtr} and \code{zgemmtr} which are now used
-      by LAPACK routines. So an external BLAS to be used with the
-      internal LAPACK (unusual) needs to provide those routines.
+      those shipped with LAPACK 3.12.1.
+
+      This is mainly bug fixes, but includes a handful of new ancillary
+      routines, including two new BLAS routines \code{dgemmtr} and
+      \code{zgemmtr} which are now used by LAPACK routines.  So an
+      external BLAS to be used with the internal LAPACK (unusual) needs
+      to provide those routines, and if an external LAPACK is 3.12.1 or
+      later, the BLAS used must contain the 2025 additions.
     }
   }
 
@@ -251,6 +254,11 @@
       \item There is now support for installing the debug symbols for
       recommended packages on macOS: see \samp{REC_INSTALL_OPT} in file
       \file{config.site}.
+
+      \item There is a new \command{configure} option
+      \option{--with-2025blas} which will compile the 2025 BLAS
+      additions in the internal LAPACK to allow an external BLAS which
+      lacks them to be used.
     }
   }
 

src/extra/blas/Makefile.win

@@ -8,6 +8,9 @@ blas00.o: blas00.c
 	$(CC) -O3 -I../../include  -c $< -o $@
 
 ## Rblas.dll imports xerbla_ from R.dll
+## OpenBLAS 0.3.29 includes [dz]gemmtr but ATLAS does not.
+## So to use latter, copy [dz]gemmtr.f from ../../modules/lapack
+## and add dgemmtr.o zgemmtr.o to the dependencies.
 ifeq "$(USE_ATLAS)" "YES"
 ../../../$(BINDIR)/Rblas.dll: blas00.o ../../gnuwin32/dllversion.o
 	@$(ECHO) -------- Building $@ --------

src/modules/lapack/Makefile.in

@@ -23,6 +23,8 @@ SOURCES = $(SOURCES_C) $(SOURCES_F) $(SOURCES_F90)
 OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o) flexiblas.o
 HEADERS = Lapack.h
 
+@BUILD_2025BLAS_TRUE@2025OBJECTS = dgemmtr.o \
+  @COMPILE_FORTRAN_DOUBLE_COMPLEX_FALSE@ zgemmtr.o
 ## Sources for -lRlapack.
 ## On macOS this will be linked directly to the vecLib/Accelerate
 ## framework if --with-blas=Acceleraate --with-lapack is used, so
@@ -32,6 +34,7 @@ LIBSOURCES = dlamch.f dlapack.f \
 LIBSOURCES90 = dlartg.f90 dlassq.f90 la_constants.f90 la_xisnan.f90 \
   @COMPILE_FORTRAN_DOUBLE_COMPLEX_FALSE@ zlartg.f90 zlassq.f90
 LIBOBJECTS = $(LIBSOURCES:.f=.o) $(LIBSOURCES90:.f90=.o) \
+  $(2025OBJECTS) \
   @USE_VECLIB_G95FIX_TRUE@ vecLibg95f.o vecLibg95c.o
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
@@ -43,7 +46,8 @@ DISTFILES = \
 	cmplx.f dlapack.f dlamch.f \
 	dlartg.f90 dlassq.f90 la_constants.f90 la_xisnan.f90 \
 	zlartg.f90 zlassq.f90 \
-	dble.txt cmplx.txt R.patch
+	dble.txt cmplx.txt R.patch \
+	dgemmtr.f zgemmtr.f
 
 lapack_la = lapack$(SHLIB_EXT)
 lapack_la_OBJECTS = $(OBJECTS)