remove invbiperm

Author: ogauthe

src/contract/blockedperms.jl

@@ -2,15 +2,17 @@ using .BaseExtensions: BaseExtensions
 using BlockArrays: blocklengths
 
 # default: if no bipartion is specified, all axes to domain
-invbiperm(perm, ::Any) = invbiperm(perm, Val(0))
-invbiperm(perm, t::Tuple{Tuple,Tuple}) = invbiperm(perm, tuplemortar(t))
-invbiperm(perm, t::AbstractBlockTuple{2}) = invbiperm(perm, Val(first(blocklength(t))))
-
-function invbiperm(perm, ::Val{N1}) where {N1}
-  perm_out = invperm(Tuple(perm))
-  length(perm) <= N1 && return blockedpermvcat(perm_out, ())
-  return blockedpermvcat(perm_out[begin:N1], (perm_out[(N1 + 1):end]))
+function biperm(perm, blocklength1::Integer)
+  return biperm(perm, Val(blocklength1))
 end
+function biperm(perm, ::Val{BlockLength1}) where {BlockLength1}
+  length(perm) < BlockLength1 && throw(ArgumentError("Invalid codomain length"))
+  return blockedperm(Tuple(perm), (BlockLength1, length(perm) - BlockLength1))
+end
+
+length_codomain(t::AbstractBlockTuple{2}) = first(blocklengths(t))
+# Assume all dimensions are in the domain by default
+length_codomain(t) = 0
 
 function blockedperms(
   f::typeof(contract), alg::Algorithm, dimnames_dest, dimnames1, dimnames2
@@ -32,7 +34,7 @@ function blockedperms(::typeof(contract), dimnames_dest, dimnames1, dimnames2)
   perm_codomain_dest = BaseExtensions.indexin(codomain, dimnames_dest)
   perm_domain_dest = BaseExtensions.indexin(domain, dimnames_dest)
   biperm_dest_to_a12 = (perm_codomain_dest..., perm_domain_dest...)
-  biperm_a12_to_dest = invbiperm(biperm_dest_to_a12, dimnames_dest)
+  biperm_a12_to_dest = biperm(invperm(biperm_dest_to_a12), length_codomain(dimnames_dest))
 
   perm_codomain1 = BaseExtensions.indexin(codomain, dimnames1)
   perm_domain1 = BaseExtensions.indexin(contracted, dimnames1)

src/contract/contract_matricize/contract.jl

@@ -11,7 +11,8 @@ function contract!(
   α::Number,
   β::Number,
 )
-  biperm_dest_to_a12 = invbiperm(biperm_a12_to_dest, Val(first(blocklengths(biperm1))))
+  biperm_dest_to_a12 = biperm(invperm(biperm_a12_to_dest), length_codomain(biperm1))
+
   check_input(contract, a_dest, biperm_dest_to_a12, a1, biperm1, a2, biperm2)
   a1_mat = matricize(a1, biperm1)
   a2_mat = matricize(a2, biperm2)

src/matricize.jl

@@ -74,23 +74,19 @@ function matricize(a::AbstractArray, permblock1::Tuple, permblock2::Tuple)
 end
 
 # ====================================  unmatricize  =======================================
-function unmatricize(
-  m::AbstractMatrix, axes_dest, biperm_dest_to_a12::AbstractBlockPermutation{2}
-)
-  length(axes_dest) == length(biperm_dest_to_a12) ||
+function unmatricize(m::AbstractMatrix, axes, biperm_dest::AbstractBlockPermutation{2})
+  length(axes) == length(biperm_dest) ||
     throw(ArgumentError("axes do not match permutation"))
-  return unmatricize(FusionStyle(m), m, axes_dest, biperm_dest_to_a12)
+  return unmatricize(FusionStyle(m), m, axes, biperm_dest)
 end
 
 function unmatricize(
-  ::FusionStyle,
-  m::AbstractMatrix,
-  axes_dest,
-  biperm_dest_to_a12::AbstractBlockPermutation{2},
+  ::FusionStyle, m::AbstractMatrix, axes, biperm_dest_to_a12::AbstractBlockPermutation{2}
 )
-  blocked_axes = axes_dest[biperm_dest_to_a12]
+  blocked_axes = axes[biperm_dest_to_a12]
   a12 = unmatricize(m, blocked_axes)
-  biperm_a12_to_dest = invbiperm(biperm_dest_to_a12, axes_dest)
+  biperm_a12_to_dest = biperm(invperm(biperm_dest_to_a12), length_codomain(axes))
+
   return permuteblockeddims(a12, biperm_a12_to_dest)
 end
 
@@ -122,7 +118,8 @@ function unmatricize!(
     throw(ArgumentError("destination does not match permutation"))
   blocked_axes = axes(a_dest)[biperm_dest_to_a12]
   a_perm = unmatricize(m, blocked_axes)
-  biperm_a12_to_dest = invbiperm(biperm_dest_to_a12, axes(a_dest))
+  biperm_a12_to_dest = biperm(invperm(biperm_dest_to_a12), length_codomain(axes(a_dest)))
+
   return permuteblockeddims!(a_dest, a_perm, biperm_a12_to_dest)
 end