Merge pull request #204 from aviks/as/jll

Update package to use jll

Author: CarloLucibello

.travis.yml

@@ -4,11 +4,11 @@ language: julia
 os:
   - linux
   - osx
-  # - windows   
-  
+  # - windows
+
 julia:
-  - 1.0
   - 1.3
+  - 1
   - nightly
 
 matrix:
@@ -28,4 +28,3 @@ env:
 # Submit to Codecov
 after_success:
   - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())';
-     

Manifest.toml

@@ -1,10 +1,22 @@
 # This file is machine-generated - editing it directly is not advised
 
-[[BinaryProvider]]
-deps = ["Libdl", "SHA"]
-git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
-uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
-version = "0.5.8"
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[Distributed]]
+deps = ["Random", "Serialization", "Sockets"]
+uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[LibGit2]]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
 
 [[Libdl]]
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -13,6 +25,31 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 deps = ["Libdl"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[NNPACK_jll]]
+deps = ["Libdl", "Pkg"]
+git-tree-sha1 = "c3d1a616362645754b18e12dbba96ec311b0867f"
+uuid = "a6bfbf70-4841-5cb9-aa18-3a8ad3c413ee"
+version = "2018.6.22+0"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
 [[Random]]
 deps = ["Serialization"]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -29,6 +66,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 [[Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
 [[SparseArrays]]
 deps = ["LinearAlgebra", "Random"]
 uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -37,6 +77,13 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[[Test]]
+deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
 [[UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

Project.toml

@@ -1,18 +1,18 @@
 name = "NNlib"
 uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
-version = "0.6.6"
+version = "0.6.7"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+NNPACK_jll = "a6bfbf70-4841-5cb9-aa18-3a8ad3c413ee"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
-BinaryProvider = "0.5"
 Requires = "0.5, 1.0"
-julia = "1"
+julia = "1.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

deps/build.jl

@@ -1,14 +1,19 @@
 module NNlib
+using Pkg
 using Requires
+using NNPACK_jll
 
 # Include APIs
 include("dim_helpers.jl")
 
-# NNPACK support
-include(joinpath(@__DIR__, "..", "deps", "deps.jl"))
-if check_deps() == nothing
+
+if isdefined(NNPACK_jll, :libnnpack)
   include("nnpack/NNPACK.jl")
 else
+  @warn "NNPACK not available for your platform: " *
+        "$( Pkg.BinaryPlatforms.platform_name(Pkg.BinaryPlatforms.platform_key_abi()))" *
+        "($( Pkg.BinaryPlatforms.triplet(Pkg.BinaryPlatforms.platform_key_abi())))
+        You will be able to use only the default Julia NNlib backend"
   is_nnpack_available() = false
 end
 

src/NNlib.jl

@@ -4,10 +4,6 @@ include("libnnpack.jl")
 include("performance.jl")
 include("interface.jl")
 
-const depsjl_path = joinpath(dirname(@__FILE__), "..", "..", "deps", "deps.jl")
-if !isfile(depsjl_path)
-    error("NNPACK not installed properly, run Pkg.build(\"NNlib\"), restart Julia and try again")
-end
 
 const shared_threadpool_dict = Dict{UInt64, Base.RefValue}()
 
@@ -17,7 +13,6 @@ const shared_threadpool_dict = Dict{UInt64, Base.RefValue}()
 Checks if the current hardware is supported by NNPACK.
 """
 function is_nnpack_available()
-    check_deps() isa Nothing || return false
     status = nnp_initialize()
     if status == nnp_status_unsupported_hardware
         return false
@@ -42,7 +37,6 @@ function allocate_threadpool()
 end
 
 @init begin
-    check_deps()
     status = nnp_initialize()
     if status == nnp_status_unsupported_hardware
         @warn "Hardware is unsupported by NNPACK so falling back to default NNlib"