|
1 | 1 | using TensorBoardLogger, Logging
|
2 | 2 | using TensorBoardLogger: preprocess, summary_impl
|
3 | 3 | using Test
|
4 |
| -using MLDatasets |
5 | 4 | using TestImages
|
6 | 5 | using ImageCore
|
7 | 6 | using ColorTypes
|
@@ -139,43 +138,46 @@ end
|
139 | 138 | @test π != log_image(logger, "rand/CLN", rand(3, 10, 2), CLN, step = step)
|
140 | 139 | @test π != log_image(logger, "rand/LCN", rand(10, 3, 2), LCN, step = step)
|
141 | 140 |
|
142 |
| - sample = MNIST.traintensor(1:3) |
143 |
| - @test π != log_image(logger, "mnist/HWN", sample, HWN, step = step) |
144 |
| - @test π != log_image(logger, "mnist2/HWN", Gray.(sample), step = step) |
145 |
| - sample = permutedims(sample, (2, 1, 3)) |
146 |
| - @test π != log_image(logger, "mnist/WHN", sample, WHN, step = step) |
147 |
| - @test π != log_image(logger, "mnist2/WHN", Gray.(sample), WHN, step = step) |
148 |
| - sample = permutedims(sample, (3, 2, 1)) |
149 |
| - @test π != log_image(logger, "mnist/NHW", sample, NHW, step = step) |
150 |
| - @test π != log_image(logger, "mnist2/NHW", Gray.(sample), NHW, step = step) |
151 |
| - sample = permutedims(sample, (1, 3, 2)) |
152 |
| - @test π != log_image(logger, "mnist/NWH", sample, NWH, step = step) |
153 |
| - @test π != log_image(logger, "mnist2/NWH", Gray.(sample), NWH, step = step) |
154 |
| - sample = testimage("toucan") |
155 |
| - @test π != log_image(logger, "toucan/auto", sample, step = step) |
156 |
| - sample = [sample, sample, sample] |
157 |
| - @test π != log_images(logger, "toucans/auto", sample, step = step) |
158 |
| - @test π != log_images(logger, "toucans", sample, CHW, step = step) |
159 |
| - |
160 |
| - sample = hcat(sample...) |
161 |
| - sample = reshape(sample, (150, 162, 3)) |
162 |
| - @test π != log_image(logger, "toucan/CHWN", sample, CHWN, step = step) |
163 |
| - sample = permutedims(sample, (2, 1, 3)) |
164 |
| - @test π != log_image(logger, "toucan/CWHN", sample, CWHN, step = step) |
165 |
| - sample = channelview(sample) #CWHN |
166 |
| - sample = permutedims(sample, (4, 1, 2, 3)) |
167 |
| - @test π != log_image(logger, "toucan/NCWH", sample, NCWH, step = step) |
168 |
| - sample = permutedims(sample, (1, 2, 4, 3)) |
169 |
| - @test π != log_image(logger, "toucan/NCHW", sample, NCHW, step = step) |
170 |
| - sample = permutedims(sample, (1, 4, 3, 2)) |
171 |
| - @test π != log_image(logger, "toucan/NWHC", sample, NWHC, step = step) |
172 |
| - sample = permutedims(sample, (1, 3, 2, 4)) |
173 |
| - @test π != log_image(logger, "toucan/NHWC", sample, NHWC, step = step) |
174 |
| - sample = permutedims(sample, (2, 3, 4, 1)) |
175 |
| - @test π != log_image(logger, "toucan/HWCN", sample, HWCN, step = step) |
176 |
| - sample = permutedims(sample, (2, 1, 3, 4)) |
177 |
| - @test π != log_image(logger, "toucan/WHCN", sample, WHCN, step = step) |
178 |
| - |
| 141 | + if VERSION >= v"1.3.0" |
| 142 | + using MLDatasets: MNIST |
| 143 | + |
| 144 | + sample = MNIST.traintensor(1:3) |
| 145 | + @test π != log_image(logger, "mnist/HWN", sample, HWN, step = step) |
| 146 | + @test π != log_image(logger, "mnist2/HWN", Gray.(sample), step = step) |
| 147 | + sample = permutedims(sample, (2, 1, 3)) |
| 148 | + @test π != log_image(logger, "mnist/WHN", sample, WHN, step = step) |
| 149 | + @test π != log_image(logger, "mnist2/WHN", Gray.(sample), WHN, step = step) |
| 150 | + sample = permutedims(sample, (3, 2, 1)) |
| 151 | + @test π != log_image(logger, "mnist/NHW", sample, NHW, step = step) |
| 152 | + @test π != log_image(logger, "mnist2/NHW", Gray.(sample), NHW, step = step) |
| 153 | + sample = permutedims(sample, (1, 3, 2)) |
| 154 | + @test π != log_image(logger, "mnist/NWH", sample, NWH, step = step) |
| 155 | + @test π != log_image(logger, "mnist2/NWH", Gray.(sample), NWH, step = step) |
| 156 | + sample = testimage("toucan") |
| 157 | + @test π != log_image(logger, "toucan/auto", sample, step = step) |
| 158 | + sample = [sample, sample, sample] |
| 159 | + @test π != log_images(logger, "toucans/auto", sample, step = step) |
| 160 | + @test π != log_images(logger, "toucans", sample, CHW, step = step) |
| 161 | + |
| 162 | + sample = hcat(sample...) |
| 163 | + sample = reshape(sample, (150, 162, 3)) |
| 164 | + @test π != log_image(logger, "toucan/CHWN", sample, CHWN, step = step) |
| 165 | + sample = permutedims(sample, (2, 1, 3)) |
| 166 | + @test π != log_image(logger, "toucan/CWHN", sample, CWHN, step = step) |
| 167 | + sample = channelview(sample) #CWHN |
| 168 | + sample = permutedims(sample, (4, 1, 2, 3)) |
| 169 | + @test π != log_image(logger, "toucan/NCWH", sample, NCWH, step = step) |
| 170 | + sample = permutedims(sample, (1, 2, 4, 3)) |
| 171 | + @test π != log_image(logger, "toucan/NCHW", sample, NCHW, step = step) |
| 172 | + sample = permutedims(sample, (1, 4, 3, 2)) |
| 173 | + @test π != log_image(logger, "toucan/NWHC", sample, NWHC, step = step) |
| 174 | + sample = permutedims(sample, (1, 3, 2, 4)) |
| 175 | + @test π != log_image(logger, "toucan/NHWC", sample, NHWC, step = step) |
| 176 | + sample = permutedims(sample, (2, 3, 4, 1)) |
| 177 | + @test π != log_image(logger, "toucan/HWCN", sample, HWCN, step = step) |
| 178 | + sample = permutedims(sample, (2, 1, 3, 4)) |
| 179 | + @test π != log_image(logger, "toucan/WHCN", sample, WHCN, step = step) |
| 180 | + end |
179 | 181 | end
|
180 | 182 |
|
181 | 183 | @testset "Image processing interface" begin
|
|
274 | 276 | include("Optional/test_Plots.jl")
|
275 | 277 | # Don't run PyPlot tests until I figure a way to install the dependencies
|
276 | 278 | #include("Optional/test_PyPlot.jl")
|
277 |
| - include("Optional/test_Tracker.jl") |
| 279 | + if VERSION >= v"1.5.0" |
| 280 | + include("Optional/test_Tracker.jl") |
| 281 | + end |
278 | 282 | end
|
279 | 283 |
|
280 | 284 | @testset "Logger dispatch overrides" begin
|
|
0 commit comments