Put test dependencies in individual projects (#361)

gdalle · web-flow · commit 63fa85653b1b · 2024-07-16T12:58:27.000+02:00
* Put test dependencies in individual projects

* Proper activate

* End in jl

* Instantiate

* Diffractor compat
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -41,14 +41,13 @@ jobs:
           - Back/ForwardDiff
           - Back/PolyesterForwardDiff
           - Back/ReverseDiff
+          - Back/SecondOrder
           - Back/Symbolics
           - Back/Tapir
           - Back/Tracker
           - Back/Zygote
-          - Back/ChainRulesCore-Zygote
-          - Back/Enzyme-ForwardDiff
-          - Back/ForwardDiff-Zygote
-          - Back/ReverseDiff-Zygote
+          - Down/Detector
+          - Down/DifferentiateWith
         exclude:
           # lts
           - version: 'lts'
@@ -63,14 +62,14 @@ jobs:
             group: Back/FastDifferentiation
           - version: 'lts'
             group: Back/PolyesterForwardDiff
+          - version: 'lts'
+            group: Back/SecondOrder
           - version: 'lts'
             group: Back/Symbolics
           - version: 'lts'
             group: Back/Tapir
-          - version: 'lts'
-            group: Back/Enzyme-ForwardDiff
-          - version: 'lts'
-            group: Back/ReverseDiff-Zygote
+          - version: 'pre'
+            group: Down/Detector
           # pre-release
           - version: 'pre'
             group: Formalities
@@ -79,9 +78,9 @@ jobs:
           - version: 'pre'
             group: Back/Tapir
           - version: 'pre'
-            group: Back/ChainRulesCore-Zygote
+            group: Back/SecondOrder
           - version: 'pre'
-            group: Back/Enzyme-ForwardDiff
+            group: Down/Detector
     
     steps:
       - uses: actions/checkout@v4
diff --git a/DifferentiationInterface/Project.toml b/DifferentiationInterface/Project.toml
@@ -105,6 +105,7 @@ test = [
     "ComponentArrays",
     "DataFrames",
     # "DifferentiationInterfaceTest",
+    "ForwardDiff",
     "JET",
     "JLArrays",
     "JuliaFormatter",
diff --git a/DifferentiationInterface/test/Back/ChainRulesCore/Project.toml b/DifferentiationInterface/test/Back/ChainRulesCore/Project.toml
@@ -0,0 +1,3 @@
+[deps]
+ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
diff --git a/DifferentiationInterface/test/Back/ChainRulesCore/test.jl b/DifferentiationInterface/test/Back/ChainRulesCore/test.jl
diff --git a/DifferentiationInterface/test/Back/Diffractor/Project.toml b/DifferentiationInterface/test/Back/Diffractor/Project.toml
@@ -0,0 +1,5 @@
+[deps]
+Diffractor = "9f5e2b26-1114-432f-b630-d3fe2085c51c"
+
+[compat]
+Diffractor = "=0.2.6"
diff --git a/DifferentiationInterface/test/Back/Enzyme-ForwardDiff/test.jl b/DifferentiationInterface/test/Back/Enzyme-ForwardDiff/test.jl
diff --git a/DifferentiationInterface/test/Back/Enzyme/Project.toml b/DifferentiationInterface/test/Back/Enzyme/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
diff --git a/DifferentiationInterface/test/Back/FastDifferentiation/Project.toml b/DifferentiationInterface/test/Back/FastDifferentiation/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+FastDifferentiation = "eb9bf01b-bf85-4b60-bf87-ee5de06c00be"
diff --git a/DifferentiationInterface/test/Back/FiniteDiff/Project.toml b/DifferentiationInterface/test/Back/FiniteDiff/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
diff --git a/DifferentiationInterface/test/Back/FiniteDifferences/Project.toml b/DifferentiationInterface/test/Back/FiniteDifferences/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
diff --git a/DifferentiationInterface/test/Back/ForwardDiff-Zygote/test.jl b/DifferentiationInterface/test/Back/ForwardDiff-Zygote/test.jl
diff --git a/DifferentiationInterface/test/Back/ForwardDiff/Project.toml b/DifferentiationInterface/test/Back/ForwardDiff/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
diff --git a/DifferentiationInterface/test/Back/PolyesterForwardDiff/Project.toml b/DifferentiationInterface/test/Back/PolyesterForwardDiff/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+PolyesterForwardDiff = "98d1487c-24ca-40b6-b7ab-df2af84e126b"
diff --git a/DifferentiationInterface/test/Back/ReverseDiff-Zygote/test.jl b/DifferentiationInterface/test/Back/ReverseDiff-Zygote/test.jl
diff --git a/DifferentiationInterface/test/Back/ReverseDiff/Project.toml b/DifferentiationInterface/test/Back/ReverseDiff/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
diff --git a/DifferentiationInterface/test/Back/SecondOrder/Project.toml b/DifferentiationInterface/test/Back/SecondOrder/Project.toml
@@ -0,0 +1,5 @@
+[deps]
+Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
diff --git a/DifferentiationInterface/test/Back/SecondOrder/test.jl b/DifferentiationInterface/test/Back/SecondOrder/test.jl
@@ -0,0 +1,49 @@
+using DifferentiationInterface, DifferentiationInterfaceTest
+import DifferentiationInterface as DI
+using Enzyme: Enzyme
+using ForwardDiff: ForwardDiff
+using ReverseDiff: ReverseDiff
+using SparseConnectivityTracer
+using SparseMatrixColorings
+using Zygote: Zygote
+using Test
+
+## Dense
+
+onearg_backends = [
+    SecondOrder(AutoForwardDiff(), AutoZygote()),
+    SecondOrder(AutoReverseDiff(), AutoZygote()),
+]
+
+twoarg_backends = [
+    SecondOrder(AutoForwardDiff(), AutoEnzyme(; mode=Enzyme.Forward)),
+    SecondOrder(AutoEnzyme(; mode=Enzyme.Reverse), AutoForwardDiff()),
+]
+
+for backend in vcat(onearg_backends, twoarg_backends)
+    @test check_available(backend)
+    if backend in onearg_backends
+        @test !check_twoarg(backend)
+    else
+        @test check_twoarg(backend)
+    end
+    @test check_hessian(backend)
+end
+
+test_differentiation(
+    vcat(onearg_backends, twoarg_backends); first_order=false, logging=LOGGING
+);
+
+## Sparse
+
+sparse_backends = [
+    AutoSparse(
+        SecondOrder(AutoForwardDiff(), AutoZygote());
+        sparsity_detector=TracerSparsityDetector(),
+        coloring_algorithm=GreedyColoringAlgorithm(),
+    ),
+]
+
+test_differentiation(
+    sparse_backends, sparse_scenarios(); first_order=false, sparsity=true, logging=LOGGING
+);
diff --git a/DifferentiationInterface/test/Back/Symbolics/Project.toml b/DifferentiationInterface/test/Back/Symbolics/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
diff --git a/DifferentiationInterface/test/Back/Tapir/Project.toml b/DifferentiationInterface/test/Back/Tapir/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+Tapir = "07d77754-e150-4737-8c94-cd238a1fb45b"
diff --git a/DifferentiationInterface/test/Back/Tracker/Project.toml b/DifferentiationInterface/test/Back/Tracker/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
diff --git a/DifferentiationInterface/test/Back/Zygote/Project.toml b/DifferentiationInterface/test/Back/Zygote/Project.toml
@@ -0,0 +1,2 @@
+[deps]
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
diff --git a/DifferentiationInterface/test/Down/Detector/Project.toml b/DifferentiationInterface/test/Down/Detector/Project.toml
@@ -0,0 +1,3 @@
+[deps]
+Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
diff --git a/DifferentiationInterface/test/Down/Detector/detector.jl b/DifferentiationInterface/test/Down/Detector/detector.jl
diff --git a/DifferentiationInterface/test/Down/DifferentiateWith/Project.toml b/DifferentiationInterface/test/Down/DifferentiateWith/Project.toml
@@ -0,0 +1,3 @@
+[deps]
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
diff --git a/DifferentiationInterface/test/Down/DifferentiateWith/differentiatewith.jl b/DifferentiationInterface/test/Down/DifferentiateWith/differentiatewith.jl
diff --git a/DifferentiationInterface/test/Internals/fromprimitive.jl b/DifferentiationInterface/test/Internals/fromprimitive.jl
diff --git a/DifferentiationInterface/test/runtests.jl b/DifferentiationInterface/test/runtests.jl
@@ -9,28 +9,28 @@ else
     Pkg.add("DifferentiationInterfaceTest")
 end
 
+TEST_ENV = Base.active_project()
+push!(LOAD_PATH, TEST_ENV)
+
 LOGGING = get(ENV, "CI", "false") == "false"
 
 GROUP = get(ENV, "JULIA_DI_TEST_GROUP", "All")
 
-ALL_BACKENDS = [
-    "ChainRulesCore",
-    "Diffractor",
-    "Enzyme",
-    "FiniteDiff",
-    "FiniteDifferences",
-    "FastDifferentiation",
-    "ForwardDiff",
-    "PolyesterForwardDiff",
-    "ReverseDiff",
-    "Symbolics",
-    "Tapir",
-    "Tracker",
-    "Zygote",
-]
-
 ## Main tests
 
+function subtest(category, folder)
+    Pkg.activate(joinpath(@__DIR__, category, folder))
+    Pkg.instantiate()
+    @testset "$file" for file in filter(
+        endswith(".jl"), readdir(joinpath(@__DIR__, category, folder))
+    )
+        @info "Testing category/$folder/$file"
+        include(joinpath(@__DIR__, category, folder, file))
+    end
+    Pkg.activate(TEST_ENV)
+    return nothing
+end
+
 @testset verbose = true "DifferentiationInterface.jl" begin
     if GROUP == "Formalities" || GROUP == "All"
         @testset "Formalities/$file" for file in readdir(joinpath(@__DIR__, "Formalities"))
@@ -47,21 +47,17 @@ ALL_BACKENDS = [
     end
 
     if GROUP == "All"
-        Pkg.add(ALL_BACKENDS)
-        @testset verbose = true "$folder" for folder in readdir(joinpath(@__DIR__, "Back"))
-            @testset "$file" for file in readdir(joinpath(@__DIR__, "Back", folder))
-                @info "Testing Back/$folder/$file"
-                include(joinpath(@__DIR__, "Back", folder, file))
+        @testset verbose = true "$category" for category in ["Back", "Down"]
+            @testset verbose = true "$folder" for folder in
+                                                  readdir(joinpath(@__DIR__, category))
+                subtest(category, folder)
             end
         end
-    elseif startswith(GROUP, "Back")
-        folder = split(GROUP, '/')[2]
-        backends = split(folder, '-')
-        Pkg.add(backends)
-        @testset verbose = true "$folder" begin
-            @testset "$file" for file in readdir(joinpath(@__DIR__, "Back", folder))
-                @info "Testing Back/$folder/$file"
-                include(joinpath(@__DIR__, "Back", folder, file))
+    elseif startswith(GROUP, "Back") || startswith(GROUP, "Down")
+        category, folder = split(GROUP, '/')
+        @testset verbose = true "$category" begin
+            @testset verbose = true "$folder" begin
+                subtest(category, folder)
             end
         end
     end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[deps]`
	`2`	`+ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"`
	`3`	`+Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[deps]`
	`2`	`+Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[deps]`
	`2`	`+FastDifferentiation = "eb9bf01b-bf85-4b60-bf87-ee5de06c00be"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[deps]`
	`2`	`+FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[deps]`
	`2`	`+FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"`