From 2fef0bfc359c3a0e954c33dd309777c852fa137c Mon Sep 17 00:00:00 2001 From: David Widmann Date: Mon, 3 Oct 2022 00:33:45 +0200 Subject: [PATCH 1/2] Fix `vcat` method ambiguity issues on Julia 1.8 --- Project.toml | 2 +- src/derivatives/arrays.jl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 49b1e1c..cd97a74 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "ReverseDiff" uuid = "37e2e3b7-166d-5795-8a7a-e32c996b4267" -version = "1.14.1" +version = "1.14.2" [deps] ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" diff --git a/src/derivatives/arrays.jl b/src/derivatives/arrays.jl index 42b2ee4..879ae22 100644 --- a/src/derivatives/arrays.jl +++ b/src/derivatives/arrays.jl @@ -33,7 +33,7 @@ function combinations(xs, n) end for f in [:hcat, :vcat] - for i = 0:2, c = combinations([:AbstractVector, :TrackedVector, :AbstractMatrix, :TrackedMatrix, :Number, :TrackedReal], i) + for i = 0:2, c = combinations([:AbstractVector, :Vector, :TrackedVector, :AbstractMatrix, :TrackedMatrix, :Number, :TrackedReal], i) cnames = map(_ -> gensym(), c) @eval begin Base.$f($([:($x::$c) for (x, c) in zip(cnames, c)]...), x::TrackedVector) = track($f, $(cnames...), x) @@ -46,6 +46,7 @@ for f in [:hcat, :vcat] :Number, :AbstractVecOrMat, :(Union{AbstractVector, Number}), + :Vector, ] @eval begin Base.$f($([:($x::$c) for (x, c) in zip(cnames, c)]...), x::TrackedVector, xs::$T...) = track($f, $(cnames...), x, xs...) From f5710a67db383a1b6014d0e7b16533a76698622e Mon Sep 17 00:00:00 2001 From: David Widmann Date: Mon, 3 Oct 2022 10:30:50 +0200 Subject: [PATCH 2/2] Upper bound DiffTests --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index cd97a74..570fec4 100644 --- a/Project.toml +++ b/Project.toml @@ -21,6 +21,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" ChainRulesCore = "1" DiffResults = "1" DiffRules = "1.4" +DiffTests = "< 0.1.2" ForwardDiff = "0.10" FunctionWrappers = "1" LogExpFunctions = "0.3"