Skip to content

Commit

Permalink
Merge pull request #24 from ioannisPApapadopoulos/jp/dependencies
Browse files Browse the repository at this point in the history
bump to julia 1.10 and upgrade compat
  • Loading branch information
ioannisPApapadopoulos authored Jun 28, 2024
2 parents b1b144c + c1c069b commit 1ae5ac6
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- '1.10'
os:
- ubuntu-latest
# - macOS-latest
Expand Down
29 changes: 15 additions & 14 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/RadialPiecewisePolynomials.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/continuouszernike.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/continuouszernikemode.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion src/diskelement.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

###
Expand Down

4 comments on commit 1ae5ac6

@ioannisPApapadopoulos
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/110009

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.3 -m "<description of version>" 1ae5ac6f82a7a1bdc52aba1f6dc35b2d8fa4f5f8
git push origin v0.1.3

@ioannisPApapadopoulos
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request updated: JuliaRegistries/General/110009

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.3 -m "<description of version>" 1ae5ac6f82a7a1bdc52aba1f6dc35b2d8fa4f5f8
git push origin v0.1.3

Please sign in to comment.