Simplifications based on Lukas's comments

Author: mtfishman

src/MatrixAlgebra.jl

@@ -1,41 +1,7 @@
 module MatrixAlgebra
 
 using LinearAlgebra: LinearAlgebra
-using MatrixAlgebraKit:
-  eig_full,
-  eig_full!,
-  eig_trunc,
-  eig_trunc!,
-  eig_vals,
-  eig_vals!,
-  eigh_full,
-  eigh_full!,
-  eigh_trunc,
-  eigh_trunc!,
-  eigh_vals,
-  eigh_vals!,
-  left_orth,
-  left_orth!,
-  left_polar,
-  left_polar!,
-  lq_full,
-  lq_full!,
-  lq_compact,
-  lq_compact!,
-  qr_full,
-  qr_full!,
-  qr_compact,
-  qr_compact!,
-  right_orth,
-  right_orth!,
-  right_polar,
-  right_polar!,
-  svd_full,
-  svd_full!,
-  svd_compact,
-  svd_compact!,
-  svd_trunc,
-  svd_trunc!
+using MatrixAlgebraKit
 
 for (f, f_full, f_compact) in (
   (:qr, :qr_full, :qr_compact),

src/TensorAlgebra.jl

@@ -3,7 +3,6 @@ module TensorAlgebra
 export contract, contract!, eigen, eigvals, lq, left_null, qr, right_null, svd, svdvals
 
 include("MatrixAlgebra.jl")
-using .MatrixAlgebra: MatrixAlgebra
 include("blockedtuple.jl")
 include("blockedpermutation.jl")
 include("BaseExtensions/BaseExtensions.jl")

src/factorizations.jl

@@ -1,39 +1,26 @@
 using LinearAlgebra: LinearAlgebra
-using .MatrixAlgebra: MatrixAlgebra
 using MatrixAlgebraKit: MatrixAlgebraKit
 
-function factorize_with(f, A::AbstractArray, biperm::BlockedPermutation{2}; kwargs...)
-  # tensor to matrix
-  A_mat = fusedims(A, biperm)
-
-  # factorization
-  X, Y = f(A_mat; kwargs...)
-
-  # matrix to tensor
-  axes_codomain, axes_domain = blockpermute(axes(A), biperm)
-  axes_X = (axes_codomain..., axes(X, 2))
-  axes_Y = (axes(Y, 1), axes_domain...)
-  return splitdims(X, axes_X), splitdims(Y, axes_Y)
-end
-
-for (f, f_mat) in (
-  (:qr, :(MatrixAlgebra.qr)),
-  (:lq, :(MatrixAlgebra.lq)),
-  (:left_polar, :(MatrixAlgebra.left_polar)),
-  (:right_polar, :(MatrixAlgebra.right_polar)),
-  (:polar, :(MatrixAlgebra.polar)),
-  (:left_orth, :(MatrixAlgebra.left_orth)),
-  (:right_orth, :(MatrixAlgebra.right_orth)),
-  (:orth, :(MatrixAlgebra.orth)),
-  (:factorize, :(MatrixAlgebra.factorize)),
+for f in (
+  :qr, :lq, :left_polar, :right_polar, :polar, :left_orth, :right_orth, :orth, :factorize
 )
   @eval begin
     function $f(A::AbstractArray, labels_A, labels_codomain, labels_domain; kwargs...)
       biperm = blockedperm_indexin(Tuple.((labels_A, labels_codomain, labels_domain))...)
       return $f(A, biperm; kwargs...)
     end
     function $f(A::AbstractArray, biperm::BlockedPermutation{2}; kwargs...)
-      return factorize_with($f_mat, A, biperm; kwargs...)
+      # tensor to matrix
+      A_mat = fusedims(A, biperm)
+
+      # factorization
+      X, Y = MatrixAlgebra.$f(A_mat; kwargs...)
+
+      # matrix to tensor
+      axes_codomain, axes_domain = blockpermute(axes(A), biperm)
+      axes_X = (axes_codomain..., axes(X, 2))
+      axes_Y = (axes(Y, 1), axes_domain...)
+      return splitdims(X, axes_X), splitdims(Y, axes_Y)
     end
   end
 end
@@ -209,9 +196,7 @@ function eigvals(A::AbstractArray, labels_A, labels_codomain, labels_domain; kwa
   biperm = blockedperm_indexin(Tuple.((labels_A, labels_codomain, labels_domain))...)
   return eigvals(A, biperm; kwargs...)
 end
-function eigvals(
-  A::AbstractArray, biperm::BlockedPermutation{2}; ishermitian=nothing, kwargs...
-)
+function eigvals(A::AbstractArray, biperm::BlockedPermutation{2}; kwargs...)
   A_mat = fusedims(A, biperm)
   return MatrixAlgebra.eigvals!(A_mat; kwargs...)
 end