Drop Flux v0.12 compatibility (#99)

* Drop Flux `v0.12` compatibility

* Fix for Flux `v0.13.0`

Author: adrhill

Project.toml

@@ -20,7 +20,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 [compat]
 ColorSchemes = "3.18"
 Distributions = "0.25"
-Flux = "0.12, 0.13"
+Flux = "0.13"
 ImageCore = "0.8, 0.9"
 ImageTransformations = "0.9"
 PrettyTables = "1"

src/flux_types.jl

@@ -1,6 +1,6 @@
 ## Layer types
 """Union type for convolutional layers."""
-const ConvLayer = Union{Conv, ConvTranspose, CrossCor}
+const ConvLayer = Union{Conv,ConvTranspose,CrossCor}
 
 """Union type for dropout layers."""
 const DropoutLayer = Union{Dropout,typeof(Flux.dropout),AlphaDropout}

src/flux_utils.jl

@@ -92,7 +92,9 @@ function preactivation(d::Dense, x::AbstractArray)
     return reshape(d(reshape(x, size(x, 1), :)), :, size(x)[2:end]...)
 end
 function preactivation(c::Conv, x)
-    cdims = Flux.conv_dims(c, x)
+    cdims = Flux.DenseConvDims(
+        x, c.weight; stride=c.stride, padding=c.pad, dilation=c.dilation, groups=c.groups
+    )
     return Flux.conv(x, c.weight, cdims) .+ Flux.conv_reshape_bias(c)
 end
 
@@ -101,7 +103,9 @@ function preactivation(c::ConvTranspose, x)
     return Flux.∇conv_data(x, c.weight, cdims) .+ Flux.conv_reshape_bias(c)
 end
 function preactivation(c::CrossCor, x)
-    cdims = Flux.crosscor_dims(c, x)
+    cdims = Flux.DenseConvDims(
+        x, c.weight; stride=c.stride, padding=c.pad, dilation=c.dilation
+    )
     return Flux.crosscor(x, c.weight, cdims) .+ Flux.conv_reshape_bias(c)
 end
 function preactivation(l, x)

src/lrp/rules.jl

@@ -68,8 +68,7 @@ function modify_layer!(rule::R, layer::L; ignore_bias=false) where {R,L}
 
     # Checks that skip bias modification:
     ignore_bias && return nothing
-    isa(layer.bias, Flux.Zeros) && return nothing # skip if bias=Flux.Zeros (Flux <= v0.12)
-    isa(layer.bias, Bool) && !layer.bias && return nothing  # skip if bias=false (Flux >= v0.13)
+    isa(layer.bias, Bool) && !layer.bias && return nothing
 
     modify_bias!(rule, layer.bias)
     return nothing