Warn about missing libraries.

src/CuArrays.jl

@@ -37,6 +37,7 @@ let
             Base.include_dependency(path)
         end
         @eval global const $lib = $path
+        @eval macro $lib() $lib === nothing ? error($"Your installation does not provide $lib, CuArrays.$(uppercase(name)) is unavailable") : $lib end
     end
 end
 
@@ -65,7 +66,7 @@ include("sparse/CUSPARSE.jl")
 include("solver/CUSOLVER.jl")
 include("fft/CUFFT.jl")
 include("rand/CURAND.jl")
-libcudnn !== nothing && include("dnn/CUDNN.jl")
+include("dnn/CUDNN.jl")
 
 include("nnlib.jl")
 
@@ -89,7 +90,7 @@ function __init__()
         CUSOLVER._sparse_handle[] = C_NULL
         CUSPARSE._handle[] = C_NULL
         CURAND._generator[] = nothing
-        isdefined(CuArrays, :CUDNN) && (CUDNN._handle[] = C_NULL)
+        CUDNN._handle[] = C_NULL
     end
     push!(CUDAnative.device!_listeners, callback)
 

src/dnn/CUDNN.jl

@@ -5,13 +5,14 @@ import CUDAapi
 import CUDAdrv: CUDAdrv, CuContext, CuPtr, CU_NULL
 
 using ..CuArrays
-using ..CuArrays: libcudnn, active_context, unsafe_free!
+using ..CuArrays: @libcudnn, active_context, unsafe_free!
 using ..CuArrays: CuVecOrMat, CuVector
+
 using NNlib
 import NNlib: conv!, ∇conv_filter!, ∇conv_data!, stride, dilation, flipkernel,
   maxpool!, meanpool!, ∇maxpool!, ∇meanpool!, spatial_dims, padding, kernel_size,
   softmax, softmax!, ∇softmax!, logsoftmax, logsoftmax!, ∇logsoftmax
-using CUDAnative
+
 include("libcudnn_types.jl")
 include("error.jl")
 

src/dnn/nnlib.jl

@@ -1,8 +1,8 @@
+import ..CuArrays: CuVecOrMat, CuVector
+
 import NNlib: conv!, ∇conv_filter!, ∇conv_data!,
   maxpool!, meanpool!, ∇maxpool!, ∇meanpool!,
   softmax, softmax!, ∇softmax!, logsoftmax, logsoftmax!, ∇logsoftmax
-import ..CuArrays: CuVecOrMat, CuVector
-using CUDAnative
 
 
 # Softmax

src/nnlib.jl

@@ -32,15 +32,3 @@ end
 end
 
 @cufunc softplus(x) = log1p(exp(x))
-
-if !@isdefined CUDNN
-  function conv!(y::CuArray, x::CuArray, w::CuArray; kw...)
-    error("CUDNN is not installed.")
-  end
-  function softmax!(out::CuVecOrMat, xs::CuVecOrMat)
-    error("CUDNN is not installed.")
-  end
-  function logsoftmax!(out::CuVecOrMat, xs::CuVecOrMat)
-    error("CUDNN is not installed.")
-  end
-end

test/base.jl

@@ -121,7 +121,7 @@ end
   @test testf(x -> log.(x), rand(3,3))
   @test testf((x,xs) -> log.(x.+xs), Ref(1), rand(3,3))
 
-  if isdefined(CuArrays, :CUDNN)
+  if CuArrays.libcudnn !== nothing
     using NNlib
 
     @test testf(x -> logσ.(x), rand(5))

test/dnn.jl

@@ -1,9 +1,10 @@
 @testset "CUDNN" begin
 
-if !isdefined(CuArrays, :CUDNN)
+using CuArrays.CUDNN
+
+if CuArrays.libcudnn === nothing
 @warn "Not testing CUDNN"
 else
-using CuArrays.CUDNN
 @info "Testing CUDNN $(CUDNN.version())"
 
 @testset "NNlib" begin
@@ -52,7 +53,7 @@ using CuArrays.CUDNN
     @test testf((dy, y, x) -> ∇maxpool(dy, y, x, pdims), dy, y, x)
     @test testf(x -> maxpool(x, pdims), x)
     @test testf((dy, y, x) -> ∇maxpool(dy, y, x, pdims), dy, y, x)
-  
+
     # CPU implementation of ∇conv_bias!
     db = zeros(Float64, 1, 1, 3, 1)
     function CuArrays.CUDNN.∇conv_bias!(db, y)