Skip to content

Commit 3034262

Browse files
MilesCranmerMilesCranmer
committed
ci: hide misses from coverage
1 parent 1c0d019 commit 3034262

File tree

4 files changed

+96
-68
lines changed

4 files changed

+96
-68
lines changed

‎src/Evaluate.jl‎

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ end
297297
Base.Cartesian.@nexprs($N, i -> cumulator_i = cumulators[i])
298298
@inbounds @simd for j in eachindex(cumulator_1)
299299
cumulator_1[j] = Base.Cartesian.@ncall($N, op, i -> cumulator_i[j])::T
300-
end
300+
end # COV_EXCL_LINE
301301
return ResultOk(cumulator_1, true)
302302
end
303303
end
@@ -375,7 +375,7 @@ end
375375
cs = get_children(tree, Val($degree))
376376
Base.Cartesian.@nexprs(
377377
$degree,
378-
i -> begin
378+
i -> begin # COV_EXCL_LINE
379379
result_i = _eval_tree_array(cs[i], cX, operators, eval_options)
380380
!result_i.ok && return result_i
381381
@return_on_nonfinite_array(eval_options, result_i.x)
@@ -385,10 +385,10 @@ end
385385
cumulators = Base.Cartesian.@ntuple($degree, i -> result_i.x)
386386
Base.Cartesian.@nif(
387387
$nops,
388-
i -> i == op_idx,
389-
i -> degn_eval(
390-
cumulators, get_op(operators, Val($degree), Val(i)), eval_options
391-
)
388+
i -> i == op_idx, # COV_EXCL_LINE
389+
i -> begin # COV_EXCL_LINE
390+
degn_eval(cumulators, get_op(operators, Val($degree), Val(i)), eval_options)
391+
end,
392392
)
393393
end
394394
end
@@ -405,8 +405,10 @@ end
405405
degree = tree.degree
406406
return Base.Cartesian.@nif(
407407
$D,
408-
d -> d == degree,
409-
d -> inner_dispatch_degn_eval(tree, cX, Val(d), operators, eval_options)
408+
d -> d == degree, # COV_EXCL_LINE
409+
d -> begin # COV_EXCL_LINE
410+
inner_dispatch_degn_eval(tree, cX, Val(d), operators, eval_options)
411+
end,
410412
)
411413
end
412414
end
@@ -434,8 +436,8 @@ end
434436
return quote
435437
return Base.Cartesian.@nif(
436438
$nbin,
437-
i -> i == op_idx,
438-
i -> let op = operators.binops[i]
439+
i -> i == op_idx, # COV_EXCL_LINE
440+
i -> let op = operators.binops[i] # COV_EXCL_LINE
439441
if get_child(tree, 1).degree == 0 && get_child(tree, 2).degree == 0
440442
deg2_l0_r0_eval(tree, cX, op, eval_options)
441443
elseif get_child(tree, 2).degree == 0
@@ -488,8 +490,8 @@ end
488490
return quote
489491
Base.Cartesian.@nif(
490492
$nuna,
491-
i -> i == op_idx,
492-
i -> let op = operators.unaops[i]
493+
i -> i == op_idx, # COV_EXCL_LINE
494+
i -> let op = operators.unaops[i] # COV_EXCL_LINE
493495
if get_child(tree, 1).degree == 2 &&
494496
get_child(get_child(tree, 1), 1).degree == 0 &&
495497
get_child(get_child(tree, 1), 2).degree == 0
@@ -530,8 +532,8 @@ end
530532
quote
531533
Base.Cartesian.@nif(
532534
$nbin,
533-
j -> j == l_op_idx,
534-
j -> let op_l = binops[j]
535+
j -> j == l_op_idx, # COV_EXCL_LINE
536+
j -> let op_l = binops[j] # COV_EXCL_LINE
535537
deg1_l2_ll0_lr0_eval(tree, cX, op, op_l, eval_options)
536538
end,
537539
)
@@ -549,8 +551,8 @@ end
549551
quote
550552
Base.Cartesian.@nif(
551553
$nuna,
552-
j -> j == l_op_idx,
553-
j -> let op_l = unaops[j]
554+
j -> j == l_op_idx, # COV_EXCL_LINE
555+
j -> let op_l = unaops[j] # COV_EXCL_LINE
554556
deg1_l1_ll0_eval(tree, cX, op, op_l, eval_options)
555557
end,
556558
)
@@ -752,8 +754,10 @@ over an entire array when the values are all the same.
752754
deg == 0 && return deg0_eval_constant(tree)
753755
Base.Cartesian.@nif(
754756
$D,
755-
i -> i == deg,
756-
i -> inner_dispatch_degn_eval_constant(tree, Val(i), operators)
757+
i -> i == deg, # COV_EXCL_LINE
758+
i -> begin # COV_EXCL_LINE
759+
inner_dispatch_degn_eval_constant(tree, Val(i), operators)
760+
end,
757761
)
758762
end
759763
end
@@ -767,7 +771,7 @@ end
767771
cs = get_children(tree, Val($degree))
768772
Base.Cartesian.@nexprs(
769773
$degree,
770-
i -> begin
774+
i -> begin # COV_EXCL_LINE
771775
input_i = let result = dispatch_constant_tree(cs[i], operators)
772776
!result.ok && return result
773777
result.x
@@ -788,10 +792,12 @@ end
788792
op_idx = tree.op
789793
Base.Cartesian.@nif(
790794
$nops,
791-
i -> i == op_idx,
792-
i -> degn_eval_constant(
793-
inputs, get_op(operators, Val($degree), Val(i))
794-
)::ResultOk{T}
795+
i -> i == op_idx, # COV_EXCL_LINE
796+
i -> begin # COV_EXCL_LINE
797+
degn_eval_constant(
798+
inputs, get_op(operators, Val($degree), Val(i))
799+
)::ResultOk{T}
800+
end,
795801
)
796802
end
797803
end
@@ -828,8 +834,10 @@ end
828834
deg = tree.degree
829835
Base.Cartesian.@nif(
830836
$D,
831-
i -> i == deg,
832-
i -> dispatch_degn_diff_eval(tree, cX, op_idx, Val(i), operators)
837+
i -> i == deg, # COV_EXCL_LINE
838+
i -> begin # COV_EXCL_LINE
839+
dispatch_degn_diff_eval(tree, cX, op_idx, Val(i), operators)
840+
end,
833841
)
834842
end
835843
end
@@ -861,7 +869,7 @@ end
861869
cs = get_children(tree, Val($degree))
862870
Base.Cartesian.@nexprs(
863871
$degree,
864-
i -> begin
872+
i -> begin # COV_EXCL_LINE
865873
cumulator_i =
866874
let result = _differentiable_eval_tree_array(cs[i], cX, operators)
867875
!result.ok && return result
@@ -872,8 +880,10 @@ end
872880
cumulators = Base.Cartesian.@ntuple($degree, i -> cumulator_i)
873881
Base.Cartesian.@nif(
874882
$nops,
875-
i -> i == op_idx,
876-
i -> degn_diff_eval(cumulators, get_op(operators, Val($degree), Val(i)))
883+
i -> i == op_idx, # COV_EXCL_LINE
884+
i -> begin # COV_EXCL_LINE
885+
degn_diff_eval(cumulators, get_op(operators, Val($degree), Val(i)))
886+
end,
877887
)
878888
end
879889
end
@@ -964,10 +974,12 @@ end
964974
deg = tree.degree
965975
Base.Cartesian.@nif(
966976
$D,
967-
i -> i == deg,
968-
i -> dispatch_degn_eval_generic(
969-
tree, cX, op_idx, Val(i), operators, Val(throw_errors)
970-
)
977+
i -> i == deg, # COV_EXCL_LINE
978+
i -> begin # COV_EXCL_LINE
979+
dispatch_degn_eval_generic(
980+
tree, cX, op_idx, Val(i), operators, Val(throw_errors)
981+
)
982+
end,
971983
)
972984
end
973985
end
@@ -1017,7 +1029,7 @@ end
10171029
cs = get_children(tree, Val($degree))
10181030
Base.Cartesian.@nexprs(
10191031
$degree,
1020-
i -> begin
1032+
i -> begin # COV_EXCL_LINE
10211033
cumulator_i =
10221034
let (x, complete) = _eval_tree_array_generic(
10231035
cs[i], cX, operators, Val(throw_errors)
@@ -1030,13 +1042,15 @@ end
10301042
cumulators = Base.Cartesian.@ntuple($degree, i -> cumulator_i)
10311043
Base.Cartesian.@nif(
10321044
$nops,
1033-
i -> i == op_idx,
1034-
i -> degn_eval_generic(
1035-
cumulators,
1036-
get_op(operators, Val($degree), Val(i)),
1037-
Val(N),
1038-
Val(throw_errors),
1039-
)
1045+
i -> i == op_idx, # COV_EXCL_LINE
1046+
i -> begin # COV_EXCL_LINE
1047+
degn_eval_generic(
1048+
cumulators,
1049+
get_op(operators, Val($degree), Val(i)),
1050+
Val(N),
1051+
Val(throw_errors),
1052+
)
1053+
end,
10401054
)
10411055
end
10421056
end

‎src/EvaluateDerivative.jl‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ end
7676
deg == 0 && return diff_deg0_eval(tree, cX, direction)
7777
Base.Cartesian.@nif(
7878
$D,
79-
i -> i == deg,
80-
i -> dispatch_diff_degn_eval(tree, cX, Val(i), operators, direction)
79+
i -> i == deg, # COV_EXCL_LINE
80+
i -> begin # COV_EXCL_LINE
81+
dispatch_diff_degn_eval(tree, cX, Val(i), operators, direction)
82+
end,
8183
)
8284
end
8385
end
@@ -98,7 +100,7 @@ end
98100
x_cumulators::NTuple{N}, dx_cumulators::NTuple{N}, op::F, direction::Integer
99101
) where {N,F}
100102
quote
101-
Base.Cartesian.@nexprs($N, i -> begin
103+
Base.Cartesian.@nexprs($N, i -> begin # COV_EXCL_LINE
102104
x_cumulator_i = x_cumulators[i]
103105
dx_cumulator_i = dx_cumulators[i]
104106
end)
@@ -129,7 +131,7 @@ end
129131
cs = get_children(tree, Val($degree))
130132
Base.Cartesian.@nexprs(
131133
$degree,
132-
i -> begin
134+
i -> begin # COV_EXCL_LINE
133135
result_i = _eval_diff_tree_array(cs[i], cX, operators, direction)
134136
!result_i.ok && return result_i
135137
end
@@ -151,13 +153,15 @@ end
151153
$setup
152154
Base.Cartesian.@nif(
153155
$nops,
154-
i -> i == op_idx,
155-
i -> diff_degn_eval(
156-
x_cumulators,
157-
dx_cumulators,
158-
get_op(operators, Val($degree), Val(i)),
159-
direction,
160-
)
156+
i -> i == op_idx, # COV_EXCL_LINE
157+
i -> begin # COV_EXCL_LINE
158+
diff_degn_eval(
159+
x_cumulators,
160+
dx_cumulators,
161+
get_op(operators, Val($degree), Val(i)),
162+
direction,
163+
)
164+
end,
161165
)
162166
end
163167
end
@@ -268,10 +272,12 @@ end
268272
deg == 0 && return grad_deg0_eval(tree, n_gradients, index_tree, cX, Val(mode))
269273
Base.Cartesian.@nif(
270274
$D,
271-
i -> i == deg,
272-
i -> dispatch_grad_degn_eval(
273-
tree, n_gradients, index_tree, cX, Val(i), operators, Val(mode)
274-
)
275+
i -> i == deg, # COV_EXCL_LINE
276+
i -> begin # COV_EXCL_LINE
277+
dispatch_grad_degn_eval(
278+
tree, n_gradients, index_tree, cX, Val(i), operators, Val(mode)
279+
)
280+
end,
275281
)
276282
end
277283
end
@@ -291,7 +297,7 @@ end
291297
isnothing(index_tree) ? index_tree : get_children(index_tree, Val($degree))
292298
Base.Cartesian.@nexprs(
293299
$degree,
294-
i -> begin
300+
i -> begin # COV_EXCL_LINE
295301
result_i = eval_grad_tree_array(
296302
cs[i],
297303
n_gradients,
@@ -318,10 +324,14 @@ end
318324
$setup
319325
Base.Cartesian.@nif(
320326
$nops,
321-
i -> i == op_idx,
322-
i -> grad_degn_eval(
323-
x_cumulators, d_cumulators, get_op(operators, Val($degree), Val(i))
324-
)
327+
i -> i == op_idx, # COV_EXCL_LINE
328+
i -> begin # COV_EXCL_LINE
329+
grad_degn_eval(
330+
x_cumulators,
331+
d_cumulators,
332+
get_op(operators, Val($degree), Val(i)),
333+
)
334+
end,
325335
)
326336
end
327337
end
@@ -331,7 +341,7 @@ end
331341
x_cumulators::NTuple{N}, d_cumulators::NTuple{N}, op::F
332342
) where {N,F}
333343
quote
334-
Base.Cartesian.@nexprs($N, i -> begin
344+
Base.Cartesian.@nexprs($N, i -> begin # COV_EXCL_LINE
335345
x_cumulator_i = x_cumulators[i]
336346
d_cumulator_i = d_cumulators[i]
337347
end)

‎src/Strings.jl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ end
3333
degree = branch.degree
3434
Base.Cartesian.@nif(
3535
$D,
36-
d -> d == degree,
37-
d -> dispatch_op_name(Val(d), f.operators, branch.op, f.pretty),
36+
d -> d == degree, # COV_EXCL_LINE
37+
d -> begin # COV_EXCL_LINE
38+
dispatch_op_name(Val(d), f.operators, branch.op, f.pretty)
39+
end,
3840
)::Vector{Char}
3941
end
4042
end

‎src/base.jl‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ end
136136
branch = mapreducer.f_branch(tree)
137137
Base.Cartesian.@nif(
138138
$D,
139-
i -> i == d,
140-
i -> let cs = get_children(tree, Val(i))
139+
i -> i == d, # COV_EXCL_LINE
140+
i -> let cs = get_children(tree, Val(i)) # COV_EXCL_LINE
141141
Base.Cartesian.@ncall(
142142
i,
143143
mapreducer.op,
@@ -180,7 +180,9 @@ By using this instead of tree_mapreduce, we can take advantage of early exits.
180180
deg == 0 && return @inline(f(tree))
181181
return (
182182
@inline(f(tree)) || Base.Cartesian.@nif(
183-
$D, i -> deg == i, i -> let cs = get_children(tree, Val(i))
183+
$D,
184+
i -> deg == i, # COV_EXCL_LINE
185+
i -> let cs = get_children(tree, Val(i)) # COV_EXCL_LINE
184186
Base.Cartesian.@nany(i, j -> any(f, cs[j]))
185187
end
186188
)
@@ -223,9 +225,9 @@ end
223225
(
224226
branch_equal(a, b) && Base.Cartesian.@nif(
225227
$D,
226-
i -> deg == i,
228+
i -> deg == i, # COV_EXCL_LINE
227229
i ->
228-
let cs_a = get_children(a, Val(i)), cs_b = get_children(b, Val(i))
230+
let cs_a = get_children(a, Val(i)), cs_b = get_children(b, Val(i)) # COV_EXCL_LINE
229231
Base.Cartesian.@nall(
230232
i, j -> inner_is_equal(cs_a[j], cs_b[j], id_maps)
231233
)

0 commit comments

Comments
 (0)