提交: 12a6c65653f4683c5758424a0be7afbb1e985931 - MolDS (git)

Commit MetaInfo

• 修订版: 12a6c65653f4683c5758424a0be7afbb1e985931 (tree)
• 时间: 2013-01-25 16:53:30
• 作者: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Remove checks for mkl BLAS interface functions. #28588 #30566

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1259 1136aad2-a195-0410-b898-f5ea1d11b9d8

更改概述

• modified: src/config.h.in
• modified: src/configure
• modified: src/configure.ac

差异

--- a/src/config.h.in
+++ b/src/config.h.in
@@ -44,21 +44,6 @@
 /* Define to 1 if you have the <cblas.h> header file. */
 #undef HAVE_CBLAS_H
 
-/* Define to 1 if you have the `daxpy' function. */
-#undef HAVE_DAXPY
-
-/* Define to 1 if you have the `dcopy' function. */
-#undef HAVE_DCOPY
-
-/* Define to 1 if you have the `ddot' function. */
-#undef HAVE_DDOT
-
-/* Define to 1 if you have the `dgemm' function. */
-#undef HAVE_DGEMM
-
-/* Define to 1 if you have the `dgemv' function. */
-#undef HAVE_DGEMV
-
 /* Define to 1 if you have the `dgetrf' function. */
 #undef HAVE_DGETRF
 
@@ -68,12 +53,6 @@
 /* Define to 1 if you have the `dsyevd' function. */
 #undef HAVE_DSYEVD
 
-/* Define to 1 if you have the `dsymv' function. */
-#undef HAVE_DSYMV
-
-/* Define to 1 if you have the `dsyr' function. */
-#undef HAVE_DSYR
-
 /* Define to 1 if you have the `dsysv' function. */
 #undef HAVE_DSYSV
 

--- a/src/configure
+++ b/src/configure
@@ -7001,7 +7001,7 @@ as_fn_error $? "Cannot find mkl.h or blas.h!
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 
-for ac_func in dcopy daxpy ddot dgemv dgemm dsymv dsyr
+for ac_func in cblas_dcopy cblas_daxpy cblas_ddot cblas_dgemv cblas_dgemm cblas_dsymv cblas_dsyr
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -7017,23 +7017,6 @@ done
 
 
 if test x$molds_blas_cinterface_found != xyes; then :
-  for ac_func in cblas_dcopy cblas_daxpy cblas_ddot cblas_dgemv cblas_dgemm cblas_dsymv cblas_dsyr
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- molds_blas_cinterface_found=yes
-else
-  molds_blas_cinterface_found=no;break
-fi
-done
-
-fi
-
-if test x$molds_blas_cinterface_found != xyes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Cannot find C interface functions of BLAS!

--- a/src/configure.ac
+++ b/src/configure.ac
@@ -91,15 +91,10 @@ AC_CHECK_HEADERS([mkl.h cblas.h],[molds_blas_header_found=yes],)
 AS_IF([test "x$molds_blas_header_found" != "xyes"],
       [AC_MSG_FAILURE([Cannot find mkl.h or blas.h!])])
 
-dnl Check for BLAS C interface
-AC_CHECK_FUNCS([dcopy daxpy ddot dgemv dgemm dsymv dsyr],
-               [molds_blas_cinterface_found=yes],
-               [molds_blas_cinterface_found=no;break])
-
-AS_IF([test x$molds_blas_cinterface_found != xyes],
-      [AC_CHECK_FUNCS([cblas_dcopy cblas_daxpy cblas_ddot cblas_dgemv cblas_dgemm cblas_dsymv cblas_dsyr],
-                      [molds_blas_cinterface_found=yes],
-                      [molds_blas_cinterface_found=no;break])])
+dnl Check for CBLAS
+AC_CHECK_FUNCS([cblas_dcopy cblas_daxpy cblas_ddot cblas_dgemv cblas_dgemm cblas_dsymv cblas_dsyr],
+                [molds_blas_cinterface_found=yes],
+                [molds_blas_cinterface_found=no;break])
 
 AS_IF([test x$molds_blas_cinterface_found != xyes],
       [AC_MSG_FAILURE([Cannot find C interface functions of BLAS!])])