Fix progress bar in imagedatasetstats (#217)

Author: lorenzoh

Project.toml

@@ -1,12 +1,13 @@
 name = "FastAI"
 uuid = "5d0beca9-ade8-49ae-ad0b-a3cf890e669f"
 authors = ["Lorenz Ohly", "Julia Community"]
-version = "0.4.0"
+version = "0.4.1"
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
 BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 DataAugmentation = "88a5189c-e7ff-4f85-ac6b-e6158070f02e"
 DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
@@ -28,7 +29,7 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MosaicViews = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
-ReTest = "e0db7c4e-2690-44b9-bad6-7687da720f89"
+ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
@@ -77,11 +78,9 @@ julia = "1.6"
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[pollen]
+title = "FastAI.jl"
+url = "https://github.com/FluxML/FastAI.jl"
 
 [targets]
 test = ["Test"]
-
-
-[pollen]
-title = "FastAI.jl"
-url = "https://github.com/FluxML/FastAI.jl"

src/Vision/Vision.jl

@@ -52,6 +52,7 @@ import ..FastAI:
 
 import Colors: colormaps_sequential, Colorant, Color, Gray, Normed, RGB,
     alphacolor, deuteranopic, distinguishable_colors
+using ColorVectorSpace
 import FixedPointNumbers: N0f8
 import DataAugmentation
 import DataAugmentation: apply, Identity, ToEltype, ImageToTensor, Normalize,
@@ -60,6 +61,7 @@ import DataAugmentation: apply, Identity, ToEltype, ImageToTensor, Normalize,
     ResizePadDivisible, itemdata
 import ImageInTerminal
 import IndirectArrays: IndirectArray
+import ProgressMeter: Progress, next!
 import Requires: @require
 import StaticArrays: SVector
 import Statistics: mean, std

src/Vision/encodings/imagepreprocessing.jl

@@ -129,14 +129,15 @@ If `progress = true`, show a progress bar.
 function imagedatasetstats(
         data,
         C;
-        progress=true,
-        progressfn=progress ? tqdm : identity)
+        progress=true)
     means, stds = imagestats(getobs(data, 1), C)
     loaderfn = d -> eachobsparallel(d, buffered=false, useprimary=true)
 
-    for (means_, stds_) in mapobs(img -> imagestats(img, C), data) |> loaderfn |> progressfn
+    p = Progress(nobs(data), enabled=progress)
+    for (means_, stds_) in mapobs(img -> imagestats(img, C), data) |> loaderfn
         means .+= means_
         stds .+= stds_
+        next!(p)
     end
     return means ./ nobs(data), stds ./ nobs(data)
 end