update: use greedy scheduler

Author: AdamWysokinski

Project.toml

@@ -134,4 +134,4 @@ WAV = "1.2"
 Wavelets = "0.9, 0.10"
 WaveletsExt = "0.2"
 XDF = "0.2"
-julia = "1.10"
+julia = "1.11"

src/NeuroAnalyzer.jl

@@ -5,7 +5,7 @@ https://neuroanalyzer.org
 """
 module NeuroAnalyzer
 
-@assert VERSION >= v"1.10.0" "NeuroAnalyzer requires Julia 1.10.0 or above."
+@assert VERSION >= v"1.11.0" "NeuroAnalyzer requires Julia 1.11.0 or above."
 
 # set constants
 

src/analyze/acor.jl

@@ -120,7 +120,7 @@ function acor(s::AbstractArray; l::Int64=round(Int64, min(size(s[1, :, 1], 1) -
     ac = zeros(ch_n, length(-l:l), ep_n)
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx in 1:ch_n
+        Threads.@threads :greedy for ch_idx in 1:ch_n
             ac[ch_idx, :, ep_idx] = @views acor(s[ch_idx, :, ep_idx], l=l, demean=demean, biased=biased, method=method)
         end
     end

src/analyze/acov.jl

@@ -123,7 +123,7 @@ function acov(s::AbstractArray; l::Int64=round(Int64, min(size(s[1, :, 1], 1) -
     ac = zeros(ch_n, length(-l:l), ep_n)
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx in 1:ch_n
+        Threads.@threads :greedy for ch_idx in 1:ch_n
             ac[ch_idx, :, ep_idx] = @views acov(s[ch_idx, :, ep_idx], l=l, demean=demean, biased=biased, method=method)
         end
     end

src/analyze/band_mpower.jl

@@ -90,7 +90,7 @@ function band_mpower(s::AbstractArray; fs::Int64, frq_lim::Tuple{Real, Real}, me
     maxbp = zeros(ch_n, ep_n)
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx in 1:ch_n
+        Threads.@threads :greedy for ch_idx in 1:ch_n
             mbp[ch_idx, ep_idx], maxfrq[ch_idx, ep_idx], maxbp[ch_idx, ep_idx] = @views band_mpower(s[ch_idx, :, ep_idx], fs=fs, frq_lim=frq_lim, method=method, nt=nt, wlen=wlen, woverlap=woverlap, w=w, ncyc=ncyc, gw=gw, wt=wt)
         end
     end

src/analyze/band_power.jl

@@ -89,7 +89,7 @@ function band_power(s::AbstractArray; fs::Int64, frq_lim::Tuple{Real, Real}, met
     bp = zeros(ch_n, ep_n)
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx in 1:ch_n
+        Threads.@threads :greedy for ch_idx in 1:ch_n
             bp[ch_idx, ep_idx] = @views band_power(s[ch_idx, :, ep_idx], fs=fs, frq_lim=frq_lim, method=method, nt=nt, wlen=wlen, woverlap=woverlap, w=w, ncyc=ncyc, gw=gw, wt=wt)
         end
     end

src/analyze/coherence.jl

@@ -118,7 +118,7 @@ function coherence(s1::AbstractArray, s2::AbstractArray; method::Symbol=:mt, fs:
     mscoh = zeros(ch_n, length(f), ep_n)
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx in 1:ch_n
+        Threads.@threads :greedy for ch_idx in 1:ch_n
             coh[ch_idx, :, ep_idx], mscoh[ch_idx, :, ep_idx], _ = @views coherence(s1[ch_idx, :, ep_idx], s2[ch_idx, :, ep_idx], method=method, fs=fs, frq_lim=frq_lim, demean=demean, nt=nt, wlen=wlen, woverlap=woverlap, w=w)
         end
     end

src/analyze/corm.jl

@@ -100,7 +100,7 @@ function corm(s::AbstractArray; norm::Bool=false)::Array{Float64, 4}
             end
             CUDA.synchronize()
         else
-            Threads.@threads :static for s_idx in 1:ep_len
+            Threads.@threads :greedy for s_idx in 1:ep_len
                 @views @inbounds cm[:, :, s_idx, ep_idx] = corm(s[:, s_idx, ep_idx], norm=norm)
 
                 # update progress bar

src/analyze/covm.jl

@@ -99,7 +99,7 @@ function covm(s::AbstractArray; norm::Bool=false)::Array{Float64, 4}
             end
             CUDA.synchronize()
         else
-            Threads.@threads :static for s_idx in 1:ep_len
+            Threads.@threads :greedy for s_idx in 1:ep_len
                 @views @inbounds cm[:, :, s_idx, ep_idx] = covm(s[:, s_idx, ep_idx], norm=norm)
 
                 # update progress bar

src/analyze/cph.jl

@@ -59,7 +59,7 @@ function cph(s::AbstractArray; fs::Int64)::@NamedTuple{ph::Array{Float64, 4}, f:
     progress_bar && (progbar = Progress(ep_n * ch_n, dt=1, barlen=20, color=:white))
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx1 in 1:ch_n
+        Threads.@threads :greedy for ch_idx1 in 1:ch_n
            for ch_idx2 in 1:ch_idx1
                 ph[ch_idx1, ch_idx2, :, ep_idx], _ = @views cph(s[ch_idx1, :, ep_idx], s[ch_idx2, :, ep_idx], fs=fs)
             end
@@ -70,7 +70,7 @@ function cph(s::AbstractArray; fs::Int64)::@NamedTuple{ph::Array{Float64, 4}, f:
     end
 
     @inbounds for cph_idx in axes(ph, 3)
-        Threads.@threads :static for ep_idx in 1:ep_n
+        Threads.@threads :greedy for ep_idx in 1:ep_n
             for ch_idx1 in 1:(ch_n - 1)
                 for ch_idx2 in (ch_idx1 + 1):ch_n
                     ph[ch_idx1, ch_idx2, cph_idx, ep_idx] = @views ph[ch_idx2, ch_idx1, cph_idx, ep_idx]
@@ -113,7 +113,7 @@ function cph(s1::AbstractArray, s2::AbstractArray; fs::Int64)::@NamedTuple{ph::A
     ph = zeros(ch_n, length(f), ep_n)
 
     @inbounds for ep_idx in 1:ep_n
-        Threads.@threads :static for ch_idx in 1:ch_n
+        Threads.@threads :greedy for ch_idx in 1:ch_n
             ph[ch_idx, :, ep_idx], _ = @views cph(s1[ch_idx, :, ep_idx], s2[ch_idx, :, ep_idx], fs=fs)
         end
     end