From 1835b90eb96d38f8ab595a7e48c13e3fe5166bad Mon Sep 17 00:00:00 2001 From: Kai Xu Date: Wed, 2 Oct 2019 21:22:26 +0100 Subject: [PATCH 1/3] process TrackedReal --- Project.toml | 3 ++- src/Optional/Tracker.jl | 3 +++ src/TensorBoardLogger.jl | 3 +++ test/Optional/test_Tracker.jl | 11 +++++++++++ test/runtests.jl | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/Optional/Tracker.jl create mode 100644 test/Optional/test_Tracker.jl diff --git a/Project.toml b/Project.toml index 177e1104..36b227fc 100644 --- a/Project.toml +++ b/Project.toml @@ -23,10 +23,11 @@ ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d" Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -PyPlot="d330b81b-6aea-500a-939a-2ce795aea3ee" +PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990" WAV = "8149f6b0-98f6-5db9-b78f-408fbbb8ef88" +Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" [targets] test = ["Test", "Flux", "TestImages", "ImageMagick", "Logging", "LightGraphs", "Plots", "PyPlot", "WAV"] diff --git a/src/Optional/Tracker.jl b/src/Optional/Tracker.jl new file mode 100644 index 00000000..fb9f2e06 --- /dev/null +++ b/src/Optional/Tracker.jl @@ -0,0 +1,3 @@ +import .Tracker + +preprocess(name, x::Tracker.TrackedReal, data) = push!(data, name => Tracker.data(x)) diff --git a/src/TensorBoardLogger.jl b/src/TensorBoardLogger.jl index 140e6ffe..d697555a 100644 --- a/src/TensorBoardLogger.jl +++ b/src/TensorBoardLogger.jl @@ -66,6 +66,9 @@ function __init__() @require PyPlot="d330b81b-6aea-500a-939a-2ce795aea3ee" begin include("Optional/PyPlot.jl") end + @require Tracker="9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" begin + include("Optional/Tracker.jl") + end end end # module diff --git a/test/Optional/test_Tracker.jl b/test/Optional/test_Tracker.jl new file mode 100644 index 00000000..e992809c --- /dev/null +++ b/test/Optional/test_Tracker.jl @@ -0,0 +1,11 @@ +using TensorBoardLogger, Logging +using Tracker +using Test + +@testset "Optional: PyPlot.jl" begin + logger = TBLogger("test_logs/Tracker-jl", tb_overwrite) + v = Tracker.TrackedReal(1) + with_logger(logger) do + @info "dispatch" v=v + end +end \ No newline at end of file diff --git a/test/runtests.jl b/test/runtests.jl index f4f4537b..b1dd1994 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -250,4 +250,5 @@ end include("Optional/test_Plots.jl") # Don't run PyPlot tests until I figure a way to install the dependencies #include("Optional/test_PyPlot.jl") + include("Optional/test_Tracker.jl") end From c2149c248e7ef739a32b72a019db8ec87101e3d0 Mon Sep 17 00:00:00 2001 From: Kai Xu Date: Wed, 2 Oct 2019 21:46:32 +0100 Subject: [PATCH 2/3] fix name; add TrackedArray support --- src/Optional/Tracker.jl | 2 +- test/Optional/test_Tracker.jl | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Optional/Tracker.jl b/src/Optional/Tracker.jl index fb9f2e06..81e08035 100644 --- a/src/Optional/Tracker.jl +++ b/src/Optional/Tracker.jl @@ -1,3 +1,3 @@ import .Tracker -preprocess(name, x::Tracker.TrackedReal, data) = push!(data, name => Tracker.data(x)) +preprocess(name, x::T, data) where {T<:Union{Tracker.TrackedReal,Tracker.TrackedArray}}= push!(data, name => Tracker.data(x)) diff --git a/test/Optional/test_Tracker.jl b/test/Optional/test_Tracker.jl index e992809c..ee97ff8b 100644 --- a/test/Optional/test_Tracker.jl +++ b/test/Optional/test_Tracker.jl @@ -2,10 +2,12 @@ using TensorBoardLogger, Logging using Tracker using Test -@testset "Optional: PyPlot.jl" begin +@testset "Optional: Tracker.jl" begin logger = TBLogger("test_logs/Tracker-jl", tb_overwrite) - v = Tracker.TrackedReal(1) + tr = Tracker.TrackedReal(1) + ta = Tracker.TrackedArray(ones(10)) with_logger(logger) do - @info "dispatch" v=v + @info "dispatch" tr=tr + @info "dispatch" ta=ta end end \ No newline at end of file From 3d3f0db3ca01aff01b46e455c8a4843833be37b3 Mon Sep 17 00:00:00 2001 From: Kai Xu Date: Wed, 2 Oct 2019 21:48:15 +0100 Subject: [PATCH 3/3] add Tracker to test targets --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 36b227fc..bc1c5bfe 100644 --- a/Project.toml +++ b/Project.toml @@ -30,4 +30,4 @@ WAV = "8149f6b0-98f6-5db9-b78f-408fbbb8ef88" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" [targets] -test = ["Test", "Flux", "TestImages", "ImageMagick", "Logging", "LightGraphs", "Plots", "PyPlot", "WAV"] +test = ["Test", "Flux", "TestImages", "ImageMagick", "Logging", "LightGraphs", "Plots", "PyPlot", "WAV", "Tracker"]