From c16c33b119f9e83b7a4af5f25653721af6a6874d Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Fri, 15 Mar 2024 08:19:52 +0000 Subject: [PATCH 1/3] use EltypeExtensions: elconvert --- Project.toml | 2 ++ src/QuasiArrays.jl | 1 + src/quasibroadcast.jl | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 5660c73..974a252 100644 --- a/Project.toml +++ b/Project.toml @@ -6,6 +6,7 @@ version = "0.11.4" [deps] ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf" +EltypeExtensions = "583f92f5-06d6-4306-8236-316410defc98" FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -22,6 +23,7 @@ QuasiArraysSparseArraysExt = "SparseArrays" [compat] ArrayLayouts = "1" DomainSets = "0.6, 0.7" +EltypeExtensions = "0.0.4" FillArrays = "1" LazyArrays = "1.2" StaticArrays = "1" diff --git a/src/QuasiArrays.jl b/src/QuasiArrays.jl index 6d89998..3170b76 100644 --- a/src/QuasiArrays.jl +++ b/src/QuasiArrays.jl @@ -50,6 +50,7 @@ import LazyArrays: MemoryLayout, UnknownLayout, Mul, ApplyLayout, BroadcastLayou _mul, rowsupport, DiagonalLayout, adjointlayout, transposelayout, conjlayout, sublayout, call, LazyArrayStyle, layout_getindex, _broadcast2broadcastarray, _applyarray_summary, _broadcastarray_summary, _broadcasted_mul, simplifiable, simplify, _mul_colsupport, _mul_rowsupport +import EltypeExtensions: elconvert import Base.IteratorsMD diff --git a/src/quasibroadcast.jl b/src/quasibroadcast.jl index 91e4ca2..0ae0c94 100644 --- a/src/quasibroadcast.jl +++ b/src/quasibroadcast.jl @@ -196,4 +196,4 @@ _broadcasted_mul(A::AbstractQuasiMatrix, B::Tuple{Union{AbstractMatrix,AbstractQ -LazyArrays.converteltype(::Type{T}, A::AbstractQuasiArray) where T = convert(AbstractQuasiArray{T}, A) \ No newline at end of file +elconvert(::Type{T}, A::AbstractQuasiArray) where T = convert(AbstractQuasiArray{T}, A) \ No newline at end of file From 34847030029ebee7e56576fc47940d2b4aae5605 Mon Sep 17 00:00:00 2001 From: Tianyi Pu <44583944+putianyi889@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:15:34 +0000 Subject: [PATCH 2/3] Update Project.toml --- Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Project.toml b/Project.toml index 160285a..cd66f68 100644 --- a/Project.toml +++ b/Project.toml @@ -22,7 +22,6 @@ QuasiArraysSparseArraysExt = "SparseArrays" [compat] ArrayLayouts = "1" -EltypeExtensions = "0.0.4" DomainSets = "0.7.6" EltypeExtensions = "0.0.4" FillArrays = "1" From eb8dc25648de36d847c23f016de649430c4dc574 Mon Sep 17 00:00:00 2001 From: Tianyi Pu <912396513@qq.com> Date: Fri, 1 Nov 2024 08:55:28 +0000 Subject: [PATCH 3/3] fix --- src/quasibroadcast.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quasibroadcast.jl b/src/quasibroadcast.jl index 0ae0c94..4810a7c 100644 --- a/src/quasibroadcast.jl +++ b/src/quasibroadcast.jl @@ -195,5 +195,5 @@ _broadcasted_mul(A::AbstractQuasiMatrix, b::Tuple{Union{AbstractVector,AbstractQ _broadcasted_mul(A::AbstractQuasiMatrix, B::Tuple{Union{AbstractMatrix,AbstractQuasiMatrix},Vararg{Any}}) = (size(first(B),1) == 1 ? (sum(A; dims=2) * first(B)) : (A * first(B)), _broadcasted_mul(A, tail(B))...) - +LazyArrays.converteltype(::Type{T}, A::AbstractQuasiArray) where T = convert(AbstractQuasiArray{T}, A) elconvert(::Type{T}, A::AbstractQuasiArray) where T = convert(AbstractQuasiArray{T}, A) \ No newline at end of file