Merge pull request #245 from JuliaGPU/tb/map

Simplify map dispatch.

Author: maleadt

.gitlab-ci.yml

@@ -4,21 +4,6 @@ include:
 
 # Julia versions
 
-julia:1.0:
-  extends:
-    - .julia:1.0
-    - .test
-
-julia:1.1:
-  extends:
-    - .julia:1.1
-    - .test
-
-julia:1.2:
-  extends:
-    - .julia:1.2
-    - .test
-
 julia:1.3:
   extends:
     - .julia:1.3

.travis.yml

@@ -8,9 +8,6 @@ os:
 dist: trusty
 
 julia:
-  - 1.0
-  - 1.1
-  - 1.2
   - 1.3
   - nightly
 

Project.toml

@@ -13,7 +13,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 [compat]
 AbstractFFTs = "0.4, 0.5"
 Adapt = "0.4.1, 1.0"
-julia = "1.0"
+julia = "1.3"
 
 [extras]
 FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"

src/host/base.jl

@@ -1,24 +1,5 @@
 # common Base functionality
 
-allequal(x) = true
-allequal(x, y, z...) = x == y && allequal(y, z...)
-function Base.map!(f, y::AbstractGPUArray, xs::AbstractGPUArray...)
-    @assert allequal(size.((y, xs...))...)
-    return y .= f.(xs...)
-end
-function Base.map(f, y::AbstractGPUArray, xs::AbstractGPUArray...)
-    @assert allequal(size.((y, xs...))...)
-    return f.(y, xs...)
-end
-
-# Break ambiguities with base
-Base.map!(f, y::AbstractGPUArray) =
-    invoke(map!, Tuple{Any,AbstractGPUArray,Vararg{AbstractGPUArray}}, f, y)
-Base.map!(f, y::AbstractGPUArray, x::AbstractGPUArray) =
-    invoke(map!, Tuple{Any,AbstractGPUArray, Vararg{AbstractGPUArray}}, f, y, x)
-Base.map!(f, y::AbstractGPUArray, x1::AbstractGPUArray, x2::AbstractGPUArray) =
-    invoke(map!, Tuple{Any,AbstractGPUArray, Vararg{AbstractGPUArray}}, f, y, x1, x2)
-
 function Base.repeat(a::AbstractGPUVecOrMat, m::Int, n::Int = 1)
     o, p = size(a, 1), size(a, 2)
     b = similar(a, o*m, p*n)

src/host/broadcast.jl

@@ -82,3 +82,19 @@ end
 # `fill!` in general for all `GPUDestArray` so we just go straight to the fallback
 @inline Base.copyto!(dest::GPUDestArray, bc::Broadcasted{<:Broadcast.AbstractArrayStyle{0}}) =
     copyto!(dest, convert(Broadcasted{Nothing}, bc))
+
+
+## map
+
+allequal(x) = true
+allequal(x, y, z...) = x == y && allequal(y, z...)
+
+function Base.map!(f, y::AbstractGPUArray, xs::AbstractArray...)
+    @assert allequal(size.((y, xs...))...)
+    return y .= f.(xs...)
+end
+
+function Base.map(f, y::AbstractGPUArray, xs::AbstractArray...)
+    @assert allequal(size.((y, xs...))...)
+    return f.(y, xs...)
+end

src/host/quirks.jl

@@ -3,25 +3,23 @@
 # NOTE: without contextual dispatch, we can only redefine methods where a GPU-specific
 #       type occurs in the signature (or we'll get a "fatal precompilation failure" error)
 
-if VERSION >= v"1.3.0-alpha.107"
-    _bcs1(a::Integer, b::Integer) = a == 1 ? b : (b == 1 ? a : (a == b ? a : throw(DimensionMismatch("arrays could not be broadcast to a common size"))))
-    _bcs1(a::Integer, b) = a == 1 ? b : (first(b) == 1 && last(b) == a ? b : throw(DimensionMismatch("arrays could not be broadcast to a common size")))
-    _bcs1(a, b::Integer) = _bcs1(b, a)
-    _bcs1(a, b) = Broadcast._bcsm(b, a) ? Broadcast.axistype(b, a) : (Broadcast._bcsm(a, b) ? Broadcast.axistype(a, b) : throw(DimensionMismatch("arrays could not be broadcast to a common size")))
+_bcs1(a::Integer, b::Integer) = a == 1 ? b : (b == 1 ? a : (a == b ? a : throw(DimensionMismatch("arrays could not be broadcast to a common size"))))
+_bcs1(a::Integer, b) = a == 1 ? b : (first(b) == 1 && last(b) == a ? b : throw(DimensionMismatch("arrays could not be broadcast to a common size")))
+_bcs1(a, b::Integer) = _bcs1(b, a)
+_bcs1(a, b) = Broadcast._bcsm(b, a) ? Broadcast.axistype(b, a) : (Broadcast._bcsm(a, b) ? Broadcast.axistype(a, b) : throw(DimensionMismatch("arrays could not be broadcast to a common size")))
 
-    _bcs(::Tuple{}, ::Tuple{}) = ()
-    _bcs(::Tuple{}, newshape::Tuple) = (newshape[1], _bcs((), Base.tail(newshape))...)
-    _bcs(shape::Tuple, ::Tuple{}) = (shape[1], _bcs(Base.tail(shape), ())...)
-    function _bcs(shape::Tuple, newshape::Tuple)
-        return (_bcs1(shape[1], newshape[1]), _bcs(Base.tail(shape), Base.tail(newshape))...)
-    end
+_bcs(::Tuple{}, ::Tuple{}) = ()
+_bcs(::Tuple{}, newshape::Tuple) = (newshape[1], _bcs((), Base.tail(newshape))...)
+_bcs(shape::Tuple, ::Tuple{}) = (shape[1], _bcs(Base.tail(shape), ())...)
+function _bcs(shape::Tuple, newshape::Tuple)
+    return (_bcs1(shape[1], newshape[1]), _bcs(Base.tail(shape), Base.tail(newshape))...)
+end
 
-    broadcast_shape(shape::Tuple) = shape
-    broadcast_shape(shape::Tuple, shape1::Tuple, shapes::Tuple...) = broadcast_shape(_bcs(shape, shape1), shapes...)
+broadcast_shape(shape::Tuple) = shape
+broadcast_shape(shape::Tuple, shape1::Tuple, shapes::Tuple...) = broadcast_shape(_bcs(shape, shape1), shapes...)
 
-    @inline combine_axes(A, B...) = broadcast_shape(axes(A), combine_axes(B...))
-    combine_axes(A) = axes(A)
+@inline combine_axes(A, B...) = broadcast_shape(axes(A), combine_axes(B...))
+combine_axes(A) = axes(A)
 
-    Broadcast._axes(::Broadcasted{<:AbstractGPUArrayStyle}, axes::Tuple) = axes
-    @inline Broadcast._axes(bc::Broadcasted{<:AbstractGPUArrayStyle}, ::Nothing) = combine_axes(bc.args...)
-end
+Broadcast._axes(::Broadcasted{<:AbstractGPUArrayStyle}, axes::Tuple) = axes
+@inline Broadcast._axes(bc::Broadcasted{<:AbstractGPUArrayStyle}, ::Nothing) = combine_axes(bc.args...)