Merge branch 'master' of github.com:lorenzoh/FluxTraining.jl

src/callbacks/callbacks.jl

@@ -122,14 +122,27 @@ function on(::BatchBegin, ::Phase, cb::ToGPU, learner)
 end
 
 
-garbagecollect() = (GC.gc(); ccall(:malloc_trim, Cvoid, (Cint,), 0))
+function garbagecollect()
+    GC.gc()
+    if Base.Sys.islinux()
+        ccall(:malloc_trim, Cvoid, (Cint,), 0)
+    end
+end
+
 
 """
     GarbageCollect(nsteps)
 
 Every `nsteps` steps, forces garbage collection.
-Use this if you get memory leaks from, for example, parallel data loading.
+Use this if you get memory leaks from, for example,
+parallel data loading.
+
+Performs an additional C-call on Linux systems that can
+sometimes help.
 """
 function GarbageCollect(nsteps::Int = 100)
-    return throttle(CustomCallback((learner) -> garbagecollect(), BatchEnd), freq = nsteps)
+    return throttle(
+        CustomCallback((learner) -> garbagecollect(), BatchEnd, Phase),
+        BatchEnd(),
+        freq = nsteps)
 end

test/callbacks/garbagecollect.jl

@@ -0,0 +1,8 @@
+
+include("../imports.jl")
+
+@testset ExtendedTestSet "`GarbageCollect`" begin
+    cb = GarbageCollect()
+    learner = testlearner(Recorder(), Metrics(), cb)
+    @test_nowarn fit!(learner, 1)
+end

test/runtests.jl

@@ -11,5 +11,6 @@ include("./imports.jl")
     include("./callbacks/recorder.jl")
     include("./callbacks/scheduler.jl")
     include("./callbacks/checkpointer.jl")
+    include("./callbacks/garbagecollect.jl")
     include("./callbacks/sanitycheck.jl")
 end