Skip to content

Commit

Permalink
Do not use include(joinpath(...)) (#365)
Browse files Browse the repository at this point in the history 
* Do not use `include(joinpath(...))`

* Bump version
  • Loading branch information
@devmotion
devmotion authored Sep 13, 2021
1 parent 94500c6 commit 671f960
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "KernelFunctions"
uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392"
version = "0.10.16"
version = "0.10.17"

[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Expand Down
96 changes: 48 additions & 48 deletions src/KernelFunctions.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,54 +63,54 @@ abstract type Kernel end
abstract type SimpleKernel <: Kernel end

include("utils.jl")
include(joinpath("distances", "pairwise.jl"))
include(joinpath("distances", "dotproduct.jl"))
include(joinpath("distances", "delta.jl"))
include(joinpath("distances", "sinus.jl"))

include(joinpath("transform", "transform.jl"))
include(joinpath("transform", "scaletransform.jl"))
include(joinpath("transform", "ardtransform.jl"))
include(joinpath("transform", "lineartransform.jl"))
include(joinpath("transform", "functiontransform.jl"))
include(joinpath("transform", "selecttransform.jl"))
include(joinpath("transform", "chaintransform.jl"))
include(joinpath("transform", "periodic_transform.jl"))
include(joinpath("kernels", "transformedkernel.jl"))
include(joinpath("transform", "with_lengthscale.jl"))

include(joinpath("basekernels", "constant.jl"))
include(joinpath("basekernels", "cosine.jl"))
include(joinpath("basekernels", "exponential.jl"))
include(joinpath("basekernels", "exponentiated.jl"))
include(joinpath("basekernels", "fbm.jl"))
include(joinpath("basekernels", "gabor.jl"))
include(joinpath("basekernels", "matern.jl"))
include(joinpath("basekernels", "nn.jl"))
include(joinpath("basekernels", "periodic.jl"))
include(joinpath("basekernels", "piecewisepolynomial.jl"))
include(joinpath("basekernels", "polynomial.jl"))
include(joinpath("basekernels", "rational.jl"))
include(joinpath("basekernels", "sm.jl"))
include(joinpath("basekernels", "wiener.jl"))

include(joinpath("kernels", "scaledkernel.jl"))
include(joinpath("kernels", "normalizedkernel.jl"))
include(joinpath("matrix", "kernelmatrix.jl"))
include(joinpath("kernels", "kernelsum.jl"))
include(joinpath("kernels", "kernelproduct.jl"))
include(joinpath("kernels", "kerneltensorproduct.jl"))
include(joinpath("kernels", "overloads.jl"))
include(joinpath("kernels", "neuralkernelnetwork.jl"))
include(joinpath("approximations", "nystrom.jl"))
include("distances/pairwise.jl")
include("distances/dotproduct.jl")
include("distances/delta.jl")
include("distances/sinus.jl")

include("transform/transform.jl")
include("transform/scaletransform.jl")
include("transform/ardtransform.jl")
include("transform/lineartransform.jl")
include("transform/functiontransform.jl")
include("transform/selecttransform.jl")
include("transform/chaintransform.jl")
include("transform/periodic_transform.jl")
include("kernels/transformedkernel.jl")
include("transform/with_lengthscale.jl")

include("basekernels/constant.jl")
include("basekernels/cosine.jl")
include("basekernels/exponential.jl")
include("basekernels/exponentiated.jl")
include("basekernels/fbm.jl")
include("basekernels/gabor.jl")
include("basekernels/matern.jl")
include("basekernels/nn.jl")
include("basekernels/periodic.jl")
include("basekernels/piecewisepolynomial.jl")
include("basekernels/polynomial.jl")
include("basekernels/rational.jl")
include("basekernels/sm.jl")
include("basekernels/wiener.jl")

include("kernels/scaledkernel.jl")
include("kernels/normalizedkernel.jl")
include("matrix/kernelmatrix.jl")
include("kernels/kernelsum.jl")
include("kernels/kernelproduct.jl")
include("kernels/kerneltensorproduct.jl")
include("kernels/overloads.jl")
include("kernels/neuralkernelnetwork.jl")
include("approximations/nystrom.jl")
include("generic.jl")

include(joinpath("mokernels", "mokernel.jl"))
include(joinpath("mokernels", "moinput.jl"))
include(joinpath("mokernels", "independent.jl"))
include(joinpath("mokernels", "slfm.jl"))
include(joinpath("mokernels", "intrinsiccoregion.jl"))
include(joinpath("mokernels", "lmm.jl"))
include("mokernels/mokernel.jl")
include("mokernels/moinput.jl")
include("mokernels/independent.jl")
include("mokernels/slfm.jl")
include("mokernels/intrinsiccoregion.jl")
include("mokernels/lmm.jl")

include("chainrules.jl")
include("zygoterules.jl")
Expand All @@ -119,10 +119,10 @@ include("test_utils.jl")

function __init__()
@require Kronecker = "2c470bb0-bcc8-11e8-3dad-c9649493f05e" begin
include(joinpath("matrix", "kernelkroneckermat.jl"))
include("matrix/kernelkroneckermat.jl")
end
@require PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150" begin
include(joinpath("matrix", "kernelpdmat.jl"))
include("matrix/kernelpdmat.jl")
end
end

Expand Down
88 changes: 44 additions & 44 deletions test/runtests.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,83 +60,83 @@ include("test_utils.jl")
@testset "KernelFunctions" begin
if GROUP == "" || GROUP == "Transform"
@testset "transform" begin
include(joinpath("transform", "transform.jl"))
include("transform/transform.jl")
print(" ")
include(joinpath("transform", "scaletransform.jl"))
include("transform/scaletransform.jl")
print(" ")
include(joinpath("transform", "ardtransform.jl"))
include("transform/ardtransform.jl")
print(" ")
include(joinpath("transform", "lineartransform.jl"))
include("transform/lineartransform.jl")
print(" ")
include(joinpath("transform", "functiontransform.jl"))
include("transform/functiontransform.jl")
print(" ")
include(joinpath("transform", "selecttransform.jl"))
include("transform/selecttransform.jl")
print(" ")
include(joinpath("transform", "chaintransform.jl"))
include("transform/chaintransform.jl")
print(" ")
include(joinpath("transform", "periodic_transform.jl"))
include("transform/periodic_transform.jl")
print(" ")
include(joinpath("transform", "with_lengthscale.jl"))
include("transform/with_lengthscale.jl")
print(" ")
end
@info "Ran tests on Transform"
end

if GROUP == "" || GROUP == "BaseKernels"
@testset "basekernels" begin
include(joinpath("basekernels", "constant.jl"))
include("basekernels/constant.jl")
print(" ")
include(joinpath("basekernels", "cosine.jl"))
include("basekernels/cosine.jl")
print(" ")
include(joinpath("basekernels", "exponential.jl"))
include("basekernels/exponential.jl")
print(" ")
include(joinpath("basekernels", "exponentiated.jl"))
include("basekernels/exponentiated.jl")
print(" ")
include(joinpath("basekernels", "fbm.jl"))
include("basekernels/fbm.jl")
print(" ")
include(joinpath("basekernels", "gabor.jl"))
include("basekernels/gabor.jl")
print(" ")
include(joinpath("basekernels", "matern.jl"))
include("basekernels/matern.jl")
print(" ")
include(joinpath("basekernels", "nn.jl"))
include("basekernels/nn.jl")
print(" ")
include(joinpath("basekernels", "periodic.jl"))
include("basekernels/periodic.jl")
print(" ")
include(joinpath("basekernels", "piecewisepolynomial.jl"))
include("basekernels/piecewisepolynomial.jl")
print(" ")
include(joinpath("basekernels", "polynomial.jl"))
include("basekernels/polynomial.jl")
print(" ")
include(joinpath("basekernels", "rational.jl"))
include("basekernels/rational.jl")
print(" ")
include(joinpath("basekernels", "sm.jl"))
include("basekernels/sm.jl")
print(" ")
include(joinpath("basekernels", "wiener.jl"))
include("basekernels/wiener.jl")
print(" ")
end
@info "Ran tests on BaseKernel"
end

if GROUP == "" || GROUP == "Kernels"
@testset "kernels" begin
include(joinpath("kernels", "kernelproduct.jl"))
include(joinpath("kernels", "kernelsum.jl"))
include(joinpath("kernels", "kerneltensorproduct.jl"))
include(joinpath("kernels", "overloads.jl"))
include(joinpath("kernels", "scaledkernel.jl"))
include(joinpath("kernels", "transformedkernel.jl"))
include(joinpath("kernels", "normalizedkernel.jl"))
include(joinpath("kernels", "neuralkernelnetwork.jl"))
include("kernels/kernelproduct.jl")
include("kernels/kernelsum.jl")
include("kernels/kerneltensorproduct.jl")
include("kernels/overloads.jl")
include("kernels/scaledkernel.jl")
include("kernels/transformedkernel.jl")
include("kernels/normalizedkernel.jl")
include("kernels/neuralkernelnetwork.jl")
end
@info "Ran tests on Kernel"
end

if GROUP == "" || GROUP == "MultiOutput"
@testset "multi_output" begin
include(joinpath("mokernels", "moinput.jl"))
include(joinpath("mokernels", "independent.jl"))
include(joinpath("mokernels", "slfm.jl"))
include(joinpath("mokernels", "intrinsiccoregion.jl"))
include(joinpath("mokernels", "lmm.jl"))
include("mokernels/moinput.jl")
include("mokernels/independent.jl")
include("mokernels/slfm.jl")
include("mokernels/intrinsiccoregion.jl")
include("mokernels/lmm.jl")
end
@info "Ran tests on Multi-Output Kernels"
end
Expand All @@ -145,22 +145,22 @@ include("test_utils.jl")
include("utils.jl")

@testset "distances" begin
include(joinpath("distances", "pairwise.jl"))
include(joinpath("distances", "dotproduct.jl"))
include(joinpath("distances", "delta.jl"))
include(joinpath("distances", "sinus.jl"))
include("distances/pairwise.jl")
include("distances/dotproduct.jl")
include("distances/delta.jl")
include("distances/sinus.jl")
end
@info "Ran tests on Distances"

@testset "matrix" begin
include(joinpath("matrix", "kernelmatrix.jl"))
include(joinpath("matrix", "kernelkroneckermat.jl"))
include(joinpath("matrix", "kernelpdmat.jl"))
include("matrix/kernelmatrix.jl")
include("matrix/kernelkroneckermat.jl")
include("matrix/kernelpdmat.jl")
end
@info "Ran tests on matrix"

@testset "approximations" begin
include(joinpath("approximations", "nystrom.jl"))
include("approximations/nystrom.jl")
end

include("generic.jl")
Expand Down

2 comments on commit 671f960

@devmotion
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/44778

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.10.17 -m "<description of version>" 671f960726b0b9826b9e5a81cc3e55d6c4ba0912
git push origin v0.10.17

Please sign in to comment.