Commit: d63ed4276626f1e72644ee46d2999dbdee57554b - MolDS (git)

Commit MetaInfo

• Revision: d63ed4276626f1e72644ee46d2999dbdee57554b (tree)
• Time: 2013-08-24 11:00:42
• Author: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Define MKL_ILP64 in config.h. #28588

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

Change Summary

• modified: src/configure.ac
• modified: src/wrappers/Blas.cpp
• modified: src/wrappers/Lapack.cpp

Incremental Difference

--- a/src/configure.ac
+++ b/src/configure.ac
@@ -159,6 +159,9 @@ AC_DEFINE_UNQUOTED([SIZEOF_BLASINT], [($molds_cv_sizeof_blasint)], [The size of
 
 dnl Size of BLAS int
 AC_DEFINE([SIZEOF_LAPACKINT], [SIZEOF_BLASINT], [The size of integer variables used by LAPACK library])
+AS_IF([test x$molds_cv_sizeof_blasint = x64],
+      [AC_DEFINE([MKL_ILP64], [],
+                 [Whether ILP64 version of Intel Math Kernel Library])])
 
 dnl Boost
 AX_BOOST_BASE([1.46],,[AC_MSG_FAILURE([boost library is too old!])])

--- a/src/wrappers/Blas.cpp
+++ b/src/wrappers/Blas.cpp
@@ -34,9 +34,6 @@
 #include"Blas.h"
 
 #ifdef HAVE_MKL_H
-#if SIZEOF_BLASINT == 64
-#define MKL_ILP64
-#endif
 #include"mkl.h"
 #elif HAVE_CBLAS_H
 #include"cblas.h"

--- a/src/wrappers/Lapack.cpp
+++ b/src/wrappers/Lapack.cpp
@@ -34,9 +34,6 @@
 #include"Lapack.h"
 
 #if defined(HAVE_MKL_H)
-#if SIZEOF_LAPACKINT == 64
-#define MKL_ILP64
-#endif
 #include"mkl.h"
 #elif defined(HAVE_LAPACKE_H)
 #if SIZEOF_LAPACKINT==64