Manage own dependency instead of MKL

Author: Crown421

Project.toml

@@ -3,14 +3,15 @@ uuid = "c8ce9da6-5d36-5c03-b118-5a70151be7bc"
 version = "0.2.1"
 
 [deps]
+BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 CpuId = "adafc99b-e345-5852-983c-f28acb93d879"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 
 [compat]
-julia = "0.7, 1.0"
 CpuId = "0.2"
 SpecialFunctions = "0.8, 0.9, 0.10"
+julia = "0.7, 1.0"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

deps/.gitignore

@@ -1,2 +1,4 @@
 deps.jl
-build.log
+build.log
+
+usr/

deps/build.jl

@@ -1,37 +1,62 @@
-
+using BinaryProvider # requires BinaryProvider 0.3.0 or later
 using CpuId
-using Libdl
-
-## this lets us load CpuId only once 
 
 if cpufeature(:AVX2)
-    libsuffix = :avx2
+    avxlib = "avx2"
     println("AVX2 support detected, vml_avx2 selected")
 else
-    libsuffix = :avx
+    avxlib = "avx"
     println("AVX2 support missing, vml_avx selected")
 end
 
-if Sys.iswindows()
-    rtlib = :mkl_rt
-    corelib = :mkl_core
-    lib = Symbol(:mkl_vml_, libsuffix)
-else
-    rtlib = :libmkl_rt
-    corelib = :libmkl_core
-    lib = Symbol(:libmkl_vml_, libsuffix)
-end
+# Parse some basic command-line arguments
+const verbose = "--verbose" in ARGS
+const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
+
+baseproducts = [("mkl_core", :libmkl_core), 
+                ("mkl_rt", :libmkl_rt),
+                ("mkl_vml_" * avxlib, :libmkl_vml_avx)]
+# if Sys.iswindows()
+#     push!(baseproducts, ("mkl_intel_thread", :libmkl_intel_thread))
+# end
+
+products = [LibraryProduct(prefix, ["lib"*bp[1], bp[1]], bp[2]) for bp in baseproducts]
 
+# Download binaries from hosted location
+bin_prefix = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/MKL-v2019.0.117"
 
-depsjl_path = joinpath(@__DIR__, "deps.jl")
-open(depsjl_path, "w") do depsjl_file
-    println(depsjl_file, strip("""
-        ## This file was autogenerated by build.jl.
-        ## Do not edit.
-        import Libdl
+# Listing of files generated by BinaryBuilder:
+download_info = Dict(
+    Linux(:x86_64)   => ("$bin_prefix/MKL.v2019.0.117.x86_64-linux-gnu.tar.gz", "9a496908c05eccdb331218f4cf32229b024790b30bf7bc0ca0f5587e030d34e6"),
+    Linux(:i686)     => ("$bin_prefix/MKL.v2019.0.117.i686-linux-gnu.tar.gz", "ccdce675bf48738f28878bc831231498c7c9560a94f756da8c114f664790ffee"),
+    MacOS(:x86_64)   => ("$bin_prefix/MKL.v2019.0.117.x86_64-apple-darwin14.tar.gz", "605da525b16f61837bc35834f3a6ff90609b1d0a5f1606faa25bf45180ced6e9"),
+    Windows(:x86_64) => ("$bin_prefix/MKL.v2019.0.117.x86_64-w64-mingw32.tar.gz", "0a9aaac254421fde0f26a95856b595deb8cce85d039050d8167293d049fd716d"),
+    Windows(:i686)   => ("$bin_prefix/MKL.v2019.0.117.i686-w64-mingw32.tar.gz", "53cac3a29bbb2acdc383297c256e3b68b3d4712e1b83417226da4971582e80cd"),
+)
 
-        const lib = :$lib
-        const rtlib = :$rtlib
-        const corelib = :$corelib
-        """))
+# Install unsatisfied or updated dependencies:
+unsatisfied = any(!satisfied(p; verbose=verbose) for p in products)
+dl_info = choose_download(download_info, platform_key_abi())
+if dl_info === nothing && unsatisfied
+    # If we don't have a compatible .tar.gz to download, complain.
+    # Alternatively, you could attempt to install from a separate provider,
+    # build from source or something even more ambitious here.
+    error("Your platform (\"$(Sys.MACHINE)\", parsed as \"$(triplet(platform_key_abi()))\") is not supported by this package!")
 end
+
+# If we have a download, and we are unsatisfied (or the version we're
+# trying to install is not itself installed) then load it up!
+if unsatisfied || !isinstalled(dl_info...; prefix=prefix)
+    # Download and install binaries
+    install(dl_info...; prefix=prefix, force=true, verbose=verbose)
+end
+
+# Write out a deps.jl file that will contain mappings for our products
+write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose)
+
+# cleanup for lean install 
+libfiles = readdir("usr/lib")
+idx = .!mapreduce(p -> occursin.(p[1], libfiles), (x,y) -> x.|y, baseproducts)
+rm.("usr/lib/" .* libfiles[idx])
+
+rm("usr/downloads/", recursive = true)

src/IntelVectorMath.jl

@@ -7,8 +7,8 @@ const IVM = IntelVectorMath
 
 # import Base: .^, ./
 using SpecialFunctions
-using Libdl
-include(joinpath(dirname(@__DIR__), "deps/deps.jl"))
+# using Libdl
+include("../deps/deps.jl")
 
 include("setup.jl")
 

src/setup.jl

@@ -1,17 +1,10 @@
 
 function __init__()
-    MKLpkgid = Base.PkgId(Base.UUID("33e6dc65-8f57-5167-99aa-e5a354878fb2"), "MKL")
-    mklpath = Base.locate_package(MKLpkgid)
-    if mklpath != nothing
-        libpath = normpath(joinpath(dirname(mklpath), "../deps/usr/lib"))
-        push!(Libdl.DL_LOAD_PATH, libpath)
-    elseif isempty(Libdl.find_library(rtlib))
-        error("Could not find MKL shared libraries. Please add MKL.jl or install MKL via the intel website. See the github repository for more details.)")
-    end
+    check_deps()
 
-    Libdl.dlopen(rtlib, RTLD_GLOBAL)
-    Libdl.dlopen(corelib, RTLD_GLOBAL) # maybe only needed on mac
-    Libdl.dlopen(lib, RTLD_GLOBAL)
+    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
 
@@ -30,15 +23,15 @@ const _BINARY = []
 
 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, lib), Cuint, ())
-vml_set_mode(mode::Integer) = (ccall((:_vmlSetMode, lib), Cuint, (UInt,), mode); nothing)
+vml_get_mode() = ccall((:_vmlGetMode, libmkl_vml_avx), Cuint, ())
+vml_set_mode(mode::Integer) = (ccall((:_vmlSetMode, libmkl_vml_avx), 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, lib), Cint, ())
+    vml_error = ccall((:_vmlClearErrStatus, libmkl_vml_avx), Cint, ())
     if vml_error != 0
         if vml_error == 1
             throw(DomainError(-1, "This function does not support arguments outside its domain"))
@@ -76,7 +69,7 @@ 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, lib), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
+            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
             vml_check_error()
             return out
         end
@@ -91,7 +84,7 @@ function def_unary_op(tin, tout, jlname, jlname!, mklname;
         end)
         function ($jlname)(A::Array{$tin})
             out = similar(A, $tout)
-            ccall(($mklfn, lib), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
+            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tout}), length(A), A, out)
             vml_check_error()
             return out
         end
@@ -109,14 +102,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, lib), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
+            ccall(($mklfn, libmkl_vml_avx), 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, lib), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
+            ccall(($mklfn, libmkl_vml_avx), Nothing, (Int, Ptr{$tin}, Ptr{$tin}, Ptr{$tout}), length(A), A, B, out)
             vml_check_error()
             return out
         end