Skip to content

Correct counting of shared parameters in Base.show. #2335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Correct counting of shared parameters in Base.show. #2335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d57436
Fixing `show` to not be confused by shared parameters.
codetalker7 Sep 14, 2023
918da32
Fixing implementation of `_big_finale` by adding two more methods for
codetalker7 Sep 21, 2023
bdce0f0
Minor fix.
codetalker7 Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/layers/show.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ function _big_finale(io::IO, m)
if length(ps) > 2
pars = underscorise(sum(length, ps; init=0))
bytes = Base.format_bytes(Base.summarysize(m))
noncnt = _childarray_sum(_->1, m) - length(ps)
unique_params = IdSet()
noncnt = _childarray_sum(_ -> 1, m, unique_params) - length(ps)
if noncnt > 0
nonparam = underscorise(_childarray_sum(length, m) - sum(length, ps; init=0))
printstyled(io, " "^08, "# Total: ", length(ps), " trainable arrays, "; color=:light_black)
Expand All @@ -110,6 +111,17 @@ end
_childarray_sum(f, x::AbstractArray{<:Number}) = f(x)
_childarray_sum(f, x) = isleaf(x) ? 0 : sum(y -> _childarray_sum(f, y), Functors.children(x),
init=0)
_childarray_sum(f, x::AbstractArray{<:Number}, idset::Base.IdSet) = f(x)
function _childarray_sum(f, x, idset::Base.IdSet)
isleaf(x) && return 0

if x in idset
return 0
else
push!(idset, x)
return sum(y -> _childarray_sum(f, y, idset), Functors.children(x), init = 0)
end
end

# utility functions

Expand Down