Skip to content

generalize unmatricize to arbitrary axes #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 16, 2025
Merged

generalize unmatricize to arbitrary axes #66

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6459ff
remove types specializations
ogauthe Jul 15, 2025
6e1c58f
bump version
ogauthe Jul 16, 2025
e8191fd
remove unused method
ogauthe Jul 16, 2025
daaaf9e
recover type annotation
ogauthe Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 7 additions & 22 deletions src/matricize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,56 +74,41 @@ function matricize(a::AbstractArray, permblock1::Tuple, permblock2::Tuple)
end

# ==================================== unmatricize =======================================
function unmatricize(
m::AbstractMatrix,
axes::Tuple{Vararg{AbstractUnitRange}},
biperm::AbstractBlockPermutation{2},
)
function unmatricize(m, axes, biperm::AbstractBlockPermutation{2})
length(axes) == length(biperm) || throw(ArgumentError("axes do not match permutation"))
return unmatricize(FusionStyle(m), m, axes, biperm)
end

function unmatricize(
::FusionStyle,
m::AbstractMatrix,
axes::Tuple{Vararg{AbstractUnitRange}},
biperm::AbstractBlockPermutation{2},
)
function unmatricize(::FusionStyle, m, axes, biperm::AbstractBlockPermutation{2})
blocked_axes = axes[biperm]
a_perm = unmatricize(m, blocked_axes)
return permuteblockeddims(a_perm, invperm(biperm))
end

function unmatricize(::ReshapeFusion, m::AbstractMatrix, axes::AbstractUnitRange...)
function unmatricize(::ReshapeFusion, m, axes::AbstractUnitRange...)
return reshape(m, axes...)
end

function unmatricize(
::ReshapeFusion,
m::AbstractMatrix,
blocked_axes::BlockedTuple{2,<:Any,<:Tuple{Vararg{AbstractUnitRange}}},
::ReshapeFusion, m, blocked_axes::BlockedTuple{2,<:Any,<:Tuple{Vararg{AbstractUnitRange}}}
)
return reshape(m, Tuple(blocked_axes)...)
end

function unmatricize(
m::AbstractMatrix, blocked_axes::BlockedTuple{2,<:Any,<:Tuple{Vararg{AbstractUnitRange}}}
)
function unmatricize(m, blocked_axes)
return unmatricize(FusionStyle(m), m, blocked_axes)
end

function unmatricize(
m::AbstractMatrix,
m,
codomain_axes::Tuple{Vararg{AbstractUnitRange}},
domain_axes::Tuple{Vararg{AbstractUnitRange}},
)
blocked_axes = tuplemortar((codomain_axes, domain_axes))
return unmatricize(m, blocked_axes)
end

function unmatricize!(
a::AbstractArray, m::AbstractMatrix, biperm::AbstractBlockPermutation{2}
)
function unmatricize!(a, m, biperm::AbstractBlockPermutation{2})
ndims(a) == length(biperm) ||
throw(ArgumentError("destination does not match permutation"))
blocked_axes = axes(a)[biperm]
Expand Down
Loading