Skip to content
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

Don't use update predictor when step size is zero #202

Merged
merged 2 commits into from
May 9, 2021
Merged

Don't use update predictor when step size is zero #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68007ed
don't use update predictor when step size is zero
IanButterworth May 8, 2021
943aef8
relax perf test a little
IanButterworth May 8, 2021
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
25 changes: 15 additions & 10 deletions src/ProgressMeter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,14 @@ function calc_check_iterations(p, t)
end

# update progress display
function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, valuecolor = :blue, offset::Integer = p.offset, keep = (offset == 0), desc::Union{Nothing,AbstractString} = nothing)
function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, valuecolor = :blue,
offset::Integer = p.offset, keep = (offset == 0), desc::Union{Nothing,AbstractString} = nothing,
ignore_predictor = false)
(!RUNNING_IJULIA_KERNEL[] & !p.enabled) && return
if p.counter == 2 # ignore the first loop given usually uncharacteristically slow
p.tsecond = time()
end
if desc !== nothing
if desc !== nothing && desc !== p.desc
if p.barlen !== nothing
p.barlen += length(p.desc) - length(desc) #adjust bar length to accommodate new description
end
Expand Down Expand Up @@ -285,7 +287,7 @@ function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, v
end
return nothing
end
if predicted_updates_per_dt_have_passed(p)
if ignore_predictor || predicted_updates_per_dt_have_passed(p)
t = time()
if p.counter > 2
p.check_iterations = calc_check_iterations(p, t)
Expand Down Expand Up @@ -324,7 +326,8 @@ function updateProgress!(p::Progress; showvalues = (), truncate_lines = false, v
return nothing
end

function updateProgress!(p::ProgressThresh; showvalues = (), truncate_lines = false, valuecolor = :blue, offset::Integer = p.offset, keep = (offset == 0), desc = p.desc)
function updateProgress!(p::ProgressThresh; showvalues = (), truncate_lines = false, valuecolor = :blue,
offset::Integer = p.offset, keep = (offset == 0), desc = p.desc, ignore_predictor = false)
(!RUNNING_IJULIA_KERNEL[] & !p.enabled) && return
p.offset = offset
p.desc = desc
Expand Down Expand Up @@ -354,7 +357,7 @@ function updateProgress!(p::ProgressThresh; showvalues = (), truncate_lines = fa
return
end

if predicted_updates_per_dt_have_passed(p)
if ignore_predictor || predicted_updates_per_dt_have_passed(p)
t = time()
if p.counter > 2
p.check_iterations = calc_check_iterations(p, t)
Expand Down Expand Up @@ -382,7 +385,8 @@ function updateProgress!(p::ProgressThresh; showvalues = (), truncate_lines = fa
end
end

function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = false, valuecolor = :blue, desc = p.desc)
function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = false, valuecolor = :blue, desc = p.desc,
ignore_predictor = false)
(!RUNNING_IJULIA_KERNEL[] & !p.enabled) && return
p.desc = desc
if p.done
Expand All @@ -403,7 +407,7 @@ function updateProgress!(p::ProgressUnknown; showvalues = (), truncate_lines = f
end
return
end
if predicted_updates_per_dt_have_passed(p)
if ignore_predictor || predicted_updates_per_dt_have_passed(p)
t = time()
if p.counter > 2
p.check_iterations = calc_check_iterations(p, t)
Expand Down Expand Up @@ -463,15 +467,15 @@ You may optionally change the color of the display. See also `update!`.
function next!(p::Union{Progress, ProgressUnknown}; step::Int = 1, options...)
lock_if_threading(p) do
p.counter += step
updateProgress!(p; options...)
updateProgress!(p; ignore_predictor = step == 0, options...)
end
end

function next!(p::Union{Progress, ProgressUnknown}, color::Symbol; step::Int = 1, options...)
lock_if_threading(p) do
p.color = color
p.counter += step
updateProgress!(p; options...)
updateProgress!(p; ignore_predictor = step == 0, options...)
end
end

Expand All @@ -488,9 +492,10 @@ You may optionally change the color of the display. See also `next!`.
"""
function update!(p::Union{Progress, ProgressUnknown}, counter::Int=p.counter, color::Symbol=p.color; options...)
lock_if_threading(p) do
counter_changed = p.counter != counter
p.counter = counter
p.color = color
updateProgress!(p; options...)
updateProgress!(p; ignore_predictor = !counter_changed, options...)
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ prog_perf(10^7)
noprog_perf(10^7)
@time prog_perf(10^7)
@time noprog_perf(10^7)
@test @elapsed(prog_perf(10^7)) < 8*@elapsed(noprog_perf(10^7))
@test @elapsed(prog_perf(10^7)) < 9*@elapsed(noprog_perf(10^7))