|
1 |
| -<<<<<<< HEAD |
2 |
| -# v0.12 deprecations |
3 |
| -@deprecate Dropout(p, dims) Dropout(p; dims=dims) |
4 |
| -@deprecate InstanceNorm(λ, β, γ, μ, σ², ϵ, momentum, active=nothing) InstanceNorm(λ, β, γ, μ, σ², ϵ, momentum, true, true, active, length(β)) |
5 |
| -@deprecate BatchNorm(λ, β, γ, μ, σ², ϵ, momentum, active=nothing) BatchNorm(λ, β, γ, μ, σ², ϵ, momentum, true, true, active, length(β)) |
6 |
| -@deprecate GroupNorm(G, λ, β, γ, μ, σ², ϵ, momentum, active=nothing) GroupNorm(G, λ, β, γ, μ, σ², ϵ, momentum, true, true, active, length(β)) |
7 |
| -@deprecate outdims(f, inputsize) outputsize(f, inputsize) |
8 |
| -@deprecate Conv(; weight, bias, activation=identity, kws...) Conv(weight, bias, activation; kws...) |
9 |
| -@deprecate ConvTranspose(; weight, bias, activation=identity, kws...) ConvTranspose(weight, bias, activation; kws...) |
10 |
| -@deprecate DepthwiseConv(; weight, bias, activation=identity, kws...) DepthwiseConv(weight, bias, activation; kws...) |
11 |
| - |
12 |
| -function Base.getproperty(a::Dense, s::Symbol) |
13 |
| - if s === :W |
14 |
| - Base.depwarn("field name dense.W is deprecated in favour of dense.weight", :Dense) |
15 |
| - return getfield(a, :weight) |
16 |
| - elseif s === :b |
17 |
| - Base.depwarn("field name dense.b is deprecated in favour of dense.bias", :Dense) |
18 |
| - return getfield(a, :bias) |
19 |
| - end |
20 |
| - return getfield(a, s) |
21 |
| -end |
22 |
| - |
23 |
| -function ones(dims...) |
24 |
| - Base.depwarn("Flux.ones(size...) is deprecated, please use Flux.ones32(size...) or Base.ones(Float32, size...)", :ones) |
25 |
| - Base.ones(Float32, dims...) |
26 |
| -end |
27 |
| -ones(T::Type, dims...) = Base.ones(T, dims...) |
28 |
| - |
29 |
| -function zeros(dims...) |
30 |
| - Base.depwarn("Flux.zeros(size...) is deprecated, please use Flux.zeros32(size...) or Base.zeros(Float32, size...)", :zeros) |
31 |
| - Base.zeros(Float32, dims...) |
32 |
| -end |
33 |
| -zeros(T::Type, dims...) = Base.zeros(T, dims...) |
34 |
| - |
35 |
| -ones32(::Type, dims...) = throw(ArgumentError("Flux.ones32 is always Float32, use Base.ones to specify the element type")) |
36 |
| -zeros32(::Type, dims...) = throw(ArgumentError("Flux.zeros32 is always Float32, use Base.zeros to specify the element type")) |
37 |
| - |
38 |
| - |
39 |
| -# v0.13 deprecations |
40 |
| -@deprecate Maxout(layers::Tuple) Maxout(layers...) |
41 |
| -======= |
42 |
| -# v0.13 deprecations |
43 |
| ->>>>>>> 3349d23d (remove all v0.12 deprecations) |
0 commit comments