Skip to content

Allow another plan first in MulPlan #211

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 2 commits into from
Oct 24, 2025
Merged

Allow another plan first in MulPlan #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89ad47e
Allow another plan first in MulPlan
dlfivefifty Oct 24, 2025
f39b067
Update plans.jl
dlfivefifty Oct 24, 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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ContinuumArrays"
uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
version = "0.20.0"
version = "0.20.1"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand Down
48 changes: 29 additions & 19 deletions src/plans.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,47 +31,55 @@ end

Takes a factorization and supports it applied to different dimensions.
"""
struct InvPlan{T, Facts<:Tuple, Dims} <: Plan{T}
struct InvPlan{T, Facts<:Tuple, Pln, Dims} <: Plan{T}
factorizations::Facts
plan::Pln
dims::Dims
end

InvPlan(fact::Tuple, dims) = InvPlan{eltype(fact), typeof(fact), typeof(dims)}(fact, dims)
InvPlan(fact, dims) = InvPlan((fact,), dims)
InvPlan(fact::Tuple, plan, dims) = InvPlan{mapreduce(eltype,promote_type,fact), typeof(fact), typeof(plan), typeof(dims)}(fact, plan, dims)
InvPlan(fact::Tuple, dims) = InvPlan(fact, nothing, dims)
InvPlan(fact, dims...) = InvPlan((fact,), dims...)

size(F::InvPlan) = size.(F.factorizations, 1)


"""
MulPlan(matrix, dims)
MulPlan(matrix, [plan], dims)

Takes a matrix and supports it applied to different dimensions.
Takes a matrix and supports it applied to different dimensions, after applying a plan.
"""
struct MulPlan{T, Fact<:Tuple, Dims} <: Plan{T}
struct MulPlan{T, Fact<:Tuple, Pln, Dims} <: Plan{T}
matrices::Fact
plan::Pln
dims::Dims
end

MulPlan(mats::Tuple, dims) = MulPlan{eltype(mats), typeof(mats), typeof(dims)}(mats, dims)
MulPlan(mats::AbstractMatrix, dims) = MulPlan((mats,), dims)
MulPlan(mats::Tuple, plan, dims) = MulPlan{mapreduce(eltype,promote_type,mats), typeof(mats), typeof(plan), typeof(dims)}(mats, plan, dims)
MulPlan(mats::Tuple, dims) = MulPlan(mats, nothing, dims)
MulPlan(mats::AbstractMatrix, dims...) = MulPlan((mats,), dims...)

_transformifnotnothing(::Nothing, x) = x
_transformifnotnothing(P, x) = P*x

for (Pln,op,fld) in ((:MulPlan, :*, :(:matrices)), (:InvPlan, :\, :(:factorizations)))
@eval begin
function *(P::$Pln{<:Any,<:Tuple,Int}, x::AbstractVector)
function *(P::$Pln{<:Any,<:Tuple,<:Any,Int}, x::AbstractVector)
@assert P.dims == 1
$op(only(getfield(P, $fld)), x) # Only a single factorization when dims isa Int
$op(only(getfield(P, $fld)), _transformifnotnothing(P.plan, x)) # Only a single factorization when dims isa Int
end

function *(P::$Pln{<:Any,<:Tuple,Int}, X::AbstractMatrix)
function *(P::$Pln{<:Any,<:Tuple,<:Any,Int}, X::AbstractMatrix)
if P.dims == 1
$op(only(getfield(P, $fld)), X) # Only a single factorization when dims isa Int
else
@assert P.dims == 2
permutedims($op(only(getfield(P, $fld)), permutedims(X)))
permutedims($op(only(getfield(P, $fld)), permutedims(_transformifnotnothing(P.plan, X))))
end
end

function *(P::$Pln{<:Any,<:Tuple,Int}, X::AbstractArray{<:Any,3})
function *(P::$Pln{<:Any,<:Tuple,<:Any,Int}, Xin::AbstractArray{<:Any,3})
X = _transformifnotnothing(P.plan, Xin)
Y = similar(X)
if P.dims == 1
for j in axes(X,3)
Expand All @@ -90,7 +98,8 @@ for (Pln,op,fld) in ((:MulPlan, :*, :(:matrices)), (:InvPlan, :\, :(:factorizati
Y
end

function *(P::$Pln{<:Any,<:Tuple,Int}, X::AbstractArray{<:Any,4})
function *(P::$Pln{<:Any,<:Tuple,<:Any,Int}, Xin::AbstractArray{<:Any,4})
X = _transformifnotnothing(P.plan, Xin)
Y = similar(X)
if P.dims == 1
for j in axes(X,3), l in axes(X,4)
Expand All @@ -114,9 +123,10 @@ for (Pln,op,fld) in ((:MulPlan, :*, :(:matrices)), (:InvPlan, :\, :(:factorizati



*(P::$Pln{<:Any,<:Tuple,Int}, X::AbstractArray) = error("Overload")
*(P::$Pln{<:Any,<:Tuple,<:Any,Int}, X::AbstractArray) = error("Overload")

function *(P::$Pln, X::AbstractArray)
function *(P::$Pln, Xin::AbstractArray)
X = _transformifnotnothing(P.plan, Xin)
for (fac,dim) in zip(getfield(P, $fld), P.dims)
X = $Pln(fac, dim) * X
end
Expand All @@ -125,7 +135,7 @@ for (Pln,op,fld) in ((:MulPlan, :*, :(:matrices)), (:InvPlan, :\, :(:factorizati
end
end

*(A::AbstractMatrix, P::MulPlan) = MulPlan(Ref(A) .* P.matrices, P.dims)
*(A::AbstractMatrix, P::MulPlan) = MulPlan(Ref(A) .* P.matrices, P.plan, P.dims)

inv(P::MulPlan) = InvPlan(map(factorize,P.matrices), P.dims)
inv(P::InvPlan) = MulPlan(convert.(Matrix,P.factorizations), P.dims)
inv(P::MulPlan{<:Any,<:Any,Nothing}) = InvPlan(map(factorize,P.matrices), P.dims)
inv(P::InvPlan{<:Any,<:Any,Nothing}) = MulPlan(convert.(Matrix,P.factorizations), P.dims)
Loading