Skip to content

Commit 69fb150

Browse files
authored
Make CI pass (#262)
* Mark cat tests as broken for > 3 arguments (method ambiguity) * Put everything inside testset * No testsets on 1.0 * Narrow down on broken tests * Minimize diff * Newline * No verbose * Version check * 1.4
1 parent bff801b commit 69fb150

File tree

2 files changed

+33
-10
lines changed

2 files changed

+33
-10
lines changed

test/derivatives/ArrayFunctionTests.jl

+27-10
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,42 @@ function testcat(f, args::Tuple, type, kwargs=NamedTuple())
2727
@test value(x) == f(args...; kwargs...)
2828
else
2929
@assert length(args) == 2
30-
x = f(track(args[1]), args[2]; kwargs...)
31-
@test x isa type
32-
@test value(x) == f(args...; kwargs...)
3330

34-
x = f(args[1], track(args[2]); kwargs...)
35-
@test x isa type
36-
@test value(x) == f(args...; kwargs...)
31+
broken = f == hcat && (args[2] isa AbstractMatrix)
32+
if broken && VERSION >= v"1.4"
33+
@test_broken f(track(args[1]), args[2]; kwargs...) isa type
34+
@test_broken value(f(track(args[1]), args[2]; kwargs...)) == f(args...; kwargs...)
35+
else
36+
@test f(track(args[1]), args[2]; kwargs...) isa type
37+
@test value(f(track(args[1]), args[2]; kwargs...)) == f(args...; kwargs...)
38+
end
39+
40+
broken = f == hcat && (args[1] isa AbstractMatrix)
41+
if broken && VERSION >= v"1.4"
42+
@test_broken f(args[1], track(args[2]); kwargs...) isa type
43+
@test_broken value(f(args[1], track(args[2]); kwargs...)) == f(args...; kwargs...)
44+
else
45+
@test f(args[1], track(args[2]); kwargs...) isa type
46+
@test value(f(args[1], track(args[2]); kwargs...)) == f(args...; kwargs...)
47+
end
3748
end
3849

3950
args = (args..., args...)
40-
x = f(track.(args)...; kwargs...)
41-
@test x isa type
42-
@test value(x) == f(args...; kwargs...)
43-
4451
sizes = size.(args)
52+
broken = (f in (vcat, hcat) && (args[2] isa AbstractArray))
53+
if broken && VERSION >= v"1.4"
54+
@test_broken f(track.(args)...; kwargs...) isa type
55+
@test_broken value(f(track.(args)...; kwargs...)) == f(args...; kwargs...)
56+
else
57+
@test f(track.(args)...; kwargs...) isa type
58+
@test value(f(track.(args)...; kwargs...)) == f(args...; kwargs...)
59+
end
60+
4561
F = vecx -> sum(f(unpack(sizes, vecx)...; kwargs...))
4662
X = pack(args)
4763
@test ForwardDiff.gradient(F, X) == gradient(F, X)
4864
end
65+
4966
function pack(xs)
5067
return mapreduce(vcat, xs) do x
5168
x isa Number ? x : vec(x)

test/runtests.jl

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
using Test
2+
13
const TESTDIR = dirname(@__FILE__)
24

35
test_println(kind, f, pad = " ") = println(pad, "testing $(kind): `$(f)`...")
46

7+
@testset "ReverseDiff" begin
8+
59
println("running TapeTests...")
610
t = @elapsed include(joinpath(TESTDIR, "TapeTests.jl"))
711
println("done (took $t seconds).")
@@ -53,3 +57,5 @@ println("done (took $t seconds).")
5357
println("running CompatTests...")
5458
t = @elapsed include(joinpath(TESTDIR, "compat/CompatTests.jl"))
5559
println("done (took $t seconds).")
60+
61+
end

0 commit comments

Comments
 (0)