Merge pull request #15958 from JuliaLang/tk/fix15957

Fix #15957, ILP64 MKL not working
JuliaLang · Apr 21, 2016 · 2e4513b · 2e4513b
2 parents dbbeb8d + ba76f65
commit 2e4513b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/base/linalg/lapack.jl b/base/linalg/lapack.jl
@@ -10,12 +10,6 @@ import Base.@blasfunc
 import ..LinAlg: BlasFloat, Char, BlasInt, LAPACKException,
     DimensionMismatch, SingularException, PosDefException, chkstride1, checksquare
 
-const VERSION = Ref{VersionNumber}()
-
-function __init__()
-    VERSION[] = VersionNumber(laver()...)
-end
-
 #Generic LAPACK error handlers
 """
 Handle only negative LAPACK error codes

diff --git a/base/linalg/svd.jl b/base/linalg/svd.jl
@@ -124,7 +124,7 @@ If `thin=true` (default), a thin SVD is returned. For a ``M \\times N`` matrix
 """
 function svdfact!{T<:BlasFloat}(A::StridedMatrix{T}, B::StridedMatrix{T})
     # xggsvd3 replaced xggsvd in LAPACK 3.6.0
-    if LAPACK.VERSION[] < v"3.6.0"
+    if LAPACK.laver() < (3, 6, 0)
         U, V, Q, a, b, k, l, R = LAPACK.ggsvd!('U', 'V', 'Q', A, B)
     else
         U, V, Q, a, b, k, l, R = LAPACK.ggsvd3!('U', 'V', 'Q', A, B)
@@ -216,7 +216,7 @@ end
 
 function svdvals!{T<:BlasFloat}(A::StridedMatrix{T}, B::StridedMatrix{T})
     # xggsvd3 replaced xggsvd in LAPACK 3.6.0
-    if LAPACK.VERSION[] < v"3.6.0"
+    if LAPACK.laver() < (3, 6, 0)
         _, _, _, a, b, k, l, _ = LAPACK.ggsvd!('N', 'N', 'N', A, B)
     else
         _, _, _, a, b, k, l, _ = LAPACK.ggsvd3!('N', 'N', 'N', A, B)

diff --git a/test/linalg/lapack.jl b/test/linalg/lapack.jl
@@ -156,7 +156,7 @@ for elty in (Float32, Float64, Complex64, Complex128)
     @test_approx_eq V' lVt
     B = rand(elty,10,10)
     # xggsvd3 replaced xggsvd in LAPACK 3.6.0
-    if LAPACK.VERSION[] < v"3.6.0"
+    if LAPACK.laver() < (3, 6, 0)
         @test_throws DimensionMismatch LAPACK.ggsvd!('S','S','S',A,B)
     else
         @test_throws DimensionMismatch LAPACK.ggsvd3!('S','S','S',A,B)