upgrade, more matrices

Author: mcabbott

src/projection.jl

@@ -343,6 +343,16 @@ function (project::ProjectTo{Adjoint})(dx::AbstractArray)
     dy = eltype(dx) <: Real ? vec(dx) : adjoint(dx)
     return adjoint(project.parent(dy))
 end
+# structural => natural standardisation, broadest possible signature
+function (project::ProjectTo{Adjoint})(dx::Tangent)
+    if dx.parent isa Tangent
+        # Can't wrap a structural representation of an array in an Adjoint:
+        return dx
+    else
+        # This case should handle dx.parent isa AbstractZero, too
+        return Adjoint(project.parent(dx.parent))
+    end
+end
 
 function ProjectTo(x::LinearAlgebra.TransposeAbsVec)
     return ProjectTo{Transpose}(; parent=ProjectTo(parent(x)))
@@ -357,14 +367,22 @@ function (project::ProjectTo{Transpose})(dx::AbstractArray)
     dy = eltype(dx) <: Number ? vec(dx) : transpose(dx)
     return transpose(project.parent(dy))
 end
+function (project::ProjectTo{Transpose})(
+    dx::Tangent{<:Transpose, <:NamedTuple{(:parent,), <:Tuple{AbstractVector}}},
+    )
+    return Transpose(project.parent(dx.parent))
+end
 
 # Diagonal
 ProjectTo(x::Diagonal) = ProjectTo{Diagonal}(; diag=ProjectTo(x.diag))
 (project::ProjectTo{Diagonal})(dx::AbstractMatrix) = Diagonal(project.diag(diag(dx)))
 (project::ProjectTo{Diagonal})(dx::Diagonal) = Diagonal(project.diag(dx.diag))
-
-(project::ProjectTo{Diagonal})(dx::Tangent{T}) where T = (@show T; Diagonal(project.diag(dx.diag)))
-# (project::ProjectTo{Diagonal})(dx::Tangent{<:Diagonal, NamedTuple{(:diag,), <:Tuple{AbstractVector}}}) = Diagonal(project.diag(@show dx.diag))
+# structural => natural standardisation, very conservative signature:
+function (project::ProjectTo{Diagonal})(
+    dx::Tangent{<:Diagonal, <:NamedTuple{(:diag,), <:Tuple{AbstractVector}}},
+    )
+    return Diagonal(project.diag(dx.diag))
+end
 
 # Symmetric
 for (SymHerm, chk, fun) in
@@ -383,6 +401,13 @@ for (SymHerm, chk, fun) in
             dz = $chk(dy) ? dy : (dy .+ $fun(dy)) ./ 2
             return $SymHerm(project.parent(dz), project.uplo)
         end
+        function (project::ProjectTo{$SymHerm})(dx::Tangent{<:$SymHerm})
+            if dx.data isa Tangent
+                return dx
+            else
+                return $SymHerm(project.parent(dx.data))
+            end
+        end
         # This is an example of a subspace which is not a subtype,
         # not clear how broadly it's worthwhile to try to support this.
         function (project::ProjectTo{$SymHerm})(dx::Diagonal)

src/tangent_types/abstract_zero.jl

@@ -19,9 +19,6 @@ Base.iterate(::AbstractZero, ::Any) = nothing
 Base.Broadcast.broadcastable(x::AbstractZero) = Ref(x)
 Base.Broadcast.broadcasted(::Type{T}) where {T<:AbstractZero} = T()
 
-# Linear operators
-Base.adjoint(z::AbstractZero) = z
-Base.transpose(z::AbstractZero) = z
 Base.:/(z::AbstractZero, ::Any) = z
 
 Base.convert(::Type{T}, x::AbstractZero) where {T<:Number} = zero(T)
@@ -36,6 +33,14 @@ Base.view(z::AbstractZero, ind...) = z
 Base.sum(z::AbstractZero; dims=:) = z
 Base.reshape(z::AbstractZero, size...) = z
 
+# LinearAlgebra
+for f in (:adjoint, :transpose, :Adjoint, :Transpose, :Diagonal)
+    @eval LinearAlgebra.$f(z::AbstractZero) = z
+end
+for f in (:Symmetric, :Hermitian)
+    @eval LinearAlgebra.$f(z::AbstractZero, uplo=:U) = z
+end
+
 """
     ZeroTangent() <: AbstractZero
 

test/projection.jl

@@ -187,6 +187,10 @@ struct NoSuperType end
         @test padj_complex(transpose([4, 5, 6 + 7im])) == [4 5 6 + 7im]
         @test padj_complex(adjoint([4, 5, 6 + 7im])) == [4 5 6 - 7im]
 
+        # structural => natural
+        @test padj(Tangent{adjT}(; parent=ones(3) .+ im)) isa adjT
+        @test_skip padj(Tangent{Any}(; parent=ones(3))) isa adjT  # only for Adjoint now
+
         # evil test case
         if VERSION >= v"1.7-"  # up to 1.6  Vector[[1,2,3]]'  is an error, not sure why it's called
             xs = adj(Any[Any[1, 2, 3], Any[4 + im, 5 - im, 6 + im, 7 - im]])
@@ -221,6 +225,10 @@ struct NoSuperType end
         @test psymm(psymm(reshape(1:9, 3, 3))) == psymm(reshape(1:9, 3, 3))
         @test psymm(rand(ComplexF32, 3, 3, 1)) isa Symmetric{Float64}
         @test ProjectTo(Symmetric(randn(3, 3) .> 0))(randn(3, 3)) == NoTangent() # Bool
+        # structural => natural
+        dx = Tangent{typeof(Symmetric(rand(3, 3)))}(; data=[1 2 3; 4 5 6; 7 8 9im])
+        @test psymm(dx) isa Symmetric{Float64}
+        @test psymm(Tangent{typeof(Symmetric(rand(3, 3)))}(; )) isa AbstractZero
 
         pherm = ProjectTo(Hermitian(rand(3, 3) .+ im, :L))
         # NB, projection onto Hermitian subspace, not application of Hermitian constructor
@@ -247,6 +255,8 @@ struct NoSuperType end
         @test pdiag(Diagonal(1.0:3.0)) === Diagonal(1.0:3.0)
         @test ProjectTo(Diagonal(randn(3) .> 0))(randn(3, 3)) == NoTangent()
         @test ProjectTo(Diagonal(randn(3) .> 0))(Diagonal(rand(3))) == NoTangent()
+        # structural => natural
+        @test pdiag(Tangent{typeof(Diagonal(1:3))}(; diag=ones(3) .+ im)) isa Diagonal{Float64}
 
         pbi = ProjectTo(Bidiagonal(rand(3, 3), :L))
         @test pbi(reshape(1:9, 3, 3)) == [1.0 0.0 0.0; 2.0 5.0 0.0; 0.0 6.0 9.0]

test/tangent_types/abstract_zero.jl

@@ -116,4 +116,13 @@
         @test convert(Int64, NoTangent()) == 0
         @test convert(Float64, NoTangent()) == 0.0
     end
+
+    @testset "LinearAlgebra constructors" begin
+        @test adjoint(ZeroTangent()) === ZeroTangent()
+        @test transpose(ZeroTangent()) === ZeroTangent()
+        @test Adjoint(ZeroTangent()) === ZeroTangent()
+        @test Transpose(ZeroTangent()) === ZeroTangent()
+        @test Symmetric(ZeroTangent()) === ZeroTangent()
+        @test Hermitian(ZeroTangent(), :U) === ZeroTangent()
+    end
 end