From d19d23578d75d4b63e0c7eace58826a7254804b0 Mon Sep 17 00:00:00 2001 From: Michael Abbott <32575566+mcabbott@users.noreply.github.com> Date: Sun, 27 Aug 2023 20:46:19 -0400 Subject: [PATCH] remove name from at-compact --- src/compact.jl | 2 +- test/compact.jl | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/compact.jl b/src/compact.jl index c871dc3..a257131 100644 --- a/src/compact.jl +++ b/src/compact.jl @@ -157,7 +157,7 @@ function Flux._big_show(io::IO, obj::CompactLayer, indent::Int=0, name=nothing) setup_strings = obj.setup_strings layer, input, block = obj.strings pre, post = ("(", ")") - println(io, " "^indent, isnothing(name) ? "" : "$name = ", layer, pre) + println(io, " "^indent, "@compact", pre) for k in keys(obj.variables) v = obj.variables[k] if Flux._show_leaflike(v) diff --git a/test/compact.jl b/test/compact.jl index e27f971..605ff03 100644 --- a/test/compact.jl +++ b/test/compact.jl @@ -139,6 +139,28 @@ end @test similar_strings(get_model_string(model2), expected_string) end +#= # This test is broken: + +julia> model1 = @compact(w1=Dense(32=>32, relu), w2=Dense(32=>32, relu)) do x + w2(w1(x)); + +julia> model2 = @compact(w1=model1, w2=Dense(32=>32, relu)) do x + w2(w1(x)) + end +@compact( + @compact( + w1 = Dense(32 => 32, relu), # 1_056 parameters + w2 = Dense(32 => 32, relu), # 1_056 parameters + ) do x + w2(w1(x)) + end, + w2 = Dense(32 => 32, relu), # 1_056 parameters +) do x + w2(w1(x)) +end # Total: 6 arrays, 3_168 parameters, 13.239 KiB. + +=# + @testset "Array parameters" begin model = @compact(x=randn(32), w=Dense(32=>32)) do s w(x .* s)