Remove some ambiguities.

Author: maleadt

lib/cudadrv/state.jl

@@ -470,7 +470,7 @@ function Base.get(x::PerDevice, dev::CuDevice, val)
     end
 end
 
-function Base.get!(constructor::F, x::PerDevice{T}, dev::CuDevice) where {F, T}
+function Base.get!(constructor::F, x::PerDevice{T}, dev::CuDevice) where {F <: Base.Callable, T}
     y = get_values(x)
     id = deviceid(dev)+1
     ctx = device_context(id)    # may be nothing

lib/cudadrv/synchronization.jl

@@ -43,7 +43,7 @@ function Base.put!(c::BidirectionalChannel{T}, v::T) where T
     end
 end
 
-function Base.take!(f, c::BidirectionalChannel{T}) where T
+function Base.take!(f::Base.Callable, c::BidirectionalChannel{T}) where T
     lock(c)
     try
         # notify the producer that we're ready to accept a value

lib/utils/threading.jl

@@ -23,7 +23,7 @@ end
 LazyInitialized{T}(validator=nothing) where {T} =
     LazyInitialized{T,typeof(validator)}(Threads.Atomic{Int}(0), Ref{T}(), validator)
 
-@inline function Base.get!(constructor, x::LazyInitialized)
+@inline function Base.get!(constructor::Base.Callable, x::LazyInitialized)
     while x.guard[] != 2
         initialize!(x, constructor)
     end

src/device/texture.jl

@@ -56,11 +56,15 @@ end
 Base.Tuple(x::Vec4) = tuple(x.a, x.b, x.c, x.d)
 
 for (dispatch_rettyp, julia_rettyp, llvm_rettyp) in
-        ((:Signed,        :(Vec4{UInt32}),  :v4u32),
-         (:Unsigned,      :(Vec4{Int32}),   :v4s32),
+        ((:Signed,        :(Vec4{Int32}),   :v4u32),
+         (:Unsigned,      :(Vec4{UInt32}),  :v4s32),
          (:AbstractFloat, :(Vec4{Float32}), :v4f32))
 
-    eltyp = :(Union{$dispatch_rettyp, NTuple{<:Any,$dispatch_rettyp}})
+    eltyp = :(Union{$dispatch_rettyp,
+                    NTuple{1,$dispatch_rettyp},
+                    NTuple{2,$dispatch_rettyp},
+                    NTuple{3,$dispatch_rettyp},
+                    NTuple{4,$dispatch_rettyp}})
 
     # tex1D only supports array memory
     @eval tex(texObject::CuDeviceTexture{<:$eltyp,1,ArrayMemory}, x::Number) =
@@ -74,7 +78,7 @@ for (dispatch_rettyp, julia_rettyp, llvm_rettyp) in
         julia_sig = ntuple(_->Float32, dims)
         julia_params = ntuple(i->:($(julia_args[i])::Number), dims)
 
-        @eval tex(texObject::CuDeviceTexture{<:$eltyp,$dims,}, $(julia_params...)) =
+        @eval tex(texObject::CuDeviceTexture{<:$eltyp,$dims}, $(julia_params...)) =
             Tuple(ccall($("llvm.nvvm.tex.unified.$llvm_dim.$llvm_rettyp.f32"), llvmcall,
                         $julia_rettyp, (CUtexObject, $(julia_sig...)), texObject, $(julia_args...)))
     end

test/base/aqua.jl

@@ -9,7 +9,7 @@ let ambs = Aqua.detect_ambiguities(CUDA; recursive=true)
     pkg_match(pkgname, pkgdir::Nothing) = false
     pkg_match(pkgname, pkgdir::AbstractString) = occursin(pkgname, pkgdir)
     filter!(x -> pkg_match("CUDA", pkgdir(last(x).module)), ambs)
-    @test length(ambs) ≤ 51
+    @test length(ambs) ≤ 18
 end
 
 Aqua.test_undefined_exports(CUDA)