update operators

Author: lkdvos

src/operators/mpo.jl

@@ -126,14 +126,14 @@ function Base.:+(mpo1::FiniteMPO{<:MPOTensor}, mpo2::FiniteMPO{<:MPOTensor})
         A, (right_virtualspace(mpo1, 1) ⊕ right_virtualspace(mpo2, 1)),
         right_virtualspace(mpo1, 1)
     )
-    F₂ = leftnull(F₁)
+    F₂ = left_null(F₁)
     @assert _lastspace(F₂) == right_virtualspace(mpo2, 1)'
 
     @plansor O[-3 -1 -2; -4] := mpo1[1][-1 -2; -3 1] * conj(F₁[-4; 1]) +
         mpo2[1][-1 -2; -3 1] * conj(F₂[-4; 1])
 
     # making sure that the new operator is "full rank"
-    O, R = leftorth!(O)
+    O, R = qr_compact!(O)
     O′ = transpose(O, ((2, 3), (1, 4)))
     mpo = similar(mpo1, typeof(O′))
     mpo[1] = O′
@@ -148,13 +148,13 @@ function Base.:+(mpo1::FiniteMPO{<:MPOTensor}, mpo2::FiniteMPO{<:MPOTensor})
             A, (right_virtualspace(mpo1, i) ⊕ right_virtualspace(mpo2, i)),
             right_virtualspace(mpo1, i)
         )
-        F₂ = leftnull(F₁)
+        F₂ = left_null(F₁)
         @assert _lastspace(F₂) == right_virtualspace(mpo2, i)'
         @plansor O[-3 -1 -2; -4] := O₁[-1 -2; -3 1] * conj(F₁[-4; 1]) +
             O₂[-1 -2; -3 1] * conj(F₂[-4; 1])
 
         # making sure that the new operator is "full rank"
-        O, R = leftorth!(O)
+        O, R = qr_compact!(O)
         mpo[i] = transpose(O, ((2, 3), (1, 4)))
     end
 
@@ -165,14 +165,14 @@ function Base.:+(mpo1::FiniteMPO{<:MPOTensor}, mpo2::FiniteMPO{<:MPOTensor})
         A, left_virtualspace(mpo1, N) ⊕ left_virtualspace(mpo2, N),
         left_virtualspace(mpo1, N)
     )
-    F₂ = leftnull(F₁)
+    F₂ = left_null(F₁)
     @assert _lastspace(F₂) == left_virtualspace(mpo2, N)'
 
     @plansor O[-1; -3 -4 -2] := F₁[-1; 1] * mpo1[N][1 -2; -3 -4] +
         F₂[-1; 1] * mpo2[N][1 -2; -3 -4]
 
     # making sure that the new operator is "full rank"
-    L, O = rightorth!(O)
+    L, O = lq_compact!(O)
     mpo[end] = transpose(O, ((1, 4), (2, 3)))
 
     for i in (N - 1):-1:(halfN + 1)
@@ -185,13 +185,13 @@ function Base.:+(mpo1::FiniteMPO{<:MPOTensor}, mpo2::FiniteMPO{<:MPOTensor})
             A, left_virtualspace(mpo1, i) ⊕ left_virtualspace(mpo2, i),
             left_virtualspace(mpo1, i)
         )
-        F₂ = leftnull(F₁)
+        F₂ = left_null(F₁)
         @assert _lastspace(F₂) == left_virtualspace(mpo2, i)'
         @plansor O[-1; -3 -4 -2] := F₁[-1; 1] * O₁[1 -2; -3 -4] +
             F₂[-1; 1] * O₂[1 -2; -3 -4]
 
         # making sure that the new operator is "full rank"
-        L, O = rightorth!(O)
+        L, O = lq_compact!(O)
         mpo[i] = transpose(O, ((1, 4), (2, 3)))
     end
 
@@ -247,7 +247,7 @@ function Base.:*(mpo::FiniteMPO, mps::FiniteMPS)
         Fᵣ = fuser(A, right_virtualspace(mps, i), right_virtualspace(mpo, i))
         return _fuse_mpo_mps(mpo[i], A1, Fₗ, Fᵣ)
     end
-    trscheme = truncbelow(eps(real(T)))
+    trscheme = trunctol(; atol = eps(real(T)))
     return changebonds!(FiniteMPS(A2), SvdCut(; trscheme); normalize = false)
 end
 function Base.:*(mpo::InfiniteMPO, mps::InfiniteMPS)
@@ -392,8 +392,8 @@ function Base.isapprox(
 end
 
 @doc """
-    swap(mpo::FiniteMPO, i::Integer; inv::Bool=false, alg=SDD(), trscheme)
-    swap!(mpo::FiniteMPO, i::Integer; inv::Bool=false, alg=SDD(), trscheme)
+    swap(mpo::FiniteMPO, i::Integer; inv::Bool=false, alg=Defaults.alg_svd(), trscheme)
+    swap!(mpo::FiniteMPO, i::Integer; inv::Bool=false, alg=Defaults.alg_svd(), trscheme)
 
 Compose the mpo with a swap gate applied to indices `i` and `i + 1`, effectively creating an
 operator that acts on the Hilbert spaces with those factors swapped.
@@ -405,7 +405,7 @@ swap(mpo::FiniteMPO, i::Integer; kwargs...) = swap!(copy(mpo), i; kwargs...)
 function swap!(
         mpo::FiniteMPO{<:MPOTensor}, i::Integer;
         inv::Bool = false,
-        alg = SDD(), trscheme = truncbelow(eps(real(scalartype(mpo)))^(4 / 5))
+        alg = Defaults.alg_svd(), trscheme = trunctol(; atol = eps(real(scalartype(mpo)))^(4 / 5))
     )
     O₁, O₂ = mpo[i], mpo[i + 1]
 
@@ -417,7 +417,7 @@ function swap!(
             τ[-3 -6; 4 5] * O₁[-2 4; 2 1] * O₂[1 5; 3 -5] * τ'[2 3; -1 -4]
     end
 
-    U, S, Vᴴ, = tsvd!(O₂₁; alg, trunc = trscheme)
+    U, S, Vᴴ = svd_trunc!(O₂₁; alg, trunc = trscheme)
     sqrtS = sqrt(S)
     @plansor mpo[i][-1 -2; -3 -4] := U[-3 -1 -2; 1] * sqrtS[1; -4]
     @plansor mpo[i + 1][-1 -2; -3 -4] := sqrtS[-1; 1] * Vᴴ[1; -3 -4 -2]

src/operators/mpohamiltonian.jl

@@ -791,31 +791,31 @@ function Base.:*(H::FiniteMPOHamiltonian, mps::FiniteMPS)
     # left to middle
     U = ones(scalartype(H), left_virtualspace(H, 1))
     @plansor a[-1 -2; -3 -4] := A[1][-1 2; -3] * H[1][1 -2; 2 -4] * conj(U[1])
-    Q, R = leftorth!(a; alg = QR())
-    A′[1] = convert(TensorMap, Q)
+    Q, R = qr_compact!(a)
+    A′[1] = TensorMap(Q)
 
     for i in 2:(N ÷ 2)
         @plansor a[-1 -2; -3 -4] := R[-1; 1 2] * A[i][1 3; -3] * H[i][2 -2; 3 -4]
-        Q, R = leftorth!(a; alg = QR())
-        A′[i] = convert(TensorMap, Q)
+        Q, R = qr_compact!(a)
+        A′[i] = TensorMap(Q)
     end
 
     # right to middle
     U = ones(scalartype(H), right_virtualspace(H, N))
     @plansor a[-1 -2; -3 -4] := A[end][-1 2; -3] * H[end][-2 -4; 2 1] * U[1]
-    L, Q = rightorth!(a; alg = LQ())
-    A′[end] = transpose(convert(TensorMap, Q), ((1, 3), (2,)))
+    L, Q = lq_compact!(a)
+    A′[end] = transpose(TensorMap(Q), ((1, 3), (2,)))
 
     for i in (N - 1):-1:(N ÷ 2 + 2)
         @plansor a[-1 -2; -3 -4] := A[i][-1 3; 1] * H[i][-2 -4; 3 2] * L[1 2; -3]
-        L, Q = rightorth!(a; alg = LQ())
-        A′[i] = transpose(convert(TensorMap, Q), ((1, 3), (2,)))
+        L, Q = lq_compact!(a)
+        A′[i] = transpose(TensorMap(Q), ((1, 3), (2,)))
     end
 
     # connect pieces
     @plansor a[-1 -2; -3] := R[-1; 1 2] * A[N ÷ 2 + 1][1 3; 4] * H[N ÷ 2 + 1][2 -2; 3 5] *
         L[4 5; -3]
-    A′[N ÷ 2 + 1] = convert(TensorMap, a)
+    A′[N ÷ 2 + 1] = TensorMap(a)
 
     return FiniteMPS(A′)
 end
@@ -826,7 +826,7 @@ function Base.:*(H::FiniteMPOHamiltonian{<:MPOTensor}, x::AbstractTensorMap)
     L = removeunit(H[1], 1)
     M = Tuple(H[2:(end - 1)])
     R = removeunit(H[end], 4)
-    return convert(TensorMap, _apply_finitempo(x, L, M, R))
+    return TensorMap(_apply_finitempo(x, L, M, R))
 end
 
 function TensorKit.dot(H₁::FiniteMPOHamiltonian, H₂::FiniteMPOHamiltonian)

src/operators/ortho.jl

@@ -1,6 +1,6 @@
 function left_canonicalize!(
         H::FiniteMPOHamiltonian, i::Int;
-        alg = QRpos(), trscheme::TruncationScheme = notrunc()
+        alg = Defaults.alg_qr(), trscheme::TruncationStrategy = notrunc()
     )
     1 ≤ i < length(H) || throw(ArgumentError("Bounds error in canonicalize"))
 
@@ -19,14 +19,7 @@ function left_canonicalize!(
     # QR of second column
     if size(W, 1) == 1
         tmp = transpose(C′, ((2, 1), (3,)))
-
-        if trscheme == notrunc()
-            Q, R = leftorth!(tmp; alg)
-        else
-            @assert alg == SVD() || alg == SDD()
-            Q, Σ, Vᴴ = tsvd!(tmp; alg, trunc = trscheme)
-            R = Σ * Vᴴ
-        end
+        Q, R = _left_orth!(tmp; alg, trunc = trscheme)
 
         if dim(R) == 0 # fully truncated
             V = BlockTensorKit.oplus(oneunit(S), oneunit(S))
@@ -42,13 +35,8 @@ function left_canonicalize!(
         H[i] = JordanMPOTensor(codomain(W) ← physicalspace(W) ⊗ V, Q1, W.B, Q2, W.D)
     else
         tmp = transpose(cat(insertleftunit(C′, 1), W.A; dims = 1), ((3, 1, 2), (4,)))
-        if trscheme == notrunc()
-            Q, R = leftorth!(tmp; alg)
-        else
-            @assert alg == SVD() || alg == SDD()
-            Q, Σ, Vᴴ = tsvd!(tmp; alg, trunc = trscheme)
-            R = Σ * Vᴴ
-        end
+        Q, R = _left_orth!(tmp; alg, trunc = trscheme)
+
         if dim(R) == 0 # fully truncated
             V = BlockTensorKit.oplus(oneunit(S), oneunit(S))
             Q1 = typeof(W.A)(undef, SumSpace{S}() ⊗ physicalspace(W) ← physicalspace(W) ⊗ SumSpace{S}())
@@ -98,7 +86,7 @@ end
 
 function right_canonicalize!(
         H::FiniteMPOHamiltonian, i::Int;
-        alg = LQpos(), trscheme::TruncationScheme = notrunc()
+        alg = Defaults.alg_lq(), trscheme::TruncationStrategy = notrunc()
     )
     1 < i ≤ length(H) || throw(ArgumentError("Bounds error in canonicalize"))
 
@@ -117,13 +105,7 @@ function right_canonicalize!(
     # LQ of second row
     if size(W, 4) == 1
         tmp = transpose(B′, ((1,), (3, 2)))
-        if trscheme == notrunc()
-            R, Q = rightorth!(tmp; alg)
-        else
-            @assert alg == SVD() || alg == SDD()
-            U, Σ, Q = tsvd!(tmp; alg, trunc = trscheme)
-            R = U * Σ
-        end
+        R, Q = _right_orth!(tmp; alg, trunc = trscheme)
 
         if dim(R) == 0
             V = BlockTensorKit.oplus(oneunit(S), oneunit(S))
@@ -139,13 +121,7 @@ function right_canonicalize!(
         H[i] = JordanMPOTensor(V ⊗ physicalspace(W) ← domain(W), Q1, Q2, W.C, W.D)
     else
         tmp = transpose(cat(insertleftunit(B′, 4), W.A; dims = 4), ((1,), (3, 4, 2)))
-        if trscheme == notrunc()
-            R, Q = rightorth!(tmp; alg)
-        else
-            @assert alg == SVD() || alg == SDD()
-            U, Σ, Q = tsvd!(tmp; alg, trunc = trscheme)
-            R = U * Σ
-        end
+        R, Q = _right_orth!(tmp; alg, trunc = trscheme)
         if dim(R) == 0
             V = BlockTensorKit.oplus(oneunit(S), oneunit(S))
             Q1 = typeof(W.A)(undef, SumSpace{S}() ⊗ physicalspace(W) ← physicalspace(W) ⊗ SumSpace{S}())

test/operators.jl

@@ -180,7 +180,7 @@ module TestOperators
                 FiniteMPOHamiltonian(lattice, 3 => O₁)
             @test 0.8 * H1 + 0.2 * H1 ≈ H1 atol = 1.0e-6
             @test convert(TensorMap, H1 + H2) ≈ convert(TensorMap, H1) + convert(TensorMap, H2) atol = 1.0e-6
-            H1_trunc = changebonds(H1, SvdCut(; trscheme = truncdim(0)))
+            H1_trunc = changebonds(H1, SvdCut(; trscheme = truncrank(0)))
             @test H1_trunc ≈ H1
             @test all(left_virtualspace(H1_trunc) .== left_virtualspace(H1))
 
@@ -212,7 +212,7 @@ module TestOperators
                 FiniteMPOHamiltonian(grid, vertical_operators) +
                 FiniteMPOHamiltonian(grid, horizontal_operators) atol = 1.0e-4
 
-            H5 = changebonds(H4 / 3 + 2H4 / 3, SvdCut(; trscheme = truncbelow(1.0e-12)))
+            H5 = changebonds(H4 / 3 + 2H4 / 3, SvdCut(; trscheme = trunctol(; atol = 1.0e-12)))
             psi = FiniteMPS(physicalspace(H5), V ⊕ oneunit(V))
             @test expectation_value(psi, H4) ≈ expectation_value(psi, H5)
         end