From 951cc0800ccbb5c0c83424ef52f7b0420928603c Mon Sep 17 00:00:00 2001
From: Katharine Hyatt <khyatt@flatironinstitute.org>
Date: Sun, 21 Sep 2025 09:12:36 -0400
Subject: [PATCH 1/2] Try running without threads restriction

---
 test/runtests.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/runtests.jl b/test/runtests.jl
index bb5b0af250..2884e10b72 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -220,7 +220,7 @@ function addworker(X; kwargs...)
         test_exename
     end
 
-    withenv("JULIA_NUM_THREADS" => 1, "OPENBLAS_NUM_THREADS" => 1) do
+    withenv("OPENBLAS_NUM_THREADS" => 1) do
         procs = addprocs(X; exename=exename, exeflags=test_exeflags, kwargs...)
         @everywhere procs include($(joinpath(@__DIR__, "setup.jl")))
         procs

From d2e643cf326add8eb3321fda020884396a295767 Mon Sep 17 00:00:00 2001
From: Katharine Hyatt <khyatt@flatironinstitute.org>
Date: Sun, 21 Sep 2025 15:22:27 -0400
Subject: [PATCH 2/2] Try not waiting for worker cleanup at the end of the run

---
 test/runtests.jl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/runtests.jl b/test/runtests.jl
index 2884e10b72..4d5362c1b6 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -220,7 +220,7 @@ function addworker(X; kwargs...)
         test_exename
     end
 
-    withenv("OPENBLAS_NUM_THREADS" => 1) do
+    withenv("JULIA_NUM_THREADS" => 1, "OPENBLAS_NUM_THREADS" => 1) do
         procs = addprocs(X; exename=exename, exeflags=test_exeflags, kwargs...)
         @everywhere procs include($(joinpath(@__DIR__, "setup.jl")))
         procs
@@ -340,7 +340,7 @@ try
         end
     end
     @sync begin
-        function recycle_worker(p)
+        function recycle_worker(p, timeout=0)
             if isdefined(CUDA, :to)
                 to = remotecall_fetch(p) do
                     CUDA.to
@@ -348,7 +348,7 @@ try
                 push!(timings, to)
             end
 
-            rmprocs(p, waitfor=30)
+            rmprocs(p, waitfor=timeout)
 
             return nothing
         end
@@ -398,10 +398,10 @@ try
                     # resetting the context breaks certain CUDA libraries,
                     # so spawn a new worker when the test did so
                     if test in ["core/initialization", "core/cudadrv"]
-                        p = recycle_worker(p)
+                        p = recycle_worker(p, 30)
                     end
                 end
-
+                # is this actually needed at the end of the run?
                 if p !== nothing
                     recycle_worker(p)
                 end