Skip to content

Commit 671f960

Browse files
devmotiondevmotion
authored
Do not use include(joinpath(...)) (#365)
* Do not use `include(joinpath(...))` * Bump version
1 parent 94500c6 commit 671f960

File tree

3 files changed

+93
-93
lines changed

3 files changed

+93
-93
lines changed

‎Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "KernelFunctions"
22
uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392"
3-
version = "0.10.16"
3+
version = "0.10.17"
44

55
[deps]
66
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

‎src/KernelFunctions.jl

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -63,54 +63,54 @@ abstract type Kernel end
6363
abstract type SimpleKernel <: Kernel end
6464

6565
include("utils.jl")
66-
include(joinpath("distances", "pairwise.jl"))
67-
include(joinpath("distances", "dotproduct.jl"))
68-
include(joinpath("distances", "delta.jl"))
69-
include(joinpath("distances", "sinus.jl"))
70-
71-
include(joinpath("transform", "transform.jl"))
72-
include(joinpath("transform", "scaletransform.jl"))
73-
include(joinpath("transform", "ardtransform.jl"))
74-
include(joinpath("transform", "lineartransform.jl"))
75-
include(joinpath("transform", "functiontransform.jl"))
76-
include(joinpath("transform", "selecttransform.jl"))
77-
include(joinpath("transform", "chaintransform.jl"))
78-
include(joinpath("transform", "periodic_transform.jl"))
79-
include(joinpath("kernels", "transformedkernel.jl"))
80-
include(joinpath("transform", "with_lengthscale.jl"))
81-
82-
include(joinpath("basekernels", "constant.jl"))
83-
include(joinpath("basekernels", "cosine.jl"))
84-
include(joinpath("basekernels", "exponential.jl"))
85-
include(joinpath("basekernels", "exponentiated.jl"))
86-
include(joinpath("basekernels", "fbm.jl"))
87-
include(joinpath("basekernels", "gabor.jl"))
88-
include(joinpath("basekernels", "matern.jl"))
89-
include(joinpath("basekernels", "nn.jl"))
90-
include(joinpath("basekernels", "periodic.jl"))
91-
include(joinpath("basekernels", "piecewisepolynomial.jl"))
92-
include(joinpath("basekernels", "polynomial.jl"))
93-
include(joinpath("basekernels", "rational.jl"))
94-
include(joinpath("basekernels", "sm.jl"))
95-
include(joinpath("basekernels", "wiener.jl"))
96-
97-
include(joinpath("kernels", "scaledkernel.jl"))
98-
include(joinpath("kernels", "normalizedkernel.jl"))
99-
include(joinpath("matrix", "kernelmatrix.jl"))
100-
include(joinpath("kernels", "kernelsum.jl"))
101-
include(joinpath("kernels", "kernelproduct.jl"))
102-
include(joinpath("kernels", "kerneltensorproduct.jl"))
103-
include(joinpath("kernels", "overloads.jl"))
104-
include(joinpath("kernels", "neuralkernelnetwork.jl"))
105-
include(joinpath("approximations", "nystrom.jl"))
66+
include("distances/pairwise.jl")
67+
include("distances/dotproduct.jl")
68+
include("distances/delta.jl")
69+
include("distances/sinus.jl")
70+
71+
include("transform/transform.jl")
72+
include("transform/scaletransform.jl")
73+
include("transform/ardtransform.jl")
74+
include("transform/lineartransform.jl")
75+
include("transform/functiontransform.jl")
76+
include("transform/selecttransform.jl")
77+
include("transform/chaintransform.jl")
78+
include("transform/periodic_transform.jl")
79+
include("kernels/transformedkernel.jl")
80+
include("transform/with_lengthscale.jl")
81+
82+
include("basekernels/constant.jl")
83+
include("basekernels/cosine.jl")
84+
include("basekernels/exponential.jl")
85+
include("basekernels/exponentiated.jl")
86+
include("basekernels/fbm.jl")
87+
include("basekernels/gabor.jl")
88+
include("basekernels/matern.jl")
89+
include("basekernels/nn.jl")
90+
include("basekernels/periodic.jl")
91+
include("basekernels/piecewisepolynomial.jl")
92+
include("basekernels/polynomial.jl")
93+
include("basekernels/rational.jl")
94+
include("basekernels/sm.jl")
95+
include("basekernels/wiener.jl")
96+
97+
include("kernels/scaledkernel.jl")
98+
include("kernels/normalizedkernel.jl")
99+
include("matrix/kernelmatrix.jl")
100+
include("kernels/kernelsum.jl")
101+
include("kernels/kernelproduct.jl")
102+
include("kernels/kerneltensorproduct.jl")
103+
include("kernels/overloads.jl")
104+
include("kernels/neuralkernelnetwork.jl")
105+
include("approximations/nystrom.jl")
106106
include("generic.jl")
107107

108-
include(joinpath("mokernels", "mokernel.jl"))
109-
include(joinpath("mokernels", "moinput.jl"))
110-
include(joinpath("mokernels", "independent.jl"))
111-
include(joinpath("mokernels", "slfm.jl"))
112-
include(joinpath("mokernels", "intrinsiccoregion.jl"))
113-
include(joinpath("mokernels", "lmm.jl"))
108+
include("mokernels/mokernel.jl")
109+
include("mokernels/moinput.jl")
110+
include("mokernels/independent.jl")
111+
include("mokernels/slfm.jl")
112+
include("mokernels/intrinsiccoregion.jl")
113+
include("mokernels/lmm.jl")
114114

115115
include("chainrules.jl")
116116
include("zygoterules.jl")
@@ -119,10 +119,10 @@ include("test_utils.jl")
119119

120120
function __init__()
121121
@require Kronecker = "2c470bb0-bcc8-11e8-3dad-c9649493f05e" begin
122-
include(joinpath("matrix", "kernelkroneckermat.jl"))
122+
include("matrix/kernelkroneckermat.jl")
123123
end
124124
@require PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150" begin
125-
include(joinpath("matrix", "kernelpdmat.jl"))
125+
include("matrix/kernelpdmat.jl")
126126
end
127127
end
128128

‎test/runtests.jl

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -60,83 +60,83 @@ include("test_utils.jl")
6060
@testset "KernelFunctions" begin
6161
if GROUP == "" || GROUP == "Transform"
6262
@testset "transform" begin
63-
include(joinpath("transform", "transform.jl"))
63+
include("transform/transform.jl")
6464
print(" ")
65-
include(joinpath("transform", "scaletransform.jl"))
65+
include("transform/scaletransform.jl")
6666
print(" ")
67-
include(joinpath("transform", "ardtransform.jl"))
67+
include("transform/ardtransform.jl")
6868
print(" ")
69-
include(joinpath("transform", "lineartransform.jl"))
69+
include("transform/lineartransform.jl")
7070
print(" ")
71-
include(joinpath("transform", "functiontransform.jl"))
71+
include("transform/functiontransform.jl")
7272
print(" ")
73-
include(joinpath("transform", "selecttransform.jl"))
73+
include("transform/selecttransform.jl")
7474
print(" ")
75-
include(joinpath("transform", "chaintransform.jl"))
75+
include("transform/chaintransform.jl")
7676
print(" ")
77-
include(joinpath("transform", "periodic_transform.jl"))
77+
include("transform/periodic_transform.jl")
7878
print(" ")
79-
include(joinpath("transform", "with_lengthscale.jl"))
79+
include("transform/with_lengthscale.jl")
8080
print(" ")
8181
end
8282
@info "Ran tests on Transform"
8383
end
8484

8585
if GROUP == "" || GROUP == "BaseKernels"
8686
@testset "basekernels" begin
87-
include(joinpath("basekernels", "constant.jl"))
87+
include("basekernels/constant.jl")
8888
print(" ")
89-
include(joinpath("basekernels", "cosine.jl"))
89+
include("basekernels/cosine.jl")
9090
print(" ")
91-
include(joinpath("basekernels", "exponential.jl"))
91+
include("basekernels/exponential.jl")
9292
print(" ")
93-
include(joinpath("basekernels", "exponentiated.jl"))
93+
include("basekernels/exponentiated.jl")
9494
print(" ")
95-
include(joinpath("basekernels", "fbm.jl"))
95+
include("basekernels/fbm.jl")
9696
print(" ")
97-
include(joinpath("basekernels", "gabor.jl"))
97+
include("basekernels/gabor.jl")
9898
print(" ")
99-
include(joinpath("basekernels", "matern.jl"))
99+
include("basekernels/matern.jl")
100100
print(" ")
101-
include(joinpath("basekernels", "nn.jl"))
101+
include("basekernels/nn.jl")
102102
print(" ")
103-
include(joinpath("basekernels", "periodic.jl"))
103+
include("basekernels/periodic.jl")
104104
print(" ")
105-
include(joinpath("basekernels", "piecewisepolynomial.jl"))
105+
include("basekernels/piecewisepolynomial.jl")
106106
print(" ")
107-
include(joinpath("basekernels", "polynomial.jl"))
107+
include("basekernels/polynomial.jl")
108108
print(" ")
109-
include(joinpath("basekernels", "rational.jl"))
109+
include("basekernels/rational.jl")
110110
print(" ")
111-
include(joinpath("basekernels", "sm.jl"))
111+
include("basekernels/sm.jl")
112112
print(" ")
113-
include(joinpath("basekernels", "wiener.jl"))
113+
include("basekernels/wiener.jl")
114114
print(" ")
115115
end
116116
@info "Ran tests on BaseKernel"
117117
end
118118

119119
if GROUP == "" || GROUP == "Kernels"
120120
@testset "kernels" begin
121-
include(joinpath("kernels", "kernelproduct.jl"))
122-
include(joinpath("kernels", "kernelsum.jl"))
123-
include(joinpath("kernels", "kerneltensorproduct.jl"))
124-
include(joinpath("kernels", "overloads.jl"))
125-
include(joinpath("kernels", "scaledkernel.jl"))
126-
include(joinpath("kernels", "transformedkernel.jl"))
127-
include(joinpath("kernels", "normalizedkernel.jl"))
128-
include(joinpath("kernels", "neuralkernelnetwork.jl"))
121+
include("kernels/kernelproduct.jl")
122+
include("kernels/kernelsum.jl")
123+
include("kernels/kerneltensorproduct.jl")
124+
include("kernels/overloads.jl")
125+
include("kernels/scaledkernel.jl")
126+
include("kernels/transformedkernel.jl")
127+
include("kernels/normalizedkernel.jl")
128+
include("kernels/neuralkernelnetwork.jl")
129129
end
130130
@info "Ran tests on Kernel"
131131
end
132132

133133
if GROUP == "" || GROUP == "MultiOutput"
134134
@testset "multi_output" begin
135-
include(joinpath("mokernels", "moinput.jl"))
136-
include(joinpath("mokernels", "independent.jl"))
137-
include(joinpath("mokernels", "slfm.jl"))
138-
include(joinpath("mokernels", "intrinsiccoregion.jl"))
139-
include(joinpath("mokernels", "lmm.jl"))
135+
include("mokernels/moinput.jl")
136+
include("mokernels/independent.jl")
137+
include("mokernels/slfm.jl")
138+
include("mokernels/intrinsiccoregion.jl")
139+
include("mokernels/lmm.jl")
140140
end
141141
@info "Ran tests on Multi-Output Kernels"
142142
end
@@ -145,22 +145,22 @@ include("test_utils.jl")
145145
include("utils.jl")
146146

147147
@testset "distances" begin
148-
include(joinpath("distances", "pairwise.jl"))
149-
include(joinpath("distances", "dotproduct.jl"))
150-
include(joinpath("distances", "delta.jl"))
151-
include(joinpath("distances", "sinus.jl"))
148+
include("distances/pairwise.jl")
149+
include("distances/dotproduct.jl")
150+
include("distances/delta.jl")
151+
include("distances/sinus.jl")
152152
end
153153
@info "Ran tests on Distances"
154154

155155
@testset "matrix" begin
156-
include(joinpath("matrix", "kernelmatrix.jl"))
157-
include(joinpath("matrix", "kernelkroneckermat.jl"))
158-
include(joinpath("matrix", "kernelpdmat.jl"))
156+
include("matrix/kernelmatrix.jl")
157+
include("matrix/kernelkroneckermat.jl")
158+
include("matrix/kernelpdmat.jl")
159159
end
160160
@info "Ran tests on matrix"
161161

162162
@testset "approximations" begin
163-
include(joinpath("approximations", "nystrom.jl"))
163+
include("approximations/nystrom.jl")
164164
end
165165

166166
include("generic.jl")

0 commit comments

Comments
 (0)