Skip to content

Commit 6cd01e8

Browse files
Make prerelease checking simpler
1 parent f98e470 commit 6cd01e8

File tree

11 files changed

+26
-191
lines changed

11 files changed

+26
-191
lines changed

lib/NonlinearSolveFirstOrder/test/rootfind_tests.jl

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ end
1212
using Zygote, ForwardDiff, FiniteDiff
1313

1414
# Conditionally import Enzyme only if not on Julia prerelease
15-
include("test_utilities.jl")
16-
if !is_julia_prerelease()
15+
if isempty(VERSION.prerelease)
1716
using Enzyme
1817
end
1918

2019
u0s = ([1.0, 1.0], @SVector[1.0, 1.0], 1.0)
2120

2221
# Filter autodiff backends based on Julia version
2322
autodiff_backends = [AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()]
24-
if !is_julia_prerelease()
23+
if isempty(VERSION.prerelease)
2524
push!(autodiff_backends, AutoEnzyme())
2625
end
2726

@@ -108,8 +107,7 @@ end
108107
using Zygote, ForwardDiff, FiniteDiff
109108

110109
# Conditionally import Enzyme only if not on Julia prerelease
111-
include("test_utilities.jl")
112-
if !is_julia_prerelease()
110+
if isempty(VERSION.prerelease)
113111
using Enzyme
114112
end
115113

@@ -120,7 +118,7 @@ end
120118

121119
# Filter autodiff backends based on Julia version
122120
autodiff_backends = [AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()]
123-
if !is_julia_prerelease()
121+
if isempty(VERSION.prerelease)
124122
push!(autodiff_backends, AutoEnzyme())
125123
end
126124

@@ -203,8 +201,7 @@ end
203201
using Zygote, ForwardDiff, FiniteDiff
204202

205203
# Conditionally import Enzyme only if not on Julia prerelease
206-
include("test_utilities.jl")
207-
if !is_julia_prerelease()
204+
if isempty(VERSION.prerelease)
208205
using Enzyme
209206
end
210207

@@ -216,7 +213,7 @@ end
216213

217214
# Filter autodiff backends based on Julia version
218215
autodiff_backends = [AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()]
219-
if !is_julia_prerelease()
216+
if isempty(VERSION.prerelease)
220217
push!(autodiff_backends, AutoEnzyme())
221218
end
222219

@@ -335,14 +332,13 @@ end
335332
using Zygote, ForwardDiff, FiniteDiff
336333

337334
# Conditionally import Enzyme only if not on Julia prerelease
338-
include("test_utilities.jl")
339-
if !is_julia_prerelease()
335+
if isempty(VERSION.prerelease)
340336
using Enzyme
341337
end
342338

343339
# Filter autodiff backends based on Julia version
344340
autodiff_backends = [AutoForwardDiff(), AutoZygote(), AutoFiniteDiff()]
345-
if !is_julia_prerelease()
341+
if isempty(VERSION.prerelease)
346342
push!(autodiff_backends, AutoEnzyme())
347343
end
348344

@@ -444,11 +440,10 @@ end
444440
using ADTypes, SparseConnectivityTracer, SparseMatrixColorings
445441

446442
# Include utility functions for prerelease detection
447-
include("test_utilities.jl")
448-
443+
449444
# Filter autodiff backends based on Julia version
450445
autodiff_backends = [AutoForwardDiff(), AutoFiniteDiff(), AutoZygote()]
451-
if !is_julia_prerelease()
446+
if isempty(VERSION.prerelease)
452447
push!(autodiff_backends, AutoEnzyme())
453448
end
454449

lib/NonlinearSolveFirstOrder/test/test_utilities.jl

Lines changed: 0 additions & 30 deletions
This file was deleted.

lib/NonlinearSolveHomotopyContinuation/test/allroots.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ using ADTypes
55
import NaNMath
66

77
# Conditionally import Enzyme only if not on Julia prerelease
8-
include("test_utilities.jl")
9-
if !is_julia_prerelease()
8+
if isempty(VERSION.prerelease)
109
using Enzyme
1110
end
1211

@@ -21,7 +20,7 @@ alg = HomotopyContinuationJL{true}(; threading = false)
2120
end
2221
# Filter autodiff backends based on Julia version
2322
autodiff_backends = [(AutoForwardDiff(), "no jac - forwarddiff"), (jac, "jac")]
24-
if !is_julia_prerelease()
23+
if isempty(VERSION.prerelease)
2524
push!(autodiff_backends, (AutoEnzyme(), "no jac - enzyme"))
2625
end
2726

@@ -121,7 +120,7 @@ vector_test_cases = [
121120
(f, AutoForwardDiff(), "oop + forwarddiff"), (f, fjac, "oop + jac"),
122121
(f!, AutoForwardDiff(), "iip + forwarddiff"), (f!, fjac!, "iip + jac")
123122
]
124-
if !is_julia_prerelease()
123+
if isempty(VERSION.prerelease)
125124
push!(vector_test_cases, (f, AutoEnzyme(), "oop + enzyme"))
126125
push!(vector_test_cases, (f!, AutoEnzyme(), "iip + enzyme"))
127126
end

lib/NonlinearSolveHomotopyContinuation/test/single_root.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ using SciMLBase: NonlinearSolution
44
import NaNMath
55

66
# Include utility functions for prerelease detection
7-
include("test_utilities.jl")
87

98
alg = HomotopyContinuationJL{false}(; threading = false)
109

@@ -17,7 +16,7 @@ alg = HomotopyContinuationJL{false}(; threading = false)
1716
end
1817
# Filter autodiff backends based on Julia version
1918
autodiff_backends = [(AutoForwardDiff(), "no jac - forwarddiff"), (jac, "jac")]
20-
if !is_julia_prerelease()
19+
if isempty(VERSION.prerelease)
2120
push!(autodiff_backends, (AutoEnzyme(), "no jac - enzyme"))
2221
end
2322

@@ -108,7 +107,7 @@ vector_test_cases = [
108107
(f, AutoForwardDiff(), "oop + forwarddiff"), (f, jac, "oop + jac"),
109108
(f!, AutoForwardDiff(), "iip + forwarddiff"), (f!, jac!, "iip + jac")
110109
]
111-
if !is_julia_prerelease()
110+
if isempty(VERSION.prerelease)
112111
push!(vector_test_cases, (f, AutoEnzyme(), "oop + enzyme"))
113112
push!(vector_test_cases, (f!, AutoEnzyme(), "iip + enzyme"))
114113
end

lib/NonlinearSolveHomotopyContinuation/test/test_utilities.jl

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/NonlinearSolveQuasiNewton/test/test_utilities.jl

Lines changed: 0 additions & 30 deletions
This file was deleted.

lib/SciMLJacobianOperators/test/core_tests.jl

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
using SciMLJacobianOperators
55

66
# Conditionally import Enzyme only if not on Julia prerelease
7-
include("test_utilities.jl")
8-
if !is_julia_prerelease()
7+
if isempty(VERSION.prerelease)
98
using Enzyme
109
end
1110

@@ -15,7 +14,7 @@
1514
AutoTracker(),
1615
AutoFiniteDiff()
1716
]
18-
if !is_julia_prerelease()
17+
if isempty(VERSION.prerelease)
1918
push!(reverse_ADs, AutoEnzyme())
2019
push!(reverse_ADs, AutoEnzyme(; mode = Enzyme.Reverse))
2120
end
@@ -24,7 +23,7 @@
2423
AutoForwardDiff(),
2524
AutoFiniteDiff()
2625
]
27-
if !is_julia_prerelease()
26+
if isempty(VERSION.prerelease)
2827
push!(forward_ADs, AutoEnzyme())
2928
push!(forward_ADs, AutoEnzyme(; mode = Enzyme.Forward))
3029
end
@@ -99,16 +98,15 @@ end
9998
using SciMLJacobianOperators
10099

101100
# Conditionally import Enzyme only if not on Julia prerelease
102-
include("test_utilities.jl")
103-
if !is_julia_prerelease()
101+
if isempty(VERSION.prerelease)
104102
using Enzyme
105103
end
106104

107105
reverse_ADs = [
108106
AutoReverseDiff(),
109107
AutoFiniteDiff()
110108
]
111-
if !is_julia_prerelease()
109+
if isempty(VERSION.prerelease)
112110
push!(reverse_ADs, AutoEnzyme())
113111
push!(reverse_ADs, AutoEnzyme(; mode = Enzyme.Reverse))
114112
end
@@ -117,7 +115,7 @@ end
117115
AutoForwardDiff(),
118116
AutoFiniteDiff()
119117
]
120-
if !is_julia_prerelease()
118+
if isempty(VERSION.prerelease)
121119
push!(forward_ADs, AutoEnzyme())
122120
push!(forward_ADs, AutoEnzyme(; mode = Enzyme.Forward))
123121
end
@@ -198,8 +196,7 @@ end
198196
using SciMLJacobianOperators
199197

200198
# Conditionally import Enzyme only if not on Julia prerelease
201-
include("test_utilities.jl")
202-
if !is_julia_prerelease()
199+
if isempty(VERSION.prerelease)
203200
using Enzyme
204201
end
205202

@@ -209,7 +206,7 @@ end
209206
AutoReverseDiff(),
210207
AutoFiniteDiff()
211208
]
212-
if !is_julia_prerelease()
209+
if isempty(VERSION.prerelease)
213210
push!(reverse_ADs, AutoEnzyme())
214211
push!(reverse_ADs, AutoEnzyme(; mode = Enzyme.Reverse))
215212
end
@@ -218,7 +215,7 @@ end
218215
AutoForwardDiff(),
219216
AutoFiniteDiff()
220217
]
221-
if !is_julia_prerelease()
218+
if isempty(VERSION.prerelease)
222219
push!(forward_ADs, AutoEnzyme())
223220
push!(forward_ADs, AutoEnzyme(; mode = Enzyme.Forward))
224221
end

lib/SciMLJacobianOperators/test/test_utilities.jl

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/SimpleNonlinearSolve/test/core/rootfind_tests.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
using ADTypes, PolyesterForwardDiff, ReverseDiff
44

55
# Conditionally import Enzyme only if not on Julia prerelease
6-
include("../test_utilities.jl")
7-
if !is_julia_prerelease()
6+
if isempty(VERSION.prerelease)
87
using Enzyme
98
end
109

@@ -60,7 +59,7 @@ end
6059
AutoReverseDiff(),
6160
nothing
6261
]
63-
if !is_julia_prerelease()
62+
if isempty(VERSION.prerelease)
6463
push!(autodiff_backends, AutoEnzyme())
6564
end
6665

lib/SimpleNonlinearSolve/test/test_utilities.jl

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)