NNPACK convolution does not support stride

Author: Avik Pal

src/conv.jl

@@ -156,10 +156,8 @@ end
 # Use NNPACK if it is available and the operation is supported
 if is_nnpack_available()
     function conv(x::Array{xT, 4}, w::Array{wT, 4},
-                  cdims::DenseConvDims{2, K, C_in, C_out, S, P, (1, 1), F};
+                  cdims::DenseConvDims{2, K, C_in, C_out, (1, 1), P, (1, 1), F};
                   kwargs...) where {xT, wT, K, C_in, C_out, S, P, F}
-        func = check_supported_operation(x, cdims) ? conv_nnpack : 
-               xT == wT ? conv_im2col : conv_direct
-        return func(x, w, cdims; kwargs...)
+        return conv_nnpack(x, w, cdims; kwargs...)
     end
 end

src/nnpack/interface.jl

@@ -51,18 +51,6 @@ function maxpool_nnpack(x::Array{T, 4}, pdims::PoolDims; kwargs...) where {T}
 end
 
 
-"""
-    check_supported_operation(x::Array, cdims::DenseConvDims)
-
-Returns `true` if nnpack supports the convolution operation for the given input.
-"""
-function check_supported_operation(x::Array{T, 4}, cdims::DenseConvDims{2, K, C_in,
-                                   C_out, S, P, (1, 1), F}) where {T, K, C_in, C_out, S, P, F}
-    val = size(x)[1:2] .+ (P[1] + P[2], P[3] + P[4]) .- K
-    return val .% S == (0, 0) ? true : false
-end
-
-
 """
     check_supported_operation(x::Array, pdims::PoolDims)
 

src/pooling.jl

@@ -132,7 +132,7 @@ end
 # Use NNPACK if it is available and operation is supported
 if is_nnpack_available()
     function maxpool(x::Array{T, 4}, pdims::PoolDims{2, K, S, P, (1, 1)}; kwargs...) where {T, K, S, P}
-        func = check_supported_operation(x, pdims) ? maxpool_nnpack : maxpool_im2col
+        func = check_supported_operation(x, pdims) ? maxpool_nnpack : maxpool_direct
         return func(x, pdims; kwargs...)
     end
 end