Skip to content

Commit 1105703

Browse files
fgittinsChrisRackauckas
authored andcommitted
Fix test error for non-CUDA machines
1 parent 0c2daa4 commit 1105703

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

test/cuda_tests.jl

+22-19
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,31 @@ end
4646

4747
@testitem "Termination Conditions: Allocations" tags=[:cuda] begin
4848
using CUDA, NonlinearSolveBase, Test, LinearAlgebra
49-
CUDA.allowscalar(false)
50-
du = cu(rand(4))
51-
u = cu(rand(4))
52-
uprev = cu(rand(4))
53-
TERMINATION_CONDITIONS = [
54-
RelTerminationMode, AbsTerminationMode
55-
]
56-
NORM_TERMINATION_CONDITIONS = [
57-
AbsNormTerminationMode, RelNormTerminationMode, RelNormSafeTerminationMode,
58-
AbsNormSafeTerminationMode, RelNormSafeBestTerminationMode, AbsNormSafeBestTerminationMode
59-
]
6049

61-
@testset begin
62-
@testset "Mode: $(tcond)" for tcond in TERMINATION_CONDITIONS
63-
@test_nowarn NonlinearSolveBase.check_convergence(
64-
tcond(), du, u, uprev, 1e-3, 1e-3)
65-
end
50+
if CUDA.functional()
51+
CUDA.allowscalar(false)
52+
du = cu(rand(4))
53+
u = cu(rand(4))
54+
uprev = cu(rand(4))
55+
TERMINATION_CONDITIONS = [
56+
RelTerminationMode, AbsTerminationMode
57+
]
58+
NORM_TERMINATION_CONDITIONS = [
59+
AbsNormTerminationMode, RelNormTerminationMode, RelNormSafeTerminationMode,
60+
AbsNormSafeTerminationMode, RelNormSafeBestTerminationMode, AbsNormSafeBestTerminationMode
61+
]
6662

67-
@testset "Mode: $(tcond)" for tcond in NORM_TERMINATION_CONDITIONS
68-
for nfn in (Base.Fix1(maximum, abs), Base.Fix2(norm, 2), Base.Fix2(norm, Inf))
63+
@testset begin
64+
@testset "Mode: $(tcond)" for tcond in TERMINATION_CONDITIONS
6965
@test_nowarn NonlinearSolveBase.check_convergence(
70-
tcond(nfn), du, u, uprev, 1e-3, 1e-3)
66+
tcond(), du, u, uprev, 1e-3, 1e-3)
67+
end
68+
69+
@testset "Mode: $(tcond)" for tcond in NORM_TERMINATION_CONDITIONS
70+
for nfn in (Base.Fix1(maximum, abs), Base.Fix2(norm, 2), Base.Fix2(norm, Inf))
71+
@test_nowarn NonlinearSolveBase.check_convergence(
72+
tcond(nfn), du, u, uprev, 1e-3, 1e-3)
73+
end
7174
end
7275
end
7376
end

0 commit comments

Comments
 (0)