Skip to content

Commit d702b85

Browse files
committed
test: wrap every remaining test in testitem
1 parent d1c84ab commit d702b85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1027
-970
lines changed

test/integration/ad/enzyme/test_enzyme_parametric.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@testitem "Test Enzyme derivatives of parametric expression" tags = [:enzyme] begin
1+
@testitem "Test Enzyme derivatives of parametric expression" begin
22
using SymbolicRegression
33
using SymbolicRegression.ConstantOptimizationModule: specialized_options
44
using DynamicExpressions

test/integration/ad/mooncake/test_mooncake_autodiff.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@testitem "Expression constant optimization with Mooncake" tags = [:mooncake, :part1] begin
1+
@testitem "Expression constant optimization with Mooncake" begin
22
using SymbolicRegression
33
using SymbolicRegression.ConstantOptimizationModule: optimize_constants
44
using DynamicExpressions: get_scalar_constants

test/integration/ad/zygote/test_expression_derivatives.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@testitem "Test derivatives" tags = [:part1] begin
1+
@testitem "Test derivatives" begin
22
using SymbolicRegression
33
using Zygote: Zygote
44
using Random: MersenneTwister
@@ -35,7 +35,7 @@
3535
@test δy2 δy2_hat
3636
end
3737

38-
@testitem "Test derivatives during optimization" tags = [:part1] begin
38+
@testitem "Test derivatives during optimization" begin
3939
using SymbolicRegression
4040
using SymbolicRegression.ConstantOptimizationModule:
4141
Evaluator, GradEvaluator, EvaluatorContext
@@ -68,7 +68,7 @@ end
6868
@test G[] != 0
6969
end
7070

71-
@testitem "Test derivatives of parametric expression during optimization" tags = [:part3] begin
71+
@testitem "Test derivatives of parametric expression during optimization" begin
7272
using SymbolicRegression
7373
using SymbolicRegression.ConstantOptimizationModule: specialized_options
7474
using DynamicExpressions

test/integration/ext/dynamicquantities_units/test_units.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@testitem "Dimensional analysis" tags = [:part3] begin
1+
@testitem "Dimensional analysis" begin
22
using SymbolicRegression
33
using SymbolicRegression.InterfaceDynamicQuantitiesModule: get_units
44
using SymbolicRegression.DimensionalAnalysisModule: violates_dimensional_constraints
@@ -100,7 +100,7 @@
100100
end
101101
end
102102

103-
@testitem "Search with dimensional constraints" tags = [:part3] begin
103+
@testitem "Search with dimensional constraints" begin
104104
using SymbolicRegression
105105
using SymbolicRegression.DimensionalAnalysisModule: violates_dimensional_constraints
106106
using Random: MersenneTwister
@@ -147,7 +147,7 @@ end
147147
@test length(valid_trees) > 0
148148
end
149149

150-
@testitem "Operator compatibility" tags = [:part3] begin
150+
@testitem "Operator compatibility" begin
151151
using SymbolicRegression
152152
using DynamicQuantities
153153

@@ -190,7 +190,7 @@ end
190190
@test_throws DimensionError atanh_clip(1.0u"m")
191191
end
192192

193-
@testitem "Search with dimensional constraints on output" tags = [:part3] begin
193+
@testitem "Search with dimensional constraints on output" begin
194194
using SymbolicRegression
195195
using MLJBase: MLJBase as MLJ
196196
using DynamicQuantities
@@ -316,7 +316,7 @@ end
316316
end
317317
end
318318

319-
@testitem "Should error on mismatched units" tags = [:part3] begin
319+
@testitem "Should error on mismatched units" begin
320320
using SymbolicRegression
321321
using DynamicQuantities
322322

@@ -325,7 +325,7 @@ end
325325
@test_throws("Number of features", Dataset(X, y; X_units=["m", "1"], y_units="kg"))
326326
end
327327

328-
@testitem "Should print units" tags = [:part3] begin
328+
@testitem "Should print units" begin
329329
using SymbolicRegression
330330
using DynamicQuantities
331331

@@ -389,7 +389,7 @@ end
389389
) == "x₅[5.0 m] * 3.2"
390390
end
391391

392-
@testitem "Dimensionless constants" tags = [:part3] begin
392+
@testitem "Dimensionless constants" begin
393393
using SymbolicRegression
394394
using SymbolicRegression.DimensionalAnalysisModule: violates_dimensional_constraints
395395
using DynamicQuantities
@@ -433,7 +433,7 @@ end
433433
end
434434
end
435435

436-
@testitem "Miscellaneous tests of unit interface" tags = [:part3] begin
436+
@testitem "Miscellaneous tests of unit interface" begin
437437
using SymbolicRegression
438438
using DynamicQuantities
439439
using SymbolicRegression.DimensionalAnalysisModule: @maybe_return_call, WildcardQuantity
Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
1-
@testitem "Search with batching & weighted & serial & progress bar & warmup & BFGS" tags = [
2-
:part1
3-
] begin
1+
@testitem "Search with batching & weighted & serial & progress bar & warmup & BFGS" begin
42
include("test_mixed_utils.jl")
53
test_mixed(0, true, true, :serial)
64
end
75

8-
@testitem "Search with multiprocessing & batching & multi-output & use_frequency & string-specified parallelism" tags = [
9-
:part2
10-
] begin
6+
@testitem "Search with multiprocessing & batching & multi-output & use_frequency & string-specified parallelism" begin
117
include("test_mixed_utils.jl")
128
test_mixed(1, true, false, :multiprocessing)
139
end
1410

15-
@testitem "Search with multi-threading & default settings" tags = [:part3] begin
11+
@testitem "Search with multi-threading & default settings" begin
1612
include("test_mixed_utils.jl")
1713
test_mixed(2, false, true, :multithreading)
1814
end
1915

20-
@testitem "Search with multi-threading & weighted & crossover & use_frequency_in_tournament & bumper" tags = [
21-
:part1
22-
] begin
16+
@testitem "Search with multi-threading & weighted & crossover & use_frequency_in_tournament & bumper" begin
2317
include("test_mixed_utils.jl")
2418
test_mixed(3, false, false, :multithreading)
2519
end
2620

27-
@testitem "Search with multi-threading & crossover & skip mutation failures & both frequencies options & Float16 type" tags = [
28-
:part2
29-
] begin
21+
@testitem "Search with multi-threading & crossover & skip mutation failures & both frequencies options & Float16 type" begin
3022
include("test_mixed_utils.jl")
3123
test_mixed(4, false, false, :multithreading)
3224
end
3325

34-
@testitem "Search with multiprocessing & default hyperparameters & Float64 type & turbo" tags = [
35-
:part3
36-
] begin
26+
@testitem "Search with multiprocessing & default hyperparameters & Float64 type & turbo" begin
3727
include("test_mixed_utils.jl")
3828
test_mixed(5, false, false, :multiprocessing)
3929
end

test/integration/ext/loopvectorization/test_operators.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@testitem "Generic operator tests" tags = [:part2] begin
1+
@testitem "Generic operator tests" begin
22
using SymbolicRegression
33
using SymbolicRegression:
44
plus,
@@ -75,7 +75,7 @@
7575
end
7676
end
7777

78-
@testitem "Built-in operators pass validation" tags = [:part3] begin
78+
@testitem "Built-in operators pass validation" begin
7979
using SymbolicRegression
8080
using SymbolicRegression: plus, sub, mult, square, cube, neg, relu, greater, less
8181
using SymbolicRegression: greater_equal, less_equal, logical_or, logical_and, cond
@@ -143,7 +143,7 @@ end
143143
@test inverse_opmap(less_equal) == (<=)
144144
end
145145

146-
@testitem "Built-in operators pass validation for complex numbers" tags = [:part2] begin
146+
@testitem "Built-in operators pass validation for complex numbers" begin
147147
using SymbolicRegression
148148
using SymbolicRegression: plus, sub, mult, square, cube, neg
149149

@@ -157,7 +157,7 @@ end
157157
end
158158
end
159159

160-
@testitem "Incompatibilities are caught" tags = [:part3] begin
160+
@testitem "Incompatibilities are caught" begin
161161
using SymbolicRegression
162162
using SymbolicRegression: greater
163163

@@ -170,7 +170,7 @@ end
170170
)
171171
end
172172

173-
@testitem "Operators with wrong type fail" tags = [:part2] begin
173+
@testitem "Operators with wrong type fail" begin
174174
using SymbolicRegression
175175

176176
my_bad_op(x) = 1.0f0
@@ -184,7 +184,7 @@ end
184184
@test_nowarn SymbolicRegression.assert_operators_well_defined(Float32, options)
185185
end
186186

187-
@testitem "Turbo mode matches regular mode" tags = [:part2] begin
187+
@testitem "Turbo mode matches regular mode" begin
188188
using SymbolicRegression
189189
using SymbolicRegression:
190190
Node,
@@ -239,7 +239,7 @@ end
239239
end
240240
end
241241

242-
@testitem "Safe operators are compatible with ForwardDiff" tags = [:part2] begin
242+
@testitem "Safe operators are compatible with ForwardDiff" begin
243243
using SymbolicRegression
244244
using SymbolicRegression:
245245
safe_log,
@@ -298,7 +298,7 @@ end
298298
end
299299
end
300300

301-
@testitem "user_provided_operators applies safe operator mappings" tags = [:part1] begin
301+
@testitem "user_provided_operators applies safe operator mappings" begin
302302
using SymbolicRegression
303303
using SymbolicRegression: safe_log, safe_pow, safe_sqrt
304304
using DynamicExpressions: OperatorEnum

0 commit comments

Comments
 (0)