From 1439e1a7535fdae421e41496270342ebac8bd4f1 Mon Sep 17 00:00:00 2001 From: ioannisPApapadopoulos Date: Fri, 28 Jun 2024 15:05:24 +0200 Subject: [PATCH 1/2] bump to julia 1.10 and upgrade compat --- Project.toml | 29 +++++++++++++++-------------- src/RadialPiecewisePolynomials.jl | 2 +- src/continuouszernike.jl | 4 ++-- src/continuouszernikemode.jl | 2 +- src/diskelement.jl | 4 +++- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Project.toml b/Project.toml index 6b435f9..ea526a0 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "RadialPiecewisePolynomials" uuid = "7dab568b-3cf7-4f91-a977-b4631dfca174" authors = ["john.papad "] -version = "0.1.2" +version = "0.1.3" [deps] AnnuliOrthogonalPolynomials = "de1797fd-24c3-4035-91a2-b52aecdcfb01" @@ -16,6 +16,7 @@ FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" HypergeometricFunctions = "34004b35-14d8-5ef3-9330-4cdb6864b03a" LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +MatrixFactorizations = "a3b82374-2e81-5b9e-98ce-41277c0e4c87" Memoization = "6fafb56a-5788-4b4e-91ca-c0cea6611c73" MultivariateOrthogonalPolynomials = "4f6956fd-4f93-5457-9149-7bfc4b2ce06d" PiecewiseOrthogonalPolynomials = "4461d12d-4663-4550-8580-cb764c85e20f" @@ -26,25 +27,25 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" [compat] -AnnuliOrthogonalPolynomials = "0.0.5" +AnnuliOrthogonalPolynomials = "0.0.6" BandedMatrices = "0.17, 1" -BlockArrays = "0.16" -BlockBandedMatrices = "0.12" -ClassicalOrthogonalPolynomials = "0.12.4" -ContinuumArrays = "0.17" -DomainSets = "0.6, 0.7" -FastTransforms = "0.15" +BlockArrays = "1.1" +BlockBandedMatrices = "0.13" +ClassicalOrthogonalPolynomials = "0.13" +ContinuumArrays = "0.18" +DomainSets = "0.7" +FastTransforms = "0.16" FillArrays = "1.5" HypergeometricFunctions = "0.3" -LazyArrays = "1.5" +LazyArrays = "2.1" Memoization = "0.2" -MultivariateOrthogonalPolynomials = "0.6" -PiecewiseOrthogonalPolynomials = "0.4" -QuasiArrays = "0.9, 0.10, 0.11" -SemiclassicalOrthogonalPolynomials = "0.5.5" +MultivariateOrthogonalPolynomials = "0.7" +PiecewiseOrthogonalPolynomials = "0.5" +QuasiArrays = "0.11" +SemiclassicalOrthogonalPolynomials = "0.5" SpecialFunctions = "2" StaticArrays = "1.6" -julia = "1.9" +julia = "1.10" [extras] ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" diff --git a/src/RadialPiecewisePolynomials.jl b/src/RadialPiecewisePolynomials.jl index 9a89806..c63945d 100644 --- a/src/RadialPiecewisePolynomials.jl +++ b/src/RadialPiecewisePolynomials.jl @@ -2,7 +2,7 @@ module RadialPiecewisePolynomials using AnnuliOrthogonalPolynomials, BandedMatrices, BlockArrays, BlockBandedMatrices, ClassicalOrthogonalPolynomials, ContinuumArrays, DomainSets, FastTransforms, LinearAlgebra, MultivariateOrthogonalPolynomials, SemiclassicalOrthogonalPolynomials, - StaticArrays, QuasiArrays, FillArrays, LazyArrays, Memoization, SparseArrays#, ArrayLayouts#, LazyBandedMatrices#, + StaticArrays, QuasiArrays, FillArrays, LazyArrays, Memoization, SparseArrays, MatrixFactorizations#, ArrayLayouts#, LazyBandedMatrices#, import BlockArrays: BlockSlice, block, blockindex, blockvec diff --git a/src/continuouszernike.jl b/src/continuouszernike.jl index b092041..a29bcce 100644 --- a/src/continuouszernike.jl +++ b/src/continuouszernike.jl @@ -226,7 +226,7 @@ function zero_dirichlet_bcs!(Φ::ContinuousZernike{T}, Δ::AbstractVector{<:Abst zero_dirichlet_bcs!.(Fs, Δ) end -function zero_dirichlet_bcs!(Φ::ContinuousZernike{T}, Mf::AbstractVector{<:PseudoBlockVector}) where T +function zero_dirichlet_bcs!(Φ::ContinuousZernike{T}, Mf::AbstractVector{<:BlockVector}) where T @assert length(Mf) == 2*Φ.N-1 Fs = Φ.Fs #_getFs(Φ.N, Φ.points) zero_dirichlet_bcs!.(Fs, Mf) @@ -250,7 +250,7 @@ function zero_dirichlet_bcs!(points::AbstractVector{T}, A::Matrix) where T end end -function zero_dirichlet_bcs!(points::AbstractVector{T}, Mf::PseudoBlockVector) where T +function zero_dirichlet_bcs!(points::AbstractVector{T}, Mf::BlockVector) where T K = length(points)-1 if !(first(points) ≈ 0) Mf[1] = zero(T) diff --git a/src/continuouszernikemode.jl b/src/continuouszernikemode.jl index 80d8337..69afe2a 100644 --- a/src/continuouszernikemode.jl +++ b/src/continuouszernikemode.jl @@ -385,7 +385,7 @@ function zero_dirichlet_bcs!(F::ContinuousZernikeMode{T}, A::SparseMatrixCSC) wh end end -function zero_dirichlet_bcs!(F::ContinuousZernikeMode{T}, Mf::PseudoBlockVector) where T +function zero_dirichlet_bcs!(F::ContinuousZernikeMode{T}, Mf::BlockVector) where T points = F.points K = length(points)-1 if !(first(points) ≈ 0) diff --git a/src/diskelement.jl b/src/diskelement.jl index 75ad316..e9fc34d 100644 --- a/src/diskelement.jl +++ b/src/diskelement.jl @@ -134,7 +134,9 @@ function assembly_matrix(C::ContinuousZernikeElementMode, Λ::AbstractMatrix) R₁₁ = ρ / sqrt(2*one(T)) * (Weighted(Normalized(Jacobi{T}(0,m))) \ Weighted(Normalized(Jacobi{T}(1,m)))) R = Hcat(Vcat(ρ*one(T), Zeros{T}(∞)), R₁₁) - ApplyArray(*, R', ApplyArray(*, Λ, R)) + # BUG in Julia 1.10 means R' * Λ fails to print with a checkbounds error + Rt = Bidiagonal(view(R, band(0)), view(R, band(1)), :L) + ApplyArray(*, Rt, ApplyArray(*, Λ, R)) end ### From c1c069b2a4a65d829d195d9722cf173c76de2e5d Mon Sep 17 00:00:00 2001 From: ioannisPApapadopoulos Date: Fri, 28 Jun 2024 15:16:58 +0200 Subject: [PATCH 2/2] bump julia version in CI tests --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60391f6..40a7191 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: version: - - '1.9' + - '1.10' os: - ubuntu-latest # - macOS-latest