Skip to content

Commit 7f52242

Browse files
committed
Readded all tests
1 parent 0bba1a5 commit 7f52242

File tree

1 file changed

+54
-60
lines changed

1 file changed

+54
-60
lines changed

test/runtests.jl

Lines changed: 54 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -44,69 +44,63 @@ using KernelFunctions: metric, kappa, ColVecs, RowVecs
4444

4545
include("utils.jl")
4646
include("utils_AD.jl")
47-
# @testset "distances" begin
48-
# include(joinpath("distances", "dotproduct.jl"))
49-
# include(joinpath("distances", "delta.jl"))
50-
# include(joinpath("distances", "sinus.jl"))
51-
# end
52-
#
53-
# @testset "transform" begin
54-
# include(joinpath("transform", "transform.jl"))
55-
# include(joinpath("transform", "scaletransform.jl"))
56-
# include(joinpath("transform", "ardtransform.jl"))
57-
# include(joinpath("transform", "lineartransform.jl"))
58-
# include(joinpath("transform", "functiontransform.jl"))
59-
# include(joinpath("transform", "selecttransform.jl"))
60-
# include(joinpath("transform", "chaintransform.jl"))
61-
# end
47+
@testset "distances" begin
48+
include(joinpath("distances", "dotproduct.jl"))
49+
include(joinpath("distances", "delta.jl"))
50+
include(joinpath("distances", "sinus.jl"))
51+
end
52+
53+
@testset "transform" begin
54+
include(joinpath("transform", "transform.jl"))
55+
include(joinpath("transform", "scaletransform.jl"))
56+
include(joinpath("transform", "ardtransform.jl"))
57+
include(joinpath("transform", "lineartransform.jl"))
58+
include(joinpath("transform", "functiontransform.jl"))
59+
include(joinpath("transform", "selecttransform.jl"))
60+
include(joinpath("transform", "chaintransform.jl"))
61+
end
6262

6363
@testset "basekernels" begin
6464
include(joinpath("basekernels", "constant.jl"))
65-
# include(joinpath("basekernels", "cosine.jl"))
66-
# include(joinpath("basekernels", "exponential.jl"))
67-
# include(joinpath("basekernels", "exponentiated.jl"))
68-
# include(joinpath("basekernels", "fbm.jl"))
69-
# include(joinpath("basekernels", "gabor.jl"))
70-
# include(joinpath("basekernels", "maha.jl"))
71-
# include(joinpath("basekernels", "matern.jl"))
72-
# include(joinpath("basekernels", "nn.jl"))
73-
# include(joinpath("basekernels", "periodic.jl"))
74-
# include(joinpath("basekernels", "polynomial.jl"))
75-
# include(joinpath("basekernels", "piecewisepolynomial.jl"))
76-
# include(joinpath("basekernels", "rationalquad.jl"))
77-
# include(joinpath("basekernels", "sm.jl"))
78-
# include(joinpath("basekernels", "wiener.jl"))
65+
include(joinpath("basekernels", "cosine.jl"))
66+
include(joinpath("basekernels", "exponential.jl"))
67+
include(joinpath("basekernels", "exponentiated.jl"))
68+
include(joinpath("basekernels", "fbm.jl"))
69+
include(joinpath("basekernels", "gabor.jl"))
70+
include(joinpath("basekernels", "maha.jl"))
71+
include(joinpath("basekernels", "matern.jl"))
72+
include(joinpath("basekernels", "nn.jl"))
73+
include(joinpath("basekernels", "periodic.jl"))
74+
include(joinpath("basekernels", "polynomial.jl"))
75+
include(joinpath("basekernels", "piecewisepolynomial.jl"))
76+
include(joinpath("basekernels", "rationalquad.jl"))
77+
include(joinpath("basekernels", "sm.jl"))
78+
include(joinpath("basekernels", "wiener.jl"))
7979
end
8080

81-
# @testset "kernels" begin
82-
# include(joinpath("kernels", "kernelproduct.jl"))
83-
# include(joinpath("kernels", "kernelsum.jl"))
84-
# include(joinpath("kernels", "scaledkernel.jl"))
85-
# include(joinpath("kernels", "tensorproduct.jl"))
86-
# include(joinpath("kernels", "transformedkernel.jl"))
87-
#
88-
# # Legacy tests that don't correspond to anything meaningful in src. Unclear how
89-
# # helpful these are.
90-
# include(joinpath("kernels", "custom.jl"))
91-
# end
92-
#
93-
# @testset "matrix" begin
94-
# include(joinpath("matrix", "kernelmatrix.jl"))
95-
# include(joinpath("matrix", "kernelkroneckermat.jl"))
96-
# include(joinpath("matrix", "kernelpdmat.jl"))
97-
# end
98-
#
99-
# @testset "approximations" begin
100-
# include(joinpath("approximations", "nystrom.jl"))
101-
# end
102-
#
103-
# include("generic.jl")
104-
# include("zygote_adjoints.jl")
105-
# include("trainable.jl")
106-
end
81+
@testset "kernels" begin
82+
include(joinpath("kernels", "kernelproduct.jl"))
83+
include(joinpath("kernels", "kernelsum.jl"))
84+
include(joinpath("kernels", "scaledkernel.jl"))
85+
include(joinpath("kernels", "tensorproduct.jl"))
86+
include(joinpath("kernels", "transformedkernel.jl"))
87+
88+
# Legacy tests that don't correspond to anything meaningful in src. Unclear how
89+
# helpful these are.
90+
include(joinpath("kernels", "custom.jl"))
91+
end
10792

108-
# These are legacy tests that I'm not getting rid of, as they appear to be useful, but
109-
# weren't enabled on master at the time of refactoring the tests. They will need to be
110-
# restored at some point.
111-
# include("utils_AD.jl")
112-
# include("test_AD.jl")
93+
@testset "matrix" begin
94+
include(joinpath("matrix", "kernelmatrix.jl"))
95+
include(joinpath("matrix", "kernelkroneckermat.jl"))
96+
include(joinpath("matrix", "kernelpdmat.jl"))
97+
end
98+
99+
@testset "approximations" begin
100+
include(joinpath("approximations", "nystrom.jl"))
101+
end
102+
103+
include("generic.jl")
104+
include("zygote_adjoints.jl")
105+
include("trainable.jl")
106+
end

0 commit comments

Comments
 (0)