Changeset 3453

Timestamp:

Dec 8, 2015, 4:53:16 AM (6 years ago)

Author:

Peter

Message:

closes #839

Simplify code by looping over different cblas implementations using
AC_SEARCH_LIBS rather than repeating code. Include search for satlas
and tatlas, which are the names in new versions of ATLAS.

File:

• trunk/m4/yat_cblas.m4 (modified) (1 diff)

trunk/m4/yat_cblas.m4

@@ -65 +65 @@
                       [CBLAS_LIB=""])])
 
-# CBLAS linked to by default (or with current LIBS)
-if test $yat_cblas_ok = no; then
-  AC_MSG_CHECKING([for cblas_sgemm])
-  AC_LINK_IFELSE([AC_LANG_CALL(,[cblas_sgemm])],
-                 [yat_cblas_ok=yes CBLAS_LIB=""])
-  AC_MSG_RESULT([$yat_cblas_ok])
-fi
+# Find library that implements cblas; search in the following order
+# - CBLAS linked by default (or with current $LIBS)
+# - CBLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+#   - tatlas
+#   - satlas
+# - CBLAS as -lcblas
+# - Openblas available from http://xianyi.github.com/OpenBLAS/
+# - CBLAS in Intel MKL library?
+# - CBLAS in SCSL library (SGI/Cray Scientific Library)
+AS_IF([test $yat_cblas_ok = no], [
+  AC_SEARCH_LIBS([cblas_sgemm],
+                 [tatlas satlas cblas opencblas mkl_core scs],
+                 [yat_cblas_ok=yes;
+                  AS_IF([test "$ac_cv_search_cblas_sgemm" != "none required"],[
+                    CBLAS_LIB=$ac_cv_search_cblas_sgemm
+                  ])
+                 ])
+  LIBS=$save_LIBS
+])
 
 # CBLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-if test $yat_cblas_ok = no; then
-  AC_SEARCH_LIBS([ATL_xerbla], [atlas],
-                 [AC_SEARCH_LIBS([cblas_sgemm], [cblas],
-                                 [yat_cblas_ok=yes;
-                                  CBLAS_LIB="-lcblas -latlas"])])
+# Old atlas is linked in with -latlas -lcblas
+AS_IF([test $yat_cblas_ok = no], [
+  AC_CHECK_LIB([ATL_xerbla], [atlas],
+               [AC_CHECK_LIB([cblas_sgemm], [cblas],
+                             [yat_cblas_ok=yes;
+                              CBLAS_LIB="-lcblas -latlas"])
+               ])
   LIBS=$save_LIBS;
-fi
-
-if test $yat_cblas_ok = no; then
-  AC_CHECK_LIB([cblas], [cblas_sgemm], [yat_cblas_ok=yes; CBLAS_LIB="-lcblas";])
-fi
-
-# Openblas available from http://xianyi.github.com/OpenBLAS/
-if test $yat_cblas_ok = no; then
-  AC_CHECK_LIB([opencblas], [cblas_sgemm],
-               [yat_cblas_ok=yes; CBLAS_LIB="-lopencblas";])
-fi
-
-# CBLAS in Intel MKL library?
-if test $yat_cblas_ok = no; then
-  AC_CHECK_LIB([mkl_core], [cblas_sgemm],
-               [yat_blas_ok=yes; CBLAS_LIBS="-lmkl_core"])
-fi
-
-# CBLAS in SCSL library?  (SGI/Cray Scientific Library)
-if test $yat_cblas_ok = no; then
-  AC_CHECK_LIB([scs], [cblas_sgemm], [yat_cblas_ok=yes; CBLAS_LIB="-lscs"])
-fi
+])
 
 # Execute ACTION-IF-FOUND or ACTION-IF-NOT-FOUND
-AS_IF([test x"$yat_cblas_ok" = xyes],
+AS_IF([test x"$yat_cblas_ok" = x"yes"],
       [m4_default([$1], [:])],
       [yat_cblas_ok=no; m4_default([$2], [:])])