Skip to content

Do respect existing loggers #454

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

Merged
merged 3 commits into from
Mar 10, 2020
Merged

Do respect existing loggers #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24fa71b
Do respect existing loggers
devmotion Mar 9, 2020
60e5b24
Use ProgressLevel
devmotion Mar 10, 2020
3636806
Fix typo
devmotion Mar 10, 2020
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
8 changes: 6 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@ version = "6.19.0"
[deps]
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
ConsoleProgressMonitor = "88cd18e8-d9cc-4ea6-8889-5259c0d15c8b"
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
FunctionWrappers = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e"
IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d"
Juno = "e5e0dc1b-0480-54bc-9374-aad01c23163d"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
MuladdMacro = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221"
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
Expand All @@ -35,14 +37,16 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
[compat]
ArrayInterface = "1.1, 2.0"
ChainRulesCore = "0.4, 0.5, 0.6, 0.7"
ConsoleProgressMonitor = "0.1"
DataStructures = "0.17"
DocStringExtensions = "0.8"
FunctionWrappers = "1.0"
IterativeSolvers = "0.8"
IteratorInterfaceExtensions = "^0.1, ^1"
Juno = "0.8"
LoggingExtras = "0.4"
MuladdMacro = "0.2.1"
Parameters = "0.12.0"
ProgressLogging = "0.1"
RecipesBase = "0.7.0, 0.8"
RecursiveArrayTools = "2"
RecursiveFactorization = "0.1"
Expand Down
4 changes: 3 additions & 1 deletion src/DiffEqBase.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ module DiffEqBase
using RecipesBase, RecursiveArrayTools,
Requires, TableTraits, IteratorInterfaceExtensions, TreeViews,
IterativeSolvers, RecursiveFactorization, Distributed, ArrayInterface,
DataStructures, Logging, TerminalLoggers, Juno
DataStructures

import Logging, LoggingExtras, TerminalLoggers, ConsoleProgressMonitor, ProgressLogging

import ZygoteRules, ChainRulesCore

Expand Down
17 changes: 7 additions & 10 deletions src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,20 @@ function init(prob::DEProblem,args...;kwargs...)
end
end

function solve_call(_prob,args...;merge_callbacks = true,
logger = default_logger(),
kwargs...)
function solve_call(_prob,args...;merge_callbacks = true, kwargs...)
if :kwargs ∈ propertynames(_prob)
if merge_callbacks && haskey(_prob.kwargs,:callback) && haskey(kwargs, :callback)
kwargs_temp = NamedTuple{Base.diff_names(Base._nt_names(
values(kwargs)), (:callback,))}(values(kwargs))
callbacks = NamedTuple{(:callback,)}( [DiffEqBase.CallbackSet(_prob.kwargs.callback, values(kwargs).callback )] )
kwargs = merge(kwargs_temp, callbacks)
end
maybe_with_logger(logger) do
__solve(_prob,args...;_prob.kwargs...,kwargs...)
end
else
maybe_with_logger(logger) do
__solve(_prob,args...;kwargs...)
end
kwargs = merge(_prob.kwargs, kwargs)
end

logger = get(kwargs, :progress, false) ? default_logger(Logging.current_logger()) : nothing
maybe_with_logger(logger) do
__solve(_prob,args...; kwargs...)
end
end

Expand Down
22 changes: 20 additions & 2 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,5 +256,23 @@ timedepentdtmin(integrator::DEIntegrator) = timedepentdtmin(integrator.t, integr
timedepentdtmin(t::AbstractFloat, dtmin) = abs(max(eps(t), dtmin))
timedepentdtmin(::Any, dtmin) = abs(dtmin)

maybe_with_logger(f, logger) = logger === nothing ? f() : with_logger(f, logger)
default_logger() = Juno.isactive() ? nothing : TerminalLogger()
maybe_with_logger(f, logger) = logger === nothing ? f() : Logging.with_logger(f, logger)

function default_logger(logger)
Logging.min_enabled_level(logger) ≤ ProgressLogging.ProgressLevel && return nothing

if Sys.iswindows() || (isdefined(Main, :IJulia) && Main.IJulia.inited)
progresslogger = ConsoleProgressMonitor.ProgressLogger()
else
progresslogger = TerminalLoggers.TerminalLogger()
end

logger1 = LoggingExtras.EarlyFilteredLogger(progresslogger) do log
log.level == ProgressLogging.ProgressLevel
end
logger2 = LoggingExtras.EarlyFilteredLogger(logger) do log
log.level != ProgressLogging.ProgressLevel
end

LoggingExtras.TeeLogger(logger1, logger2)
end