Transitioned to ProgressLogging

Author: jagot

Project.toml

@@ -8,7 +8,7 @@ ElectricFields = "2f84ce32-9bb1-11e8-0d9f-3dce90a4beca"
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
 HCubature = "19dc6840-f33b-545b-b366-655c7e3ffd49"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
+ProgressLogging = "33c8b6b6-d38a-422a-b730-caa89a2f386c"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
@@ -18,7 +18,6 @@ UnitfulAtomic = "a7773ee8-282e-5fa2-be4e-bd808c38a91a"
 ElectricFields = "0.1, 0.2"
 FastGaussQuadrature = "0.4.7, 0.5"
 HCubature = "1.5"
-ProgressMeter = "1.5,1.6"
 SpecialFunctions = "1.3,2"
 StaticArrays = "1.1"
 Unitful = "1.7"

src/StrongFieldApproximation.jl

@@ -8,7 +8,7 @@ using FastGaussQuadrature
 using LinearAlgebra
 using StaticArrays
 
-using ProgressMeter
+using ProgressLogging
 
 include("threading.jl")
 include("telescope_iterators.jl")

src/dyson_expansions.jl

@@ -469,10 +469,12 @@ function photoelectron_spectrum(k::AbstractArray{T},
 
     cT = complex(eltype(T))
     c = similar(k, cT)
-    p = Progress(length(k))
-    threaded_range_loop(eachindex(k)) do i
-        c[i] = integrate_diagram(cT, system, diagram, iref, k[i]; kwargs...)
-        ProgressMeter.next!(p)
+    p = Prog(length(k))
+    @withprogress begin
+        threaded_range_loop(eachindex(k)) do i
+            c[i] = integrate_diagram(cT, system, diagram, iref, k[i]; kwargs...)
+            @inc p
+        end
     end
     c
 end
@@ -498,7 +500,7 @@ function induced_dipole(system::System, diagram::Diagram; verbosity = 1, kwargs.
 
     memory = get(kwargs, :memory, typemax(Int))
 
-    @showprogress for (i,t) in enumerate(t)
+    @progress for (i,t) in enumerate(t)
         𝐝̃ = integrate_diagram(DT, system, diagram, i; imin=i-memory, kwargs...)
         𝐝[i] = 2real(𝐝̃)
     end

src/threading.jl

@@ -27,3 +27,20 @@ threaded_range_loop(fun::Function, v::AbstractVector) =
 
 threaded_enumerate_range_loop(fun::Function, v::AbstractVector) =
     threaded_range_loop(i -> fun(i,v[i]), length(v))
+
+# https://github.com/JuliaLogging/ProgressLogging.jl/issues/44#issuecomment-1923812159
+mutable struct Prog
+    N::Int
+    @atomic count::Int
+end
+
+Prog(N) = Prog(N, 0)
+
+inc!(p::Prog) = @atomic p.count += 1
+
+macro inc(p)
+    quote
+        local M = $inc!($p) # It seems to be important to separate this out from the `@logprogress` step since `@logprogress` can double-evaluate
+        $ProgressLogging.@logprogress M / $p.N
+    end |> esc
+end