From b080f5c82e080d2aebff2f5f00c5d2612da2e4d9 Mon Sep 17 00:00:00 2001
From: tejank10 <tejank10@gmail.com>
Date: Sun, 15 Apr 2018 20:32:40 +0530
Subject: [PATCH] Scalar pad and stride

---
 src/layers/conv.jl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/layers/conv.jl b/src/layers/conv.jl
index e8054829..addef9fc 100644
--- a/src/layers/conv.jl
+++ b/src/layers/conv.jl
@@ -1,5 +1,8 @@
 using NNlib: conv
 
+expand(::Type{Val{N}}, i::Integer) where N = ntuple(_ -> i, Val{N})
+expand(::Type{Val{N}}, i::NTuple{N, Integer}) where N = i
+
 """
     Conv(size, in=>out)
     Conv(size, in=>out, relu)
@@ -24,16 +27,10 @@ Conv(w::AbstractArray{T}, b::AbstractVector{T}, σ = identity;
        stride = 1, pad = 0) where T =
   Conv(σ, w, b, stride, pad)
 
-#Conv(k::NTuple{N,Integer}, ch::Pair{<:Integer,<:Integer}, σ = identity; init = initn,
-#     stride::NTuple{N,Integer} = map(_->1,k),
-#     pad::NTuple{N,Integer} = map(_->0,k)) where N =
-#  Conv(param(init(k..., ch...)), param(zeros(ch[2])), σ,
-#       stride = stride, pad = pad)
-
 Conv(k::NTuple{N,Integer}, ch::Pair{<:Integer,<:Integer}, σ = identity; init = initn,
-     stride::Integer = 1, pad::Integer = 0) where N =
+     stride = 1, pad = 0) where N =
   Conv(param(init(k..., ch...)), param(zeros(ch[2])), σ,
-       stride = map(_->stride,k), pad = map(_->pad,k))
+       stride = expand(Val{N}, stride), pad = expand(Val{N}, pad))
 
 Flux.treelike(Conv)