Merge pull request #342 from JuliaDiff/ox/crtup

Update to new version of ChainRulesTestUtils and FiniteDifferences

Project.toml

@@ -1,6 +1,6 @@
 name = "ChainRules"
 uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
-version = "0.7.45"
+version = "0.7.46"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -12,11 +12,11 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
-ChainRulesCore = "0.9.21"
-ChainRulesTestUtils = "0.5.5"
+ChainRulesCore = "0.9.25"
+ChainRulesTestUtils = "0.5, 0.6.1"
 Compat = "3"
-FiniteDifferences = "0.11.4"
-Reexport = "0.2, 1.0"
+FiniteDifferences = "0.11, 0.12"
+Reexport = "0.2, 1"
 Requires = "0.5.2, 1"
 julia = "1"
 

src/rulesets/LinearAlgebra/blas.jl

@@ -159,7 +159,7 @@ function rrule(
  ::typeof(gemm), tA::Char, tB::Char, α::T, A::AbstractMatrix{T}, B::AbstractMatrix{T}
 ) where T<:BlasFloat
  C = gemm(tA, tB, α, A, B)
- function gemv_pullback(C̄)
+ function gemm_pullback(C̄)
  β = one(T)
  if uppercase(tA) === 'N'
  if uppercase(tB) === 'N'
@@ -251,7 +251,7 @@ function rrule(
  end
  return (NO_FIELDS, DoesNotExist(), DoesNotExist(), @thunk(dot(C, C̄) / α'), ∂A, ∂B)
  end
- return C, gemv_pullback
+ return C, gemm_pullback
 end
 
 function rrule(

test/rulesets/Base/fastmath_able.jl

@@ -60,7 +60,7 @@ const FASTABLE_AST = quote
  @testset "Multivariate" begin
  @testset "sincos(x::$T)" for T in (Float64, ComplexF64)
  x, Δx, x̄ = randn(T, 3)
- Δz = (randn(T), randn(T))
+ Δz = Composite{Tuple{T,T}}(randn(T), randn(T))
 
  frule_test(sincos, (x, Δx))
  rrule_test(sincos, Δz, (x, x̄))

test/rulesets/LinearAlgebra/blas.jl

@@ -94,7 +94,8 @@
  (tB, nothing),
  (α, randn(T)),
  (A, randn(T, size(A))),
- (B, randn(T, size(B))),
+ (B, randn(T, size(B)));
+ check_inferred=false,
  )
 
  rrule_test(
@@ -103,7 +104,8 @@
  (tA, nothing),
  (tB, nothing),
  (A, randn(T, size(A))),
- (B, randn(T, size(B))),
+ (B, randn(T, size(B)));
+ check_inferred=false,
  )
  end
  end
@@ -121,7 +123,8 @@
  (t, nothing),
  (α, randn(T)),
  (A, randn(T, size(A))),
- (x, randn(T, size(x))),
+ (x, randn(T, size(x)));
+ check_inferred=false,
  )
  end
  end

test/rulesets/LinearAlgebra/norm.jl

@@ -58,7 +58,9 @@
  @testset "rrule" begin
  rrule_test(norm, ȳ, (x, x̄))
  x isa Matrix && @testset "$MT" for MT in (Diagonal, UpperTriangular, LowerTriangular)
- rrule_test(norm, ȳ, (MT(x), MT(x̄)))
+ # we don't check inference on older julia versions. Improvements to
+ # inference mean on 1.5+ it works, and that is good enough
+ rrule_test(norm, ȳ, (MT(x), MT(x̄)); check_inferred=VERSION>=v"1.5")
  end
  @test extern(rrule(norm, zero(x))[2](ȳ)[2]) ≈ zero(x)
  @test rrule(norm, x)[2](Zero())[2] isa Zero
@@ -95,7 +97,11 @@
 
  rrule_test(fnorm, ȳ, (x, x̄), (p, p̄); kwargs...)
  x isa Matrix && @testset "$MT" for MT in (Diagonal, UpperTriangular, LowerTriangular)
- rrule_test(fnorm, ȳ, (MT(x), MT(x̄)), (p, p̄); kwargs...)
+ rrule_test(
+ fnorm, ȳ, (MT(x), MT(x̄)), (p, p̄);
+ #Don't check inference on old julia, what matters is that works on new
+ check_inferred=VERSION>=v"1.5", kwargs...
+ )
  end
  @test extern(rrule(fnorm, zero(x), p)[2](ȳ)[2]) ≈ zero(x)
  @test rrule(fnorm, x, p)[2](Zero())[2] isa Zero

test/rulesets/LinearAlgebra/symmetric.jl

@@ -16,14 +16,24 @@
  @test ∂Ω_ad ≈ ∂Ω_fd
  end
  @testset "rrule" begin
+ # on old versions of julia this combination doesn't infer but we don't care as
+ # it infers fine on modern versions.
+ check_inferred = !(VERSION <= v"1.5" && T <: ComplexF64 && SymHerm <: Hermitian)
+
  x = randn(T, N, N)
  ∂x = randn(T, N, N)
  ΔΩ = randn(T, N, N)
  @testset "back(::$MT)" for MT in (Matrix, LowerTriangular, UpperTriangular)
- rrule_test(SymHerm, MT(ΔΩ), (x, ∂x), (uplo, nothing))
+ rrule_test(
+ SymHerm, MT(ΔΩ), (x, ∂x), (uplo, nothing);
+ check_inferred = check_inferred
+ )
  end
  @testset "back(::Diagonal)" begin
- rrule_test(SymHerm, Diagonal(ΔΩ), (x, Diagonal(∂x)), (uplo, nothing))
+ rrule_test(
+ SymHerm, Diagonal(ΔΩ), (x, Diagonal(∂x)), (uplo, nothing);
+ check_inferred = check_inferred
+ )
  end
  end
  end