bug fix due to new behaviour of threadid() in 1.12

Author: sl-solution

src/byrow/hp_row_functions.jl

@@ -95,9 +95,9 @@ function _hp_row_generic_vec!(res, ds, f, colsidx, ::Val{T}) where T
     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)
+        _fill_matrix!(inmat_all[tid(Threads.nthreads())], all_data, t_st:t_en, colsidx)
         for k in t_st:t_en
-            res[k] = f(view(inmat_all[Threads.threadid()], :, k - t_st + 1))
+            res[k] = f(view(inmat_all[tid(Threads.nthreads())], :, k - t_st + 1))
         end
     end
 end

src/other/utils.jl

@@ -952,3 +952,8 @@ Base.IndexStyle(::Type{<:Cat2Vec}) = Base.IndexLinear()
 Base.size(v::Cat2Vec) = (length(v),)
 Base.length(v::Cat2Vec) = v.len1 + v.len2
 Base.eltype(v::Cat2Vec{F1, F2, CT, T, S, A, B}) where {F1, F2, CT, T, S, A, B} = CT
+
+
+function tid(nt)
+    Threads.threadid() % nt + 1
+end

src/sort/int.jl

@@ -99,11 +99,11 @@ function _sort_chunks_int_right!(x, idx::Vector{<:Integer}, idx_cpy, where, numb
     cz = div(length(x), number_of_chunks)
     en = length(x)
     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)
+        ds_sort_int_missatright!(x, idx, idx_cpy, where[tid(Threads.nthreads())], (i-1)*cz+1,i*cz, rangelen, minval)
     end
     # take care of the last few observations
     if number_of_chunks*div(length(x), number_of_chunks) < en
-        ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()],  number_of_chunks*div(length(x), number_of_chunks)+1, en, rangelen, minval)
+        ds_sort_int_missatright!(x, idx, idx_cpy, where[tid(1)],  number_of_chunks*div(length(x), number_of_chunks)+1, en, rangelen, minval)
     end
 end
 
@@ -112,11 +112,11 @@ function _sort_chunks_int_left!(x, idx::Vector{<:Integer}, idx_cpy, where, numbe
     cz = div(length(x), number_of_chunks)
     en = length(x)
     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)
+        ds_sort_int_missatleft!(x, idx, idx_cpy, where[tid(Threads.nthreads())], (i-1)*cz+1,i*cz, rangelen, minval)
     end
     # take care of the last few observations
     if number_of_chunks*div(length(x), number_of_chunks) < en
-        ds_sort_int_missatleft!(x, idx, idx_cpy, where[Threads.threadid()],  number_of_chunks*div(length(x), number_of_chunks)+1, en, rangelen, minval)
+        ds_sort_int_missatleft!(x, idx, idx_cpy, where[tid(1)],  number_of_chunks*div(length(x), number_of_chunks)+1, en, rangelen, minval)
     end
 end
 
@@ -263,7 +263,7 @@ function _ds_sort_int_missatright_nopermx_threaded!(x, original_P, copy_P, lo, h
         where[i][2] = 1
     end
     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
+        @inbounds ismissing(x[i]) ? where[tid(Threads.nthreads())][rangelen+3] += 1 : where[tid(Threads.nthreads())][Int(x[i]) + offs + 2] += 1
     end
     for j in 3:length(where[1])
         for i in 2:nt
@@ -307,7 +307,7 @@ function _ds_sort_int_missatright_nopermx_threaded!(x, original_P, rangelen, min
         where[i][2] = 1
     end
     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
+        @inbounds ismissing(x[i]) ? where[tid(Threads.nthreads())][rangelen+3] += 1 : where[tid(Threads.nthreads())][Int(x[i]) + offs + 2] += 1
     end
     for j in 3:length(where[1])
         for i in 2:nt
@@ -349,7 +349,7 @@ function _ds_sort_int_missatleft_nopermx_threaded!(x, original_P, copy_P, lo, hi
         where[i][2] = 1
     end
     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
+        @inbounds ismissing(x[i]) ? where[tid(Threads.nthreads())][3] += 1 : where[tid(Threads.nthreads())][Int(x[i]) + offs + 3] += 1
     end
     for j in 3:length(where[1])
         for i in 2:nt
@@ -393,7 +393,7 @@ function _ds_sort_int_missatleft_nopermx_threaded!(x, original_P, rangelen, minv
         where[i][2] = 1
     end
     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
+        @inbounds ismissing(x[i]) ? where[tid(Threads.nthreads())][3] += 1 : where[tid(Threads.nthreads())][Int(x[i]) + offs + 3] += 1
     end
     for j in 3:length(where[1])
         for i in 2:nt

src/sort/sort.jl

@@ -218,15 +218,15 @@ function _issorted_check_for_each_range(v, starts, lastvalid, _ord, nrows; threa
         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
+            part_res[tid(Threads.nthreads())] = _issorted_barrier(v, _ord, lo, hi)
+            !part_res[tid(Threads.nthreads())] &&  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
+            part_res[tid(1)] = _issorted_barrier(v, _ord, lo, hi)
+            !part_res[tid(1)] &&  break
         end
     end
     all(part_res)

src/sort/sortperm.jl

@@ -41,7 +41,7 @@ function fast_sortperm_int_threaded!(x, original_P, copy_P, ranges, rangelen, mi
             _start_vals = _ds_sort_int_missatright_nopermx!(x, original_P, copy_P, rangestart, rangeend, rangelen, minval, Val(T))
         end
         _cleanup_starts!(_start_vals, rangeend - rangestart + 1)
-        append!(starts[Threads.threadid()], _start_vals .+ rangestart .- 1)
+        append!(starts[tid(Threads.nthreads())], _start_vals .+ rangestart .- 1)
     end
     cnt = 1
     flag = false
@@ -123,9 +123,9 @@ function _sortperm_int!(idx, idx_cpy, x, ranges, where, last_valid_range, missin
             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)
+                    ds_sort_int_missatleft!(x, idx, idx_cpy, where[tid(Threads.nthreads())], rangestart, rangeend, rangelen, minval)
                 else
-                    ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                    ds_sort_int_missatright!(x, idx, idx_cpy, where[tid(Threads.nthreads())], rangestart, rangeend, rangelen, minval)
                 end
             else
                 ds_sort!(x, idx, rangestart, rangeend, a, ord)
@@ -149,9 +149,9 @@ function _sortperm_int!(idx, idx_cpy, x, ranges, where, last_valid_range, missin
             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)
+                    ds_sort_int_missatleft!(x, idx, idx_cpy, where[tid(1)], rangestart, rangeend, rangelen, minval)
                 else
-                    ds_sort_int_missatright!(x, idx, idx_cpy, where[Threads.threadid()], rangestart, rangeend, rangelen, minval)
+                    ds_sort_int_missatright!(x, idx, idx_cpy, where[tid(1)], rangestart, rangeend, rangelen, minval)
                 end
             else
                 ds_sort!(x, idx, rangestart, rangeend, a, ord)