Skip to content

Commit e1d7aa6

Browse files
committed
Merge branch 'master-dev'
2 parents 0b4f085 + 17bda67 commit e1d7aa6

File tree

6 files changed

+36
-67
lines changed

6 files changed

+36
-67
lines changed

.travis.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## Documentation: http://docs.travis-ci.com/user/languages/julia/
2+
language: julia
3+
os:
4+
- linux
5+
- osx
6+
julia:
7+
- 1.0
8+
- nightly
9+
notifications:
10+
email: false
11+
after_success:
12+
# push coverage results to Coveralls
13+
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'
14+
jobs:
15+
include:
16+
- stage: "Documentation"
17+
julia: 1.0
18+
os: linux
19+
script:
20+
- export DOCUMENTER_DEBUG=true
21+
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
22+
- julia --project=docs/ docs/make.jl
23+
after_succes: skip

Manifest.toml

Lines changed: 0 additions & 61 deletions
This file was deleted.

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ version = "0.1.0"
55
[deps]
66
Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
77
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
8+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[![Build Status](https://travis-ci.org/theogf/KernelFunctions.jl.svg?branch=master)](https://travis-ci.org/theogf/AugmentedGaussianProcesses.jl)
12
# KernelFunctions.jl (WIP)
23
Julia Package for kernel functions for machine learning
34

@@ -9,4 +10,4 @@ Julia Package for kernel functions for machine learning
910
- BLAS backend
1011

1112

12-
Directly inspired by the [MLKernels](https://github.com/trthatcher/MLKernels.jl)
13+
Directly inspired by the [MLKernels](https://github.com/trthatcher/MLKernels.jl) package

src/kernelmatrix.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function kernel(
7070
obsdim::Int = defaultobs
7171
) where {T,T₁<:Real,T₂<:Real}
7272
# TODO Verify dimensions
73-
_kappamatrix!(κ, pairwise(metric(κ),X,Y,dims=obsdim))
73+
kappa(κ, evaluate(metric(κ),x,y))
7474
end
7575

7676
"""
@@ -85,7 +85,9 @@ function kernelmatrix(
8585
obsdim::Int = defaultobs,
8686
symmetrize::Bool = true
8787
) where {T,T₁<:Real}
88-
return kernelmatrix!(Matrix{promote_float(T,T₁)}(undef,size(X,obsdim),size(X,obsdim)),κ,X,obsdim=obsdim,symmetrize=symmetrize)
88+
Tₛ = typeof(zero(eltype(X))*zero(T))
89+
m = size(X,obsdim)
90+
return kernelmatrix!(Matrix{promote_float(T,T₁)}(undef,m,m),κ,X,obsdim=obsdim,symmetrize=symmetrize)
8991
end
9092

9193
"""
@@ -100,7 +102,10 @@ function kernelmatrix(
100102
Y::AbstractMatrix{T₂};
101103
obsdim=defaultobs
102104
) where {T,T₁<:Real,T₂<:Real}
103-
kernelmatrix!(Matrix{promote_float(T,T₁,T₂)}(undef,size(X,obsdim),size(Y,obsdim)),κ,X,Y,obsdim=obsdim)
105+
Tₛ = typeof(zero(eltype(X))*zero(eltype(Y))*zero(T))
106+
m = size(X,obsdim)
107+
n = size(Y,obsdim)
108+
kernelmatrix!(Matrix{Tₛ}(undef,m,n),κ,X,Y,obsdim=obsdim)
104109
end
105110

106111

test/kernelmatrix.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ B = rand(dims...)
55
K = [zeros(dims[1],dims[1]),zeros(dims[2],dims[2])]
66
k = SquaredExponentialKernel()
77

8-
@testset "Inplace kernelmatrix" begin
8+
@testset "Inplace Kernel Matrix" begin
99
for obsdim in [1,2]
1010
@test kernelmatrix!(K[obsdim],k,A,B,obsdim=obsdim) == kernelmatrix(k,A,B,obsdim=obsdim)
1111
end
1212
end
1313

14-
@testset "Kernal matrix" begin
14+
@testset "Kernel matrix" begin
1515
for obsdim in [1,2]
1616
@test kernelmatrix(k,A,B,obsdim=obsdim) == kappa.([k],pairwise(KernelFunctions.metric(k),A,B,dims=obsdim))
1717
end

0 commit comments

Comments
 (0)