Fix construction of NoLogAbsDetJacobian

Author: oschulz

src/with_ladj.jl

@@ -80,24 +80,34 @@ export with_logabsdet_jacobian
     struct NoLogAbsDetJacobian{F,T}
 
 An instance `NoLogAbsDetJacobian{F,T}()` signifies that `with_logabsdet_jacobian(::F, ::T)` is not defined.
+
+Constructors:
+```julia
+NoLogAbsDetJacobian(f, x)
+NoLogAbsDetJacobian{F,T}()
+```
 """
 struct NoLogAbsDetJacobian{F,T} end
 export NoLogAbsDetJacobian
 
-with_logabsdet_jacobian(::F, ::T) where {F,T} = NoLogAbsDetJacobian{F,T}()
+@inline NoLogAbsDetJacobian(::F, ::T) where {F,T} = NoLogAbsDetJacobian{F,T}()
+@inline NoLogAbsDetJacobian(::Type{F}, ::T) where {F,T} = NoLogAbsDetJacobian{Type{F},T}()
+@inline NoLogAbsDetJacobian(::F, ::Type{T}) where {F,T} = NoLogAbsDetJacobian{F,Type{T}}()
+@inline NoLogAbsDetJacobian(::Type{F}, ::Type{T}) where {F,T} = NoLogAbsDetJacobian{Type{F},Type{T}}()
 
+with_logabsdet_jacobian(f, x) = NoLogAbsDetJacobian(f, x)
 
 
 @static if VERSION >= v"1.6"
     function with_logabsdet_jacobian(f::Base.ComposedFunction, x)
         y_ladj_inner = with_logabsdet_jacobian(f.inner, x)
         if y_ladj_inner isa NoLogAbsDetJacobian
-            NoLogAbsDetJacobian{typeof(f),typeof(x)}()
+            NoLogAbsDetJacobian(f, x)
         else
             y_inner, ladj_inner = y_ladj_inner
             y_ladj_outer = with_logabsdet_jacobian(f.outer, y_inner)
             if y_ladj_outer isa NoLogAbsDetJacobian
-                NoLogAbsDetJacobian{typeof(f),typeof(x)}()
+                NoLogAbsDetJacobian(f, x)
             else
                 y, ladj_outer = y_ladj_outer
                 (y, ladj_inner + ladj_outer)

test/test_with_ladj.jl

@@ -18,11 +18,18 @@ include("getjacobian.jl")
         _bc_func(f) = Base.Fix1(broadcast, f)
     end
 
-    @test with_logabsdet_jacobian(sum, rand(5)) == NoLogAbsDetJacobian{typeof(sum),Vector{Float64}}()
-    @test with_logabsdet_jacobian(sum ∘ log, 5.0f0) == NoLogAbsDetJacobian{typeof(sum ∘ log),Float32}()
-    @test with_logabsdet_jacobian(log ∘ sum, 5.0f0) == NoLogAbsDetJacobian{typeof(log ∘ sum),Float32}()
+    @test with_logabsdet_jacobian(sum, rand(5)) === NoLogAbsDetJacobian(sum, rand(5))
+    @test with_logabsdet_jacobian(log ∘ sum, 5.0f0) === NoLogAbsDetJacobian(log ∘ sum, 5.0f0)
     @test_throws MethodError _, _ = with_logabsdet_jacobian(sum, rand(5))
 
+    @test with_logabsdet_jacobian(sin, 4.9) === NoLogAbsDetJacobian{typeof(sin), Float64}()
+    @test with_logabsdet_jacobian(String, 4.9) === NoLogAbsDetJacobian{Type{String}, Float64}()
+    @test with_logabsdet_jacobian(String, Float64) === NoLogAbsDetJacobian{Type{String}, Type{Float64}}()
+    @test with_logabsdet_jacobian(sin, Float64) === NoLogAbsDetJacobian{typeof(sin), Type{Float64}}()
+
+    @test with_logabsdet_jacobian(sin ∘ log, 4.9) === NoLogAbsDetJacobian{typeof(sin ∘ log), Float64}()
+    @test with_logabsdet_jacobian(log ∘ sin, 4.9) === NoLogAbsDetJacobian{typeof(log ∘ sin), Float64}()
+
     function ChangesOfVariables.with_logabsdet_jacobian(::typeof(foo), x)
         y = foo(x)
         ladj = -x + 2 * log(y)