Skip to content

Commit f2bd8cd

Browse files
committed
Fix Aqua tests
1 parent cf55104 commit f2bd8cd

File tree

5 files changed

+45
-23
lines changed

5 files changed

+45
-23
lines changed

Manifest.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.0-rc1"
44
manifest_format = "2.0"
5-
project_hash = "33d5f46deb395b3db16d766ef39217d71a80867a"
5+
project_hash = "461882012e6e993286bb5accc7e9d45749a2da45"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "332e5d7baeff8497b923b730b994fa480601efc7"
@@ -250,9 +250,9 @@ version = "1.9.1"
250250

251251
[[deps.DiffEqBase]]
252252
deps = ["ArrayInterface", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "Setfield", "SparseArrays", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"]
253-
git-tree-sha1 = "de4709e30bd5490435122c4b415b90a812c23fbf"
253+
git-tree-sha1 = "5e365e0744ae1fdd44e62416343e7bfe848999d8"
254254
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
255-
version = "6.138.1"
255+
version = "6.139.0"
256256

257257
[deps.DiffEqBase.extensions]
258258
DiffEqBaseChainRulesCoreExt = "ChainRulesCore"
@@ -641,9 +641,9 @@ version = "6.4.0"
641641

642642
[[deps.LLVMExtra_jll]]
643643
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
644-
git-tree-sha1 = "a84f8f1e8caaaa4e3b4c101306b9e801d3883ace"
644+
git-tree-sha1 = "98eaee04d96d973e79c25d49167668c5c8fb50e2"
645645
uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
646-
version = "0.0.27+0"
646+
version = "0.0.27+1"
647647

648648
[[deps.LatticeRules]]
649649
deps = ["Random"]
@@ -1128,9 +1128,9 @@ version = "1.3.4"
11281128

11291129
[[deps.RecursiveArrayTools]]
11301130
deps = ["Adapt", "ArrayInterface", "DocStringExtensions", "GPUArraysCore", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "Requires", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
1131-
git-tree-sha1 = "fa453b42ba1623bd2e70260bf44dac850a3430a7"
1131+
git-tree-sha1 = "d7087c013e8a496ff396bae843b1e16d9a30ede8"
11321132
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
1133-
version = "2.39.0"
1133+
version = "2.38.10"
11341134

11351135
[deps.RecursiveArrayTools.extensions]
11361136
RecursiveArrayToolsMeasurementsExt = "Measurements"
@@ -1208,9 +1208,9 @@ version = "0.6.42"
12081208

12091209
[[deps.SciMLBase]]
12101210
deps = ["ADTypes", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FillArrays", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "QuasiMonteCarlo", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables", "TruncatedStacktraces"]
1211-
git-tree-sha1 = "dd2d18b981d09a2376ba49c5fab480f497992c88"
1211+
git-tree-sha1 = "baa0f858af55ea937183c988bd4b3e79e0bf699a"
12121212
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1213-
version = "2.8.0"
1213+
version = "2.8.1"
12141214

12151215
[deps.SciMLBase.extensions]
12161216
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
@@ -1309,9 +1309,9 @@ version = "1.10.0"
13091309

13101310
[[deps.SparseDiffTools]]
13111311
deps = ["ADTypes", "Adapt", "ArrayInterface", "Compat", "DataStructures", "FiniteDiff", "ForwardDiff", "Graphs", "LinearAlgebra", "PackageExtensionCompat", "Random", "Reexport", "SciMLOperators", "Setfield", "SparseArrays", "StaticArrayInterface", "StaticArrays", "Tricks", "UnPack", "VertexSafeGraphs"]
1312-
git-tree-sha1 = "e162b74fd1ce6d371ff5c584b53e34538edb9212"
1312+
git-tree-sha1 = "49068dceed7febe32afe2d7b874172a7c3198cb3"
13131313
uuid = "47a9eef4-7e08-11e9-0b38-333d64bd3804"
1314-
version = "2.11.0"
1314+
version = "2.12.0"
13151315

13161316
[deps.SparseDiffTools.extensions]
13171317
SparseDiffToolsEnzymeExt = "Enzyme"
@@ -1484,11 +1484,11 @@ version = "0.5.23"
14841484

14851485
[[deps.Tracker]]
14861486
deps = ["Adapt", "DiffRules", "ForwardDiff", "Functors", "LinearAlgebra", "LogExpFunctions", "MacroTools", "NNlib", "NaNMath", "Optimisers", "Printf", "Random", "Requires", "SpecialFunctions", "Statistics"]
1487-
git-tree-sha1 = "8e895c98c27a4203a8061dd8c10b010269e8d3a6"
1487+
git-tree-sha1 = "752daa5bbd9721b0566e39cdc75cffdc3ef5593d"
14881488
repo-rev = "ap/ambiguous"
14891489
repo-url = "https://github.com/avik-pal/Tracker.jl"
14901490
uuid = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
1491-
version = "0.2.29"
1491+
version = "0.2.30"
14921492
weakdeps = ["PDMats"]
14931493

14941494
[deps.Tracker.extensions]

Project.toml

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@ ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471"
1212
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1313
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
1414
DistributionsAD = "ced4e74d-a319-5a8a-b0ac-84af2272839c"
15-
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
1615
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1716
Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
1817
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
19-
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
2018
Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
2119
LuxCore = "bb33d45b-7691-41d6-9220-0943567d0623"
2220
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
23-
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2421
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
2522
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
2623
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -31,18 +28,26 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
3128
ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
3229

3330
[compat]
31+
ADTypes = "0.2"
3432
Adapt = "3"
3533
ChainRulesCore = "1"
34+
ComponentArrays = "0.15.5"
35+
ConcreteStructs = "0.2"
3636
DiffEqBase = "6.41"
3737
Distributions = "0.23, 0.24, 0.25"
3838
DistributionsAD = "0.6"
3939
ForwardDiff = "0.10"
4040
Functors = "0.4"
41+
LinearAlgebra = "<0.0.1, 1"
42+
Lux = "0.5.5"
4143
LuxCore = "0.1"
44+
PrecompileTools = "1"
45+
Random = "<0.0.1, 1"
4246
RecursiveArrayTools = "2"
4347
Reexport = "0.2, 1"
4448
SciMLBase = "1, 2"
4549
SciMLSensitivity = "7"
50+
Tracker = "0.2.30"
4651
Zygote = "0.5, 0.6"
4752
ZygoteRules = "0.2"
4853
julia = "1.9"

src/DiffEqFlux.jl

+8-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ChainRulesCore as CRC
1717
import LuxCore: AbstractExplicitLayer, AbstractExplicitContainerLayer
1818
import Lux.Experimental: StatefulLuxLayer
1919

20-
@reexport using ADTypes, Lux, SciMLSensitivity
20+
@reexport using ADTypes, Lux
2121

2222
# FIXME: Type Piracy
2323
function CRC.rrule(::Type{Tridiagonal}, dl, d, du)
@@ -52,4 +52,11 @@ export collocate_data
5252

5353
export multiple_shoot
5454

55+
# Reexporting only certain functions from SciMLSensitivity
56+
export BacksolveAdjoint, QuadratureAdjoint, GaussAdjoint, InterpolatingAdjoint,
57+
TrackerAdjoint, ZygoteAdjoint, ReverseDiffAdjoint, ForwardSensitivity,
58+
ForwardDiffSensitivity, ForwardDiffOverAdjoint, SteadyStateAdjoint,
59+
ForwardLSS, AdjointLSS, NILSS, NILSAS
60+
export TrackerVJP, ZygoteVJP, EnzymeVJP, ReverseDiffVJP
61+
5562
end

test/runtests.jl

+14-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const is_CI = haskey(ENV, "CI")
5151
end
5252
end
5353

54-
if GROUP == "Newton"
54+
if GROUP == "All" || GROUP == "Newton"
5555
@safetestset "Newton Neural ODE Tests" begin
5656
include("newton_neural_ode.jl")
5757
end
@@ -69,9 +69,19 @@ const is_CI = haskey(ENV, "CI")
6969
end
7070
end
7171

72-
@safetestset "Aqua Q/A" begin
73-
using Aqua, DiffEqFlux
72+
if GROUP == "All" || GROUP == "Aqua"
73+
@safetestset "Aqua Q/A" begin
74+
using Aqua, DiffEqFlux
7475

75-
Aqua.test_all(DiffEqFlux; ambiguities = false)
76+
# TODO: Enable persistent tasks once the downstream PRs are merged
77+
Aqua.test_all(DiffEqFlux; ambiguities = false, piracies = false,
78+
persistent_tasks = false)
79+
80+
Aqua.test_ambiguities(DiffEqFlux; recursive = false)
81+
82+
# FIXME: Remove Tridiagonal piracy after
83+
# https://github.com/JuliaDiff/ChainRules.jl/issues/713 is merged!
84+
Aqua.test_piracies(DiffEqFlux; treat_as_own = [LinearAlgebra.Tridiagonal])
85+
end
7686
end
7787
end

test/spline_layer_test.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using DiffEqFlux, ComponentArrays,
2-
Zygote, DataInterpolations, Distributions, Optimization, LinearAlgebra, Random, Test
1+
using DiffEqFlux, ComponentArrays, Zygote, DataInterpolations, Distributions, Optimization,
2+
OptimizationOptimisers, LinearAlgebra, Random, Test
33

44
function run_test(f, layer, atol)
55
ps, st = Lux.setup(Xoshiro(0), layer)

0 commit comments

Comments
 (0)