Intel MKL configuration upgrade

kaleidicassociates · Jul 30, 2018 · 87ba403 · 87ba403
1 parent 63ad7cf
commit 87ba403
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,6 @@ lubeck-test-library
 *.sublime-workspace
 lubeck-test-unittest
 .DS_Store
+*.lib
+*.dll
+*.exe
diff --git a/dub.sdl b/dub.sdl
@@ -4,7 +4,7 @@ authors "Ilya Yaroshenko" "Lars Tandle Kyllingstad (SciD author)"
 copyright "Copyright © 2017, Symmetry Investments & Kaleidic Associates; Copyright (c) 2009, Lars T. Kyllingstad (SciD)"
 license "BSL-1.0"
 
-dependency "mir-lapack" version="~>0.1.0"
+dependency "mir-lapack" version="~>0.3.0"
 dependency "mir-algorithm" version=">=1.1.0"
 
 configuration "library" {
@@ -40,6 +40,34 @@ configuration "mkl-sequential" {
 	subConfiguration "mir-lapack" "mkl-sequential"
 }
 
+configuration "mkl-sequential-ilp" {
+	subConfiguration "mir-lapack" "mkl-sequential-ilp"
+}
+
+configuration "mkl-tbb-thread" {
+	subConfiguration "mir-lapack" "mkl-tbb-thread"
+}
+
+configuration "mkl-tbb-thread-ilp" {
+	subConfiguration "mir-lapack" "mkl-tbb-thread-ilp"
+}
+
+configuration "mkl-sequential-dll" {
+	subConfiguration "mir-lapack" "mkl-sequential-dll"
+}
+
+configuration "mkl-sequential-ilp-dll" {
+	subConfiguration "mir-lapack" "mkl-sequential-ilp-dll"
+}
+
+configuration "mkl-tbb-thread-dll" {
+	subConfiguration "mir-lapack" "mkl-tbb-thread-dll"
+}
+
+configuration "mkl-tbb-thread-ilp-dll" {
+	subConfiguration "mir-lapack" "mkl-tbb-thread-ilp-dll"
+}
+
 configuration "zerolib" {
 	subConfiguration "mir-lapack" "zerolib"
 }

diff --git a/example/dub.sdl b/example/dub.sdl
@@ -1,10 +1,8 @@
 name "example"
 authors "Ilya Yaroshenko"
 dependency "lubeck" path="../"
-dependency "mir-lapack" version="~>0.1.0"
 description "Lubeck example"
 license "BSL-1.0"
-libs "lapack" "blas"
 targetType "executable"
 
 configuration "executable" {

diff --git a/source/lubeck.d b/source/lubeck.d
@@ -1105,7 +1105,7 @@ unittest
              0,  0,  0 ]
              .sliced(10, 3)
              .as!double.slice;
-    auto ipiv = [ 10, 9, 8, 7, 6, 6, 7, 8, 9, 10 ].sliced(10);
+    auto ipiv = [ lapackint(10), 9, 8, 7, 6, 6, 7, 8, 9, 10 ].sliced(10);
     moveRows(A, ipiv);
 
     auto B = 
@@ -1141,7 +1141,7 @@ unittest
              0,  0,  0 ]
              .sliced(10, 3)
              .as!double.slice;
-    auto ipiv = [ 2, 3, 4, 5, 6, 7, 8, 9, 10, 10 ].sliced(10);
+    auto ipiv = [ lapackint(2), 3, 4, 5, 6, 7, 8, 9, 10, 10 ].sliced(10);
     moveRows(A, ipiv);
 
     auto B =