added fixes for Intel MKL 2024.1

mahrud · Nov 1, 2024 · adaf784 · adaf784
1 parent f67821e
commit adaf784
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/M2/Macaulay2/e/engine-includes.hpp b/M2/Macaulay2/e/engine-includes.hpp
@@ -7,6 +7,10 @@
 
 // IWYU pragma: begin_exports
 
+// For zgetrf_ from Intel MKL
+// See mkl_lapack.hpp and mkl_types.hpp
+#define MKL_Complex16 double
+
 #include <M2/config.h>
 
 #if !defined(SAFEC_EXPORTS)

diff --git a/M2/Macaulay2/e/lapack.hpp b/M2/Macaulay2/e/lapack.hpp
@@ -13,6 +13,7 @@
 /* MES, On my mac, 10.12.4, lapack include file is at
   /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/clapack.h
 */
+#ifndef _MKL_LAPACK_H_
 extern "C" {
 int dgesv_(int *n,      // number of rows in A
            int *nrhs,   // number of right hand sides
@@ -389,6 +390,7 @@ void cblas_zgemm(
     void *C,            // matrix C; on output, alphaAB+betaC
     const int ldc);     // rows of C
 };
+#endif
 
 class Lapack
 {