Add MKL_jll and let MKL handle precessor detection

Author: Crown421

Project.toml

@@ -1,16 +1,13 @@
 name = "IntelVectorMath"
 uuid = "c8ce9da6-5d36-5c03-b118-5a70151be7bc"
-version = "0.3.1"
+version = "0.4.0"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+MKL_jll = "856f044c-d86e-5d09-b602-aeab76dc8ba7"
 
 [compat]
-BinaryProvider = "0.5.8"
-CpuId = "0.2"
-julia = "0.7, 1.0"
+julia = "1.3"
+MKL_jll = "2020"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

@@ -19,8 +19,9 @@ To install IntelVectorMath.jl run
 ```julia
 julia> ] add IntelVectorMath
 ```
-Since version 0.3 IntelVectorMath downloads its own version of MKL and keeps only the required files in its own directory. As such installing MKL.jl or MKL via intel are no longer required, and may mean some duplicate files if they are present. However, this package will adopt the new artifact system in the next minor version update and fix this issue. 
+Since version 0.4 `IntelVectorMath` uses the `MKL_jll` artifact, which is shared with other packages uses MKL, removing several other dependencies. This has the side effect that from version 0.4 onwards this package requires at least Julia 1.3. 
 
+For older versions of Julia `IntelVectorMath v0.3` downloads its own version of MKL and keeps only the required files in its own directory. As such installing MKL.jl or MKL via intel are no longer required, and may mean some duplicate files if they are present. However, this package will adopt the new artifact system in the next minor version update and fix this issue. 
 In the event that MKL was not installed properly you will get an error when first `using` it. Please try running 
 ```julia
 julia> ] build IntelVectorMath

deps/.gitignore

@@ -1,14 +1,4 @@
-
-function __init__()
-    check_deps()
-
-    Libdl.dlopen(libmkl_core, Libdl.RTLD_GLOBAL)
-    Libdl.dlopen(libmkl_rt, Libdl.RTLD_GLOBAL) # maybe only needed on mac
-    Libdl.dlopen(libmkl_vml_avx, Libdl.RTLD_GLOBAL)
-
-end
-
-__init__()
+import MKL_jll
 
 struct VMLAccuracy
     mode::UInt
@@ -20,15 +10,16 @@ const VML_EP = VMLAccuracy(0x00000003)
 
 Base.show(io::IO, m::VMLAccuracy) = print(io, m == VML_LA ? "VML_LA" :
                                               m == VML_HA ? "VML_HA" : "VML_EP")
-vml_get_mode() = ccall((:_vmlGetMode, libmkl_vml_avx), Cuint, ())
-vml_set_mode(mode::Integer) = (ccall((:_vmlSetMode, libmkl_vml_avx), Cuint, (UInt,), mode); nothing)
+                                              
+vml_get_mode() = ccall((:vmlGetMode, MKL_jll.libmkl_rt), Cuint, ())
+vml_set_mode(mode::Integer) = (ccall((:vmlSetMode, MKL_jll.libmkl_rt), Cuint, (UInt,), mode); nothing)
 
 vml_set_accuracy(m::VMLAccuracy) = vml_set_mode((vml_get_mode() & ~0x03) | m.mode)
 vml_get_accuracy() = VMLAccuracy(vml_get_mode() & 0x3)
 
 vml_set_mode((vml_get_mode() & ~0x0000FF00))
 function vml_check_error()
-    vml_error = ccall((:_vmlClearErrStatus, libmkl_vml_avx), Cint, ())
+    vml_error = ccall((:vmlClearErrStatus, MKL_jll.libmkl_rt), Cint, ())
     if vml_error != 0
         if vml_error == 1
             throw(DomainError(-1, "This function does not support arguments outside its domain"))
@@ -45,13 +36,13 @@ end
 
 function vml_prefix(t::DataType)
     if t == Float32
-        return "_vmls"
+        return "vs"
     elseif t == Float64
-        return "_vmld"
+        return "vd"
     elseif t == Complex{Float32}
-        return "_vmlc"
+        return "vc"
     elseif t == Complex{Float64}
-        return "_vmlz"
+        return "vz"
     end
     error("unknown type $t")
 end
@@ -65,22 +56,22 @@ function def_unary_op(tin, tout, jlname, jlname!, mklname;
     @eval begin
         function ($jlname!)(out::Array{$tout,N}, A::Array{$tin,N}) where {N}
             size(out) == size(A) || throw(DimensionMismatch())
-            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
+            ccall(($mklfn, MKL_jll.libmkl_rt), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
             vml_check_error()
             return out
         end
         $(if tin == tout
             quote
                 function $(jlname!)(A::Array{$tin})
-                    ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, A)
+                    ccall(($mklfn, MKL_jll.libmkl_rt), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, A)
                     vml_check_error()
                     return A
                 end
             end
         end)
         function ($jlname)(A::Array{$tin})
             out = similar(A, $tout)
-            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
+            ccall(($mklfn, MKL_jll.libmkl_rt), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
             vml_check_error()
             return out
         end
@@ -97,14 +88,14 @@ function def_binary_op(tin, tout, jlname, jlname!, mklname, broadcast)
         $(isempty(exports) ? nothing : Expr(:export, exports...))
         function ($jlname!)(out::Array{$tout,N}, A::Array{$tin,N}, B::Array{$tin,N}) where {N}
             size(out) == size(A) == size(B) || $(broadcast ? :(return broadcast!($jlname, out, A, B)) : :(throw(DimensionMismatch())))
-            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
+            ccall(($mklfn, MKL_jll.libmkl_rt), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
             vml_check_error()
             return out
         end
         function ($jlname)(A::Array{$tout,N}, B::Array{$tin,N}) where {N}
             size(A) == size(B) || $(broadcast ? :(return broadcast($jlname, A, B)) : :(throw(DimensionMismatch())))
             out = similar(A)
-            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
+            ccall(($mklfn, MKL_jll.libmkl_rt), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
             vml_check_error()
             return out
         end