From 33baeebcb54f500bf49bf9f965f0c690d27fe3a3 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Tue, 14 Jan 2020 20:31:13 +0100 Subject: [PATCH 1/3] Replace Zygote with ZygoteRules --- Project.toml | 9 +++++---- src/KernelFunctions.jl | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index 9ad97054c..85a6bb220 100644 --- a/Project.toml +++ b/Project.toml @@ -9,7 +9,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" +ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444" [compat] Compat = "2.2" @@ -17,13 +17,14 @@ Distances = "0.8" PDMats = "0.9" SpecialFunctions = "0" StatsFuns = "0.8" -Zygote = "0.4" +ZygoteRules = "0.2" julia = "1.0" [extras] +FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000" +Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["Random", "Test", "FiniteDifferences"] +test = ["Random", "Test", "FiniteDifferences", "Zygote"] diff --git a/src/KernelFunctions.jl b/src/KernelFunctions.jl index d6f18dcd0..03371a9f6 100644 --- a/src/KernelFunctions.jl +++ b/src/KernelFunctions.jl @@ -17,7 +17,7 @@ export Transform, SelectTransform, ChainTransform, ScaleTransform, LowRankTransf using Compat using Distances, LinearAlgebra using SpecialFunctions: lgamma, besselk -using Zygote: @adjoint +using ZygoteRules: @adjoint using StatsFuns: logtwo using PDMats: PDMat From ed36f4650a35230a569f3148ad74f3fdf4af920f Mon Sep 17 00:00:00 2001 From: David Widmann Date: Tue, 14 Jan 2020 20:46:30 +0100 Subject: [PATCH 2/3] Set SpecialFunctions compat and fix deprecations --- Project.toml | 2 +- src/KernelFunctions.jl | 2 +- src/kernels/matern.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 85a6bb220..950651c5b 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444" Compat = "2.2" Distances = "0.8" PDMats = "0.9" -SpecialFunctions = "0" +SpecialFunctions = "0.9" StatsFuns = "0.8" ZygoteRules = "0.2" julia = "1.0" diff --git a/src/KernelFunctions.jl b/src/KernelFunctions.jl index 03371a9f6..847c27d33 100644 --- a/src/KernelFunctions.jl +++ b/src/KernelFunctions.jl @@ -16,7 +16,7 @@ export Transform, SelectTransform, ChainTransform, ScaleTransform, LowRankTransf using Compat using Distances, LinearAlgebra -using SpecialFunctions: lgamma, besselk +using SpecialFunctions: logabsgamma, besselk using ZygoteRules: @adjoint using StatsFuns: logtwo using PDMats: PDMat diff --git a/src/kernels/matern.jl b/src/kernels/matern.jl index 63b856c91..8d41f4edb 100644 --- a/src/kernels/matern.jl +++ b/src/kernels/matern.jl @@ -33,7 +33,7 @@ end params(k::MaternKernel) = (params(transform(k)),k.ν) opt_params(k::MaternKernel) = (opt_params(transform(k)),k.ν) -@inline kappa(κ::MaternKernel, d::Real) = iszero(d) ? one(d) : exp((1.0-κ.ν)*logtwo-lgamma(κ.ν) + κ.ν*log(sqrt(2κ.ν)*d)+log(besselk(κ.ν,sqrt(2κ.ν)*d))) +@inline kappa(κ::MaternKernel, d::Real) = iszero(d) ? one(d) : exp((1.0-κ.ν)*logtwo-logabsgamma(κ.ν)[1] + κ.ν*log(sqrt(2κ.ν)*d)+log(besselk(κ.ν,sqrt(2κ.ν)*d))) """ `Matern32Kernel([ρ=1.0])` From f33fb3a4013a9cbafb1cfee2c7aff3f6ff3e7db5 Mon Sep 17 00:00:00 2001 From: David Widmann Date: Tue, 14 Jan 2020 22:16:01 +0100 Subject: [PATCH 3/3] Add SpecialFunctions 0.8 to support Julia 1.0-1.2 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 950651c5b..08e12b6ff 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444" Compat = "2.2" Distances = "0.8" PDMats = "0.9" -SpecialFunctions = "0.9" +SpecialFunctions = "0.8, 0.9" StatsFuns = "0.8" ZygoteRules = "0.2" julia = "1.0"