Unify naming: permutedimsopadd! biperm overload, permutedimsop, bipermutedims! via permutedimsopadd!

Author: mtfishman

src/matricize.jl

@@ -124,13 +124,13 @@ function matricize_axes(a::AbstractArray, ndims_codomain::Val)
 end
 
 """
-    bipermutedimsop(op, src, perm_codomain, perm_domain)
+    permutedimsop(op, src, perm_codomain, perm_domain)
 
 Non-mutating version of bipermutation `permutedimsopadd!`: returns
 `op.(permutedims(src, (perm_codomain..., perm_domain...)))`. Has "maybe alias"
 semantics — the result may be a view/wrapper aliasing `src` or a fresh copy.
 """
-function bipermutedimsop(op, src::AbstractArray, perm_codomain, perm_domain)
+function permutedimsop(op, src::AbstractArray, perm_codomain, perm_domain)
     perm = (perm_codomain..., perm_domain...)
     dest = similar(src, map(i -> size(src, i), perm))
     return permutedimsopadd!(dest, op, src, perm_codomain, perm_domain, true, false)
@@ -142,10 +142,10 @@ end
 # TODO: Deprecate `permuteblockeddims` in favor of `bipermutedims`.
 # Keeping it here for backwards compatibility.
 function bipermutedims(a::AbstractArray, perm1, perm2)
-    return bipermutedimsop(identity, a, perm1, perm2)
+    return permutedimsop(identity, a, perm1, perm2)
 end
 function bipermutedims!(a_dest::AbstractArray, a_src::AbstractArray, perm1, perm2)
-    return _permutedims!(a_dest, a_src, (perm1..., perm2...))
+    return permutedimsopadd!(a_dest, identity, a_src, perm1, perm2, true, false)
 end
 function bipermutedims(a::AbstractArray, biperm::AbstractBlockPermutation{2})
     return bipermutedims(a, blocks(biperm)...)
@@ -259,7 +259,7 @@ function matricizeop(
     )
     ndims(a) == length(perm_codomain) + length(perm_domain) ||
         throw(ArgumentError("Invalid bipermutation"))
-    a_perm_op = bipermutedimsop(op, a, perm_codomain, perm_domain)
+    a_perm_op = permutedimsop(op, a, perm_codomain, perm_domain)
     return matricize(style, a_perm_op, Val(length(perm_codomain)))
 end