Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 0 additions & 65 deletions .github/workflows/GPU.yml

This file was deleted.

15 changes: 1 addition & 14 deletions .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,5 @@ concurrency:

jobs:
tests:
name: "Tests"
strategy:
fail-fast: false
matrix:
group:
- CPU
- QA
version:
- 'lts'
- '1'
uses: "SciML/.github/.github/workflows/tests.yml@v1"
with:
julia-version: "${{ matrix.version }}"
group: "${{ matrix.group }}"
uses: "SciML/.github/.github/workflows/grouped-tests.yml@v1"
secrets: "inherit"
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ NonlinearSolve = "4"
NonlinearSolveBase = "1.5, 2"
OrdinaryDiffEq = "6.74, 7"
OrdinaryDiffEqAdamsBashforthMoulton = "1, 2"
Pkg = "1.10"
PrecompileTools = "1.2.1"
Random = "1.10"
SciMLBase = "2, 3.3"
SciMLSensitivity = "7.43"
SciMLTesting = "1"
StableRNGs = "1"
Static = "1"
SteadyStateDiffEq = "2.5.0"
Expand All @@ -73,11 +73,11 @@ NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
OrdinaryDiffEqAdamsBashforthMoulton = "89bda076-bce5-4f1c-845f-551c83cdda9a"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"

[targets]
test = ["Aqua", "Documenter", "ExplicitImports", "ForwardDiff", "Functors", "GPUArraysCore", "InteractiveUtils", "LuxTestUtils", "MLDataDevices", "NLsolve", "NonlinearSolve", "OrdinaryDiffEq", "OrdinaryDiffEqAdamsBashforthMoulton", "Pkg", "SafeTestsets", "SciMLSensitivity", "StableRNGs", "Test", "Zygote"]
test = ["Aqua", "Documenter", "ExplicitImports", "ForwardDiff", "Functors", "GPUArraysCore", "InteractiveUtils", "LuxTestUtils", "MLDataDevices", "NLsolve", "NonlinearSolve", "OrdinaryDiffEq", "OrdinaryDiffEqAdamsBashforthMoulton", "SafeTestsets", "SciMLSensitivity", "SciMLTesting", "StableRNGs", "Test", "Zygote"]
29 changes: 29 additions & 0 deletions test/qa/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
DeepEquilibriumNetworks = "6748aba7-0e9b-415e-a410-ae3cc0ecb334"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
NonlinearSolve = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
DeepEquilibriumNetworks = {path = "../.."}

[compat]
Aqua = "0.8"
Documenter = "1"
ExplicitImports = "1"
Lux = "1"
NonlinearSolve = "4"
OrdinaryDiffEq = "6.74, 7"
Random = "1.10"
SciMLSensitivity = "7.43"
SciMLTesting = "1"
Test = "1.10"
julia = "1.10"
File renamed without changes.
40 changes: 25 additions & 15 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
using Pkg
using SafeTestsets, Test
using SciMLTesting
using SafeTestsets

const GROUP = uppercase(get(ENV, "GROUP", "CPU"))

@info "Running tests for GROUP: $GROUP"

@time begin
if GROUP == "CPU" || GROUP == "ALL"
@time @safetestset "Utils Tests" include("utils_tests.jl")
@time @safetestset "Layers Tests" include("layers_tests.jl")
end

if GROUP == "QA"
@time @safetestset "Quality Assurance Tests" include("qa_tests.jl")
end
# DEQ's GROUP semantics are backend/capability-based, not folder-partitioned: the
# GPU group runs the *same* Core test files (utils_tests.jl + layers_tests.jl)
# with shared_testsetup.jl's backend switched to CUDA via BACKEND_GROUP, so it
# cannot be expressed as a separate folder of files. Hence explicit-args run_tests.
function core_body()
@safetestset "Utils Tests" include("utils_tests.jl")
@safetestset "Layers Tests" include("layers_tests.jl")
end

run_tests(;
core = core_body,
groups = Dict(
# GPU is the self-hosted CUDA runner lane: the same Core suite with the
# backend switched to CUDA.
"GPU" => () -> begin
ENV["BACKEND_GROUP"] = "CUDA"
core_body()
end,
),
qa = (; env = joinpath(@__DIR__, "qa"), body = joinpath(@__DIR__, "qa", "qa.jl")),
# Curated "All": run only Core. GPU (self-hosted CUDA lane) and QA stay
# selectable by name but out of the aggregate.
all = ["Core"],
)
2 changes: 1 addition & 1 deletion test/shared_testsetup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

GPUArraysCore.allowscalar(false)

cpu_testing() = BACKEND_GROUP == "all" || BACKEND_GROUP == "cpu"
cpu_testing() = BACKEND_GROUP == "all" || BACKEND_GROUP == "cpu" || BACKEND_GROUP == "core"
function cuda_testing()
return (BACKEND_GROUP == "all" || BACKEND_GROUP == "cuda") &&
MLDataDevices.functional(CUDADevice)
Expand Down
10 changes: 10 additions & 0 deletions test/test_groups.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Core]
versions = ["lts", "1"]

[QA]
versions = ["lts", "1"]

[GPU]
versions = ["1"]
runner = ["self-hosted", "Linux", "X64", "gpu"]
timeout = 240
Loading