Automatic type inference test in test_with_logabsdet_jacobian

Author: oschulz

src/test.jl

@@ -1,22 +1,10 @@
 # This file is a part of ChangesOfVariables.jl, licensed under the MIT License (MIT).
 
 
-_generalized_logabsdet(A) = logabsdet(A)
-_generalized_logabsdet(x::Real) = log(abs(x))
-
-function _auto_with_logabsdet_jacobian(f, x, getjacobian, rv_and_back)
-    y = f(x)
-    V, to_x = rv_and_back(x)
-    vf(V) = rv_and_back(f(to_x(V)))[1]
-    ladj = _generalized_logabsdet(getjacobian(vf, V))[1]
-    return (y, ladj)
-end
-
-
 """
     ChangesOfVariables.test_with_logabsdet_jacobian(
         f, x, getjacobian, rv_and_back = x -> (x, identity);
-        compare = isapprox, test_inferred::Bool = true, kwargs...
+        compare = isapprox, kwargs...
     )
 
 Test if [`with_logabsdet_jacobian(f, x)`](@ref) is implemented correctly.
@@ -46,17 +34,31 @@ be tested.
 """
 function test_with_logabsdet_jacobian(
     f, x, getjacobian, rv_and_back = x -> (x, identity);
-    compare = isapprox, test_inferred::Bool = true, kwargs...
+    compare = isapprox, kwargs...
 )
     @testset "test_with_logabsdet_jacobian: $f with input $x" begin
-        y, ladj = if test_inferred
+        ref_y, test_type_inference = try
+            @inferred(f(x)), true
+        catch err
+            f(x), false
+        end
+
+        y, ladj = if test_type_inference
             @inferred with_logabsdet_jacobian(f, x)
         else
             with_logabsdet_jacobian(f, x)
         end
-        ref_y, ref_ladj = _auto_with_logabsdet_jacobian(f, x, getjacobian, rv_and_back)
+
+        V, to_x = rv_and_back(x)
+        vf(V) = rv_and_back(f(to_x(V)))[1]
+        ref_ladj = _generalized_logabsdet(getjacobian(vf, V))[1]
+    
         @test compare(y, ref_y; kwargs...)
         @test compare(ladj, ref_ladj; kwargs...)
     end
     return nothing
 end
+
+
+_generalized_logabsdet(A) = logabsdet(A)
+_generalized_logabsdet(x::Real) = log(abs(x))

test/test_test.jl

@@ -22,20 +22,22 @@ end
 
 
 @testset "test_with_logabsdet_jacobian" begin
-    x = Complex(0.2, -0.7)
-    y, ladj_y = ChangesOfVariables._auto_with_logabsdet_jacobian(inv, x, ForwardDiff.jacobian, rv_and_back)
-    @test y == inv(x)
-    @test ladj_y ≈ -4 * log(abs(x))
-
-    X = Complex.(randn(3,3), randn(3,3))
-    Y, ladj_Y = ChangesOfVariables._auto_with_logabsdet_jacobian(inv, X, ForwardDiff.jacobian, rv_and_back)
-    @test Y == inv(X)
-    @test ladj_Y ≈ -4 * 3 * logabsdet(X)[1]
+    rx = 0.5
+    cx = Complex(0.2, -0.7)
+    X = rand(3, 3)
+    CX = Complex.(randn(3,3), randn(3,3))
 
     myisapprox(a, b; kwargs...) = isapprox(a, b; kwargs...)
-    test_with_logabsdet_jacobian(inv, 0.5, ForwardDiff.derivative, test_inferred = true, atol = 10^-6)
-    test_with_logabsdet_jacobian(inv, rand(2,2), ForwardDiff.jacobian, test_inferred = true, atol = 10^-6)
-    test_with_logabsdet_jacobian(inv, X, ForwardDiff.jacobian, rv_and_back, test_inferred = true, atol = 10^-6)
-    test_with_logabsdet_jacobian(inv, X, ForwardDiff.jacobian, rv_and_back, test_inferred = false, atol = 10^-6)
-    test_with_logabsdet_jacobian(inv, X, ForwardDiff.jacobian, rv_and_back, compare = myisapprox, atol = 10^-6)
+
+    noninferrable_inv(x) = x!=rand(size(x)...) ? inv(x) : ""
+    ChangesOfVariables.with_logabsdet_jacobian(::typeof(noninferrable_inv), x) = noninferrable_inv(x), with_logabsdet_jacobian(inv, x)[2]
+    @test_throws ErrorException @inferred with_logabsdet_jacobian(noninferrable_inv, rand(2, 2))
+
+    test_with_logabsdet_jacobian(inv, rx, ForwardDiff.derivative, atol = 10^-6)
+    test_with_logabsdet_jacobian(inv, cx, ForwardDiff.jacobian, rv_and_back, atol = 10^-6)
+    test_with_logabsdet_jacobian(inv, X, ForwardDiff.jacobian, atol = 10^-6)
+    test_with_logabsdet_jacobian(inv, CX, ForwardDiff.jacobian, rv_and_back, atol = 10^-6)
+    test_with_logabsdet_jacobian(inv, CX, ForwardDiff.jacobian, rv_and_back, atol = 10^-6)
+    test_with_logabsdet_jacobian(inv, CX, ForwardDiff.jacobian, rv_and_back, compare = myisapprox, atol = 10^-6)
+    test_with_logabsdet_jacobian(noninferrable_inv, CX, ForwardDiff.jacobian, rv_and_back, atol = 10^-6)
 end