Skip to content

Commit 92d322b

Browse files
committed
simplify type parameters
1 parent fe52493 commit 92d322b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/conv.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ padtuple(x::Tuple,p::Integer) = map(_->p, head(head(x)))
2424
padtuple(x::Tuple,p::Tuple) = p
2525
padtuple(x::AbstractArray,p) = padtuple(size(x),p)
2626

27-
function conv(x::A, w::B; pad = 0, stride = 1, dilation = 1) where {A<:AbstractArray, B<:AbstractArray}
27+
function conv(x::AbstractArray, w::AbstractArray; pad = 0, stride = 1, dilation = 1)
2828
pad_, stride_ = padtuple(x, pad), padtuple(x, stride)
2929
conv!(similar(x, cdims(size(x), dilation_dims(w, dilation), pad_, stride_)),
3030
x, w, pad = pad_, stride = stride_, dilation = dilation)
@@ -36,10 +36,10 @@ function crosscor(x::A, w::A; pad = 0, stride = 1, dilation = 1) where A<:Abstra
3636
x, w, pad = pad_, stride = stride_, dilation = dilation)
3737
end
3838

39-
∇conv_data(dy::A, x::B, w::C; pad = 0, stride = 1, dilation = 1, flipkernel = 0) where {A<:AbstractArray, B<:AbstractArray, C<:AbstractArray} =
39+
∇conv_data(dy::AbstractArray, x::AbstractArray, w::AbstractArray; pad = 0, stride = 1, dilation = 1, flipkernel = 0) =
4040
∇conv_data!(zero(x), dy, x, w; pad = pad, stride = stride, dilation = dilation, flipkernel=flipkernel)
4141

42-
∇conv_filter(dy::A, x::B, w::C; pad = 0, stride = 1, dilation = 1, flipkernel=0) where {A<:AbstractArray, B<:AbstractArray, C<:AbstractArray} =
42+
∇conv_filter(dy::AbstractArray, x::AbstractArray, w::AbstractArray; pad = 0, stride = 1, dilation = 1, flipkernel=0) =
4343
∇conv_filter!(zero(w), dy, x, w; pad = pad, stride = stride, dilation = dilation, flipkernel=flipkernel)
4444

4545
# N-D dispatch
@@ -102,7 +102,7 @@ function dcdims(x::NTuple{4,Int}, w::NTuple{4,Int}, pad, stride)
102102
((x[1] + 2 * pad[1] - w[1])÷stride[1] + 1,(x[2] + 2 * pad[2] - w[2])÷stride[2] + 1,w[3]*w[4],x[4])
103103
end
104104

105-
function depthwiseconv(x::A, w::B; pad = 0, stride = 1) where {A<:AbstractArray, B<:AbstractArray}
105+
function depthwiseconv(x::AbstractArray, w::AbstractArray; pad = 0, stride = 1)
106106
pad_, stride_ = padtuple(x, pad), padtuple(x, stride)
107107
depthwiseconv!(similar(x, dcdims(size(x), size(w), pad_, stride_)), x, w, pad = pad_, stride = stride_)
108108
end
@@ -120,10 +120,10 @@ depthwisecrosscor!(y::AbstractArray{T,4}, x::AbstractArray{T,4}, w::AbstractArra
120120
pad = 0, stride = 1) where T =
121121
depthwiseconv!(y, x, w, pad = pad, stride = stride, flipkernel=1)
122122

123-
∇depthwiseconv_data(dy::A, x::B, w::C; pad = 0, stride = 1, flipkernel=0) where {A<:AbstractArray, B<:AbstractArray, C<:AbstractArray} =
123+
∇depthwiseconv_data(dy::AbstractArray, x::AbstractArray, w::AbstractArray; pad = 0, stride = 1, flipkernel=0) =
124124
∇depthwiseconv_data!(zero(x), dy, x, w; pad = pad, stride = stride, flipkernel=flipkernel)
125125

126-
∇depthwiseconv_filter(dy::A, x::B, w::C; pad = 0, stride = 1, flipkernel=0) where {A<:AbstractArray, B<:AbstractArray, C<:AbstractArray} =
126+
∇depthwiseconv_filter(dy::AbstractArray, x::AbstractArray, w::AbstractArray; pad = 0, stride = 1, flipkernel=0) =
127127
∇depthwiseconv_filter!(zero(w), dy, x, w; pad = pad, stride = stride, flipkernel=flipkernel)
128128

129129
∇depthwiseconv_filter!(dw::AbstractArray{T,4}, dy::AbstractArray{T,4}, x::AbstractArray{T,4}, w::AbstractArray{T,4};

0 commit comments

Comments
 (0)