fix bug related to change behavior of threadid()

Author: msol

src/byrow/hp_row_functions.jl

@@ -92,7 +92,7 @@ function _hp_row_generic_vec!(res, ds, f, colsidx, ::Val{T}) where T
     max_cz = length(res) - 1000 - (loopsize - 1)*1000
     inmat_all = [Matrix{T}(undef, length(colsidx), max_cz) for i in 1:nt]
     # make sure that the variable inside the loop are not the same as the out of scope one
-    Threads.@threads for i in 1:loopsize
+    Threads.@threads :static for i in 1:loopsize
         t_st = i*1000 + 1
         i == loopsize ? t_en = length(res) : t_en = (i+1)*1000
         _fill_matrix!(inmat_all[Threads.threadid()], all_data, t_st:t_en, colsidx)

src/sort/int.jl

@@ -98,7 +98,7 @@ end
 function _sort_chunks_int_right!(x, idx::Vector{<:Integer}, idx_cpy, where, number_of_chunks, rangelen, minval, o::Ordering)
     cz = div(length(x), number_of_chunks)
     en = length(x)
-    Threads.@threads for i in 1:number_of_chunks
+    Threads.@threads :static for i in 1:number_of_chunks
         ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()], (i-1)*cz+1,i*cz, rangelen, minval)
     end
     # take care of the last few observations
@@ -111,7 +111,7 @@ end
 function _sort_chunks_int_left!(x, idx::Vector{<:Integer}, idx_cpy, where, number_of_chunks, rangelen, minval, o::Ordering)
     cz = div(length(x), number_of_chunks)
     en = length(x)
-    Threads.@threads for i in 1:number_of_chunks
+    Threads.@threads :static for i in 1:number_of_chunks
         ds_sort_int_missatleft!(x, idx, idx_cpy, where[Threads.threadid()], (i-1)*cz+1,i*cz, rangelen, minval)
     end
     # take care of the last few observations
@@ -262,7 +262,7 @@ function _ds_sort_int_missatright_nopermx_threaded!(x, original_P, copy_P, lo, h
         where[i][1] = 1
         where[i][2] = 1
     end
-    Threads.@threads for i = lo:hi
+    Threads.@threads :static for i = lo:hi
         @inbounds ismissing(x[i]) ? where[Threads.threadid()][rangelen+3] += 1 : where[Threads.threadid()][Int(x[i]) + offs + 2] += 1
     end
     for j in 3:length(where[1])
@@ -306,7 +306,7 @@ function _ds_sort_int_missatright_nopermx_threaded!(x, original_P, rangelen, min
         where[i][1] = 1
         where[i][2] = 1
     end
-    Threads.@threads for i = 1:length(x)
+    Threads.@threads :static for i = 1:length(x)
         @inbounds ismissing(x[i]) ? where[Threads.threadid()][rangelen+3] += 1 : where[Threads.threadid()][Int(x[i]) + offs + 2] += 1
     end
     for j in 3:length(where[1])
@@ -348,7 +348,7 @@ function _ds_sort_int_missatleft_nopermx_threaded!(x, original_P, copy_P, lo, hi
         where[i][1] = 1
         where[i][2] = 1
     end
-    Threads.@threads for i = lo:hi
+    Threads.@threads :static for i = lo:hi
         @inbounds ismissing(x[i]) ? where[Threads.threadid()][3] += 1 : where[Threads.threadid()][Int(x[i]) + offs + 3] += 1
     end
     for j in 3:length(where[1])
@@ -392,7 +392,7 @@ function _ds_sort_int_missatleft_nopermx_threaded!(x, original_P, rangelen, minv
         where[i][1] = 1
         where[i][2] = 1
     end
-    Threads.@threads for i = 1:length(x)
+    Threads.@threads :static for i = 1:length(x)
         @inbounds ismissing(x[i]) ? where[Threads.threadid()][3] += 1 : where[Threads.threadid()][Int(x[i]) + offs + 3] += 1
     end
     for j in 3:length(where[1])

src/sort/sort.jl

@@ -213,11 +213,21 @@ end
 
 function _issorted_check_for_each_range(v, starts, lastvalid, _ord, nrows; threads = true)
     part_res = ones(Bool, threads ? Threads.nthreads() : 1)
-    @_threadsfor threads for rng in 1:lastvalid
-        lo = starts[rng]
-        rng == lastvalid ? hi = nrows : hi = starts[rng+1] - 1
-        part_res[Threads.threadid()] = _issorted_barrier(v, _ord, lo, hi)
-        !part_res[Threads.threadid()] &&  break
+    if threads
+
+        Threads.@threads :static for rng in 1:lastvalid
+            lo = starts[rng]
+            rng == lastvalid ? hi = nrows : hi = starts[rng+1] - 1
+            part_res[Threads.threadid()] = _issorted_barrier(v, _ord, lo, hi)
+            !part_res[Threads.threadid()] &&  break
+        end
+    else
+        for rng in 1:lastvalid
+            lo = starts[rng]
+            rng == lastvalid ? hi = nrows : hi = starts[rng+1] - 1
+            part_res[Threads.threadid()] = _issorted_barrier(v, _ord, lo, hi)
+            !part_res[Threads.threadid()] &&  break
+        end
     end
     all(part_res)
 end

src/sort/sortperm.jl

@@ -29,7 +29,7 @@ end
 # we should find starts here
 function fast_sortperm_int_threaded!(x, original_P, copy_P, ranges, rangelen, minval, misatleft, last_valid_range, ::Val{T}) where T
     starts = [T[] for i in 1:Threads.nthreads()]
-    Threads.@threads for i in 1:last_valid_range
+    Threads.@threads :static for i in 1:last_valid_range
         rangestart = ranges[i]
         i == last_valid_range ? rangeend = length(x) : rangeend = ranges[i+1] - 1
         # if (rangeend - rangestart) == 0
@@ -105,29 +105,57 @@ function fast_sortperm_int!(x, original_P, copy_P, ranges, rangelen, minval, mis
 end
 
 function _sortperm_int!(idx, idx_cpy, x, ranges, where, last_valid_range, missingatleft, ord, a; threads = true)
-    @_threadsfor threads for i in 1:last_valid_range
-        rangestart = ranges[i]
-        i == last_valid_range ? rangeend = length(x) : rangeend = ranges[i+1] - 1
-        if (rangeend - rangestart + 1) == 1
-            continue
-        end
-        _minval = stat_minimum(x, lo = rangestart, hi = rangeend)
-        if ismissing(_minval)
-            continue
-        else
-            minval::Int = _minval
+    if threads
+        Threads.@threads :static for i in 1:last_valid_range
+            rangestart = ranges[i]
+            i == last_valid_range ? rangeend = length(x) : rangeend = ranges[i+1] - 1
+            if (rangeend - rangestart + 1) == 1
+                continue
+            end
+            _minval = stat_minimum(x, lo = rangestart, hi = rangeend)
+            if ismissing(_minval)
+                continue
+            else
+                minval::Int = _minval
+            end
+            maxval::Int = stat_maximum(x, lo = rangestart, hi = rangeend)
+            # the overflow is check before calling _sortperm_int!
+            rangelen = maxval - minval + 1
+            if rangelen < div(rangeend - rangestart + 1, 2)
+                if missingatleft
+                    ds_sort_int_missatleft!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                else
+                    ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                end
+            else
+                ds_sort!(x, idx, rangestart, rangeend, a, ord)
+            end
         end
-        maxval::Int = stat_maximum(x, lo = rangestart, hi = rangeend)
-        # the overflow is check before calling _sortperm_int!
-        rangelen = maxval - minval + 1
-        if rangelen < div(rangeend - rangestart + 1, 2)
-            if missingatleft
-                ds_sort_int_missatleft!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+    else
+        for i in 1:last_valid_range
+            rangestart = ranges[i]
+            i == last_valid_range ? rangeend = length(x) : rangeend = ranges[i+1] - 1
+            if (rangeend - rangestart + 1) == 1
+                continue
+            end
+            _minval = stat_minimum(x, lo = rangestart, hi = rangeend)
+            if ismissing(_minval)
+                continue
             else
-                ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                minval::Int = _minval
+            end
+            maxval::Int = stat_maximum(x, lo = rangestart, hi = rangeend)
+            # the overflow is check before calling _sortperm_int!
+            rangelen = maxval - minval + 1
+            if rangelen < div(rangeend - rangestart + 1, 2)
+                if missingatleft
+                    ds_sort_int_missatleft!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                else
+                    ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                end
+            else
+                ds_sort!(x, idx, rangestart, rangeend, a, ord)
             end
-        else
-            ds_sort!(x, idx, rangestart, rangeend, a, ord)
         end
     end
 end