Merge pull request #60 from TuringLang/dw/threshold

Project.toml

@@ -3,7 +3,7 @@ uuid = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
 keywords = ["markov chain monte carlo", "probablistic programming"]
 license = "MIT"
 desc = "A lightweight interface for common MCMC methods."
-version = "2.3.0"
+version = "2.4.0"
 
 [deps]
 BangBang = "198e06fe-97b7-11e9-32a5-e1d131e6ad66"

src/sample.jl

@@ -86,13 +86,23 @@ function mcmcsample(
     Ntotal = thinning * (N - 1) + discard_initial + 1
 
     @ifwithprogresslogger progress name=progressname begin
+        # Determine threshold values for progress logging
+        # (one update per 0.5% of progress)
+        if progress
+            threshold = Ntotal ÷ 200
+            next_update = threshold
+        end
+
         # Obtain the initial sample and state.
         sample, state = step(rng, model, sampler; kwargs...)
 
         # Discard initial samples.
         for i in 1:(discard_initial - 1)
             # Update the progress bar.
-            progress && ProgressLogging.@logprogress i/Ntotal
+            if progress && i >= next_update
+                ProgressLogging.@logprogress i/Ntotal
+                next_update = i + threshold
+            end
 
             # Obtain the next sample and state.
             sample, state = step(rng, model, sampler, state; kwargs...)
@@ -106,20 +116,23 @@ function mcmcsample(
         samples = save!!(samples, sample, 1, model, sampler, N; kwargs...)
 
         # Update the progress bar.
-        progress && ProgressLogging.@logprogress (1 + discard_initial) / Ntotal
+        itotal = 1 + discard_initial
+        if progress && itotal >= next_update
+            ProgressLogging.@logprogress itotal / Ntotal
+            next_update = itotal + threshold
+        end
 
         # Step through the sampler.
-        itotal = 1 + discard_initial
         for i in 2:N
             # Discard thinned samples.
             for _ in 1:(thinning - 1)
                 # Obtain the next sample and state.
                 sample, state = step(rng, model, sampler, state; kwargs...)
 
                 # Update progress bar.
-                if progress
-                    itotal += 1
+                if progress && (itotal += 1) >= next_update
                     ProgressLogging.@logprogress itotal / Ntotal
+                    next_update = itotal + threshold
                 end
             end
 
@@ -133,9 +146,9 @@ function mcmcsample(
             samples = save!!(samples, sample, i, model, sampler, N; kwargs...)
 
             # Update the progress bar.
-            if progress
-                itotal += 1
+            if progress && (itotal += 1) >= next_update
                 ProgressLogging.@logprogress itotal / Ntotal
+                next_update = itotal + threshold
             end
         end
     end
@@ -263,17 +276,25 @@ function mcmcsample(
     @ifwithprogresslogger progress name=progressname begin
         # Create a channel for progress logging.
         if progress
-            channel = Distributed.RemoteChannel(() -> Channel{Bool}(nchains))
+            channel = Channel{Bool}(length(interval))
         end
 
         Distributed.@sync begin
             if progress
+                # Update the progress bar.
                 Distributed.@async begin
-                    # Update the progress bar.
+                    # Determine threshold values for progress logging
+                    # (one update per 0.5% of progress)
+                    threshold = nchains ÷ 200
+                    nextprogresschains = threshold
+
                     progresschains = 0
                     while take!(channel)
                         progresschains += 1
-                        ProgressLogging.@logprogress progresschains/nchains
+                        if progresschains >= nextprogresschains
+                            ProgressLogging.@logprogress progresschains/nchains
+                            nextprogresschains = progresschains + threshold
+                        end
                     end
                 end
             end
@@ -334,19 +355,29 @@ function mcmcsample(
     # Set up worker pool.
     pool = Distributed.CachingPool(Distributed.workers())
 
-    # Create a channel for progress logging.
-    channel = progress ? Distributed.RemoteChannel(() -> Channel{Bool}(nchains)) : nothing
-
     local chains
     @ifwithprogresslogger progress name=progressname begin
+        # Create a channel for progress logging.
+        if progress
+            channel = Distributed.RemoteChannel(() -> Channel{Bool}(Distributed.nworkers()))
+        end
+
         Distributed.@sync begin
-            # Update the progress bar.
             if progress
+                # Update the progress bar.
                 Distributed.@async begin
+                    # Determine threshold values for progress logging
+                    # (one update per 0.5% of progress)
+                    threshold = nchains ÷ 200
+                    nextprogresschains = threshold
+
                     progresschains = 0
                     while take!(channel)
                         progresschains += 1
-                        ProgressLogging.@logprogress progresschains/nchains
+                        if progresschains >= nextprogresschains
+                            ProgressLogging.@logprogress progresschains/nchains
+                            nextprogresschains = progresschains + threshold
+                        end
                     end
                 end
             end
@@ -362,7 +393,7 @@ function mcmcsample(
                                                  progress = false, kwargs...)
 
                         # Update the progress bar.
-                        channel === nothing || put!(channel, true)
+                        progress && put!(channel, true)
 
                         # Return the new chain.
                         return chain