Fix two bugs re setup

[mcabbott]

Fixes #2144, and a bug found in FluxML/model-zoo#374

[codecov-commenter]

Codecov Report

Base: 86.81% // Head: 84.19% // Decreases project coverage by -2.61% ⚠️

Coverage data is based on head (b5d9a89) compared to base (ba48ad0).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #2145      +/-   ##
==========================================
- Coverage   86.81%   84.19%   -2.62%     
==========================================
  Files          19       19              
  Lines        1471     1468       -3     
==========================================
- Hits         1277     1236      -41     
- Misses        194      232      +38     

Impacted Files	Coverage Δ
src/deprecations.jl	51.61% <100.00%> (+3.22%)	⬆️
src/train.jl	96.00% <100.00%> (ø)
src/cuda/cudnn.jl	0.00% <0.00%> (-90.91%)	⬇️
src/functor.jl	42.10% <0.00%> (-46.04%)	⬇️
src/layers/normalise.jl	86.66% <0.00%> (-2.43%)	⬇️
src/layers/conv.jl	87.93% <0.00%> (-0.07%)	⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.