From 711a6b33114fead73d7748370b5a8de6c775b524 Mon Sep 17 00:00:00 2001 From: Qingyu Qu <2283984853@qq.com> Date: Sat, 9 Nov 2024 16:49:55 +0800 Subject: [PATCH] Fix FIRK CI --- Project.toml | 2 +- lib/BoundaryValueDiffEqFIRK/test/runtests.jl | 24 ++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Project.toml b/Project.toml index ffa5c952..66645aef 100644 --- a/Project.toml +++ b/Project.toml @@ -40,7 +40,7 @@ BoundaryValueDiffEqODEInterfaceExt = "ODEInterface" [compat] ADTypes = "1.9" -Adapt = "4" +Adapt = "4.1.1" Aqua = "0.8.7" ArrayInterface = "7.16" BandedMatrices = "1.7.5" diff --git a/lib/BoundaryValueDiffEqFIRK/test/runtests.jl b/lib/BoundaryValueDiffEqFIRK/test/runtests.jl index 1e72cf03..89db3a44 100644 --- a/lib/BoundaryValueDiffEqFIRK/test/runtests.jl +++ b/lib/BoundaryValueDiffEqFIRK/test/runtests.jl @@ -1,9 +1,19 @@ -using ReTestItems, BoundaryValueDiffEqFIRK +using ReTestItems, BoundaryValueDiffEqFIRK, Hwloc, InteractiveUtils -@time "FIRK Expanded solvers" begin - ReTestItems.runtests("expanded/") -end +@info sprint(InteractiveUtils.versioninfo) -@time "FIRK Nested solvers" begin - ReTestItems.runtests("nested/") -end +const GROUP = lowercase(get(ENV, "GROUP", "All")) + +const RETESTITEMS_NWORKERS = parse(Int, + get(ENV, "RETESTITEMS_NWORKERS", + string(min(ifelse(Sys.iswindows(), 0, Hwloc.num_physical_cores()), 4)))) +const RETESTITEMS_NWORKER_THREADS = parse(Int, + get(ENV, "RETESTITEMS_NWORKER_THREADS", + string(max(Hwloc.num_virtual_cores() รท max(RETESTITEMS_NWORKERS, 1), 1)))) + +@info "Running tests for group: $(GROUP) with $(RETESTITEMS_NWORKERS) workers" + +ReTestItems.runtests( + BoundaryValueDiffEqFIRK; tags = (GROUP == "all" ? nothing : [Symbol(GROUP)]), + nworkers = RETESTITEMS_NWORKERS, + nworker_threads = RETESTITEMS_NWORKER_THREADS, testitem_timeout = 300 * 60)