Merge pull request #120 from ranocha/hr/fix_packages

fix multi-threading in packages (issue 119)

Project.toml

@@ -1,7 +1,7 @@
 name = "Polyester"
 uuid = "f517fe37-dbe3-4b94-8317-1923a5111588"
 authors = ["Chris Elrod <[email protected]> and contributors"]
-version = "0.7.6"
+version = "0.7.7"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/closure.jl

@@ -372,7 +372,7 @@ function enclose(exorig::Expr, minbatchsize, per::Symbol, threadlocal_tuple, str
   end
   if stride
     # we are to do length(var"##SUBSTART##":var"##SUBSTOP##") iterations
-    # 
+    #
     loop_start_expr =
       :(var"##THREAD##" * var"##LOOP_STEP##" + var"##LOOPOFFSET##" - var"##LOOP_STEP##")
     loop_stop_expr = :($loopstart + (var"##SUBSTOP##" - var"##SUBSTART##") * var"##STEP##")
@@ -430,7 +430,7 @@ function enclose(exorig::Expr, minbatchsize, per::Symbol, threadlocal_tuple, str
   end
   push!(q.args, batchcall)
   quote
-    var"##NUM#THREADS##" = $(Threads.nthreads())
+    var"##NUM#THREADS##" = $(Threads.nthreads)()
     $(stride ? iter_len_def : nothing)
     if (
       $(

test/runtests.jl

@@ -575,6 +575,25 @@ end
   end
 end
 
+@testset "issue #119" begin
+  # https://github.com/JuliaSIMD/Polyester.jl/issues/119
+  function find_call_to_nthreads(expr)
+    expr isa Expr || return false
+    if expr.head === :call
+      if Base.Threads.nthreads in expr.args
+        return true
+      end
+    end
+    return any(find_call_to_nthreads, expr.args)
+  end
+
+  expr = @macroexpand @batch for i in 1:100
+    a[i] = i
+  end
+
+  @test find_call_to_nthreads(expr)
+end
+
 if VERSION ≥ v"1.6"
   println("Package tests complete. Running `Aqua` checks.")
   Aqua.test_all(Polyester)