diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-12 09:02:49 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-12-12 09:02:49 -0500 |
| commit | f184be73defd62f46a14dbdb96df3fa61806f3be (patch) | |
| tree | 842b127645c7a3f5ef6383262a3358a3340e4cda /gnu/packages/patches/julia-allow-parallel-build.patch | |
| parent | c9974889ef69fbe6199a9bb1cb2fa5a594130114 (diff) | |
| parent | 94e9651241b3e827531779717952d386535801f3 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/patches/julia-allow-parallel-build.patch')
| -rw-r--r-- | gnu/packages/patches/julia-allow-parallel-build.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/gnu/packages/patches/julia-allow-parallel-build.patch b/gnu/packages/patches/julia-allow-parallel-build.patch deleted file mode 100644 index cc1d42fee4..0000000000 --- a/gnu/packages/patches/julia-allow-parallel-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -Allow parallel tests with isolated environment. - -See https://github.com/JuliaLang/julia/issues/43205 and -https://github.com/JuliaLang/julia/pull/43211. - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..150395e78c 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -4,7 +4,7 @@ using Test - using Distributed - using Dates - import REPL --using Printf: @sprintf -+using Printf: @sprintf, @printf - using Base: Experimental - - include("choosetests.jl") -@@ -83,11 +83,12 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -+ if net_on || haskey(ENV, "JULIA_CPU_THREADS") - n = min(Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end -+ @printf("Number of threads: %i\n", n) - skipped = 0 - - @everywhere include("testdefs.jl") |