ContinuumArrays v0.17 (#52)

* ContinuumArrays v0.17

* tests pass

* Update ci.yml

* v0.2.5

* Update Project.toml

Author: dlfivefifty

.github/workflows/ci.yml

@@ -1,7 +1,17 @@
 name: CI
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'LICENSE'
+      - 'README.md'
+      - '.github/workflows/TagBot.yml'
+  pull_request:
+    paths-ignore:
+      - 'LICENSE'
+      - 'README.md'
+      - '.github/workflows/TagBot.yml'
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -18,12 +28,12 @@ jobs:
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v1
         env:
           cache-name: cache-artifacts
         with:
@@ -36,6 +46,6 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v1
         with:
           file: lcov.info

Project.toml

@@ -1,7 +1,7 @@
 name = "PiecewiseOrthogonalPolynomials"
 uuid = "4461d12d-4663-4550-8580-cb764c85e20f"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.2.4"
+version = "0.2.5"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -10,7 +10,6 @@ BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
 BlockBandedMatrices = "ffab5731-97b5-5995-9138-79e8c1846df0"
 ClassicalOrthogonalPolynomials = "b30e2e7b-c4ee-47da-9d5f-2c5c27239acd"
 ContinuumArrays = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
-FastTransforms = "057dd010-8810-581a-b7be-e3fc3b93f78c"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 InfiniteArrays = "4858937d-0d70-526a-a4dd-2d5cb5dd786c"
 InfiniteLinearAlgebra = "cde9dba0-b1de-11e9-2c62-0bab9446c55c"
@@ -22,14 +21,14 @@ QuasiArrays = "c4ea9172-b204-11e9-377d-29865faadc5c"
 
 [compat]
 ArrayLayouts = "1.0.12"
-BandedMatrices = "0.17.33, 1"
+BandedMatrices = "1"
 BlockArrays = "0.16.25"
 BlockBandedMatrices = "0.12.2"
-ClassicalOrthogonalPolynomials = "0.11"
-ContinuumArrays = "0.16.3"
+ClassicalOrthogonalPolynomials = "0.12"
+ContinuumArrays = "0.17"
 FillArrays = "1.0"
-InfiniteArrays = "0.12.6, 0.13"
-InfiniteLinearAlgebra = "0.6.16, 0.7"
+InfiniteArrays = "0.13"
+InfiniteLinearAlgebra = "0.7"
 LazyArrays = "1.8.2"
 LazyBandedMatrices = "0.9.1"
 MatrixFactorizations = "2.0"

src/PiecewiseOrthogonalPolynomials.jl

@@ -6,7 +6,7 @@ import BandedMatrices: _BandedMatrix
 import BlockArrays: BlockSlice, block, blockindex, blockvec
 import BlockBandedMatrices: _BandedBlockBandedMatrix, AbstractBandedBlockBandedMatrix, subblockbandwidths, blockbandwidths, AbstractBandedBlockBandedLayout, layout_replace_in_print_matrix
 import ClassicalOrthogonalPolynomials: grid, plotgrid, ldiv, pad, adaptivetransform_ldiv, Plan, singularities, basis_singularities, singularitiesbroadcast
-import ContinuumArrays: @simplify, factorize, TransformFactorization, AbstractBasisLayout, MemoryLayout, layout_broadcasted, ExpansionLayout, basis, plan_grid_transform, grammatrix, weaklaplacian
+import ContinuumArrays: @simplify, factorize, TransformFactorization, AbstractBasisLayout, MemoryLayout, layout_broadcasted, ExpansionLayout, basis, plan_transform, plan_grid_transform, grammatrix, weaklaplacian
 import LazyArrays: paddeddata
 import LazyBandedMatrices: BlockBroadcastMatrix, BlockVec, BandedLazyLayouts, AbstractLazyBandedBlockBandedLayout, UpperOrLowerTriangular
 import Base: axes, getindex, +, -, *, /, ==, \, OneTo, oneto, replace_in_print_matrix, copy, diff, getproperty, adjoint, transpose, tail, _sum

src/continuouspolynomial.jl

@@ -45,11 +45,14 @@ end
 factorize(V::SubQuasiArray{T,N,<:ContinuousPolynomial{0},<:Tuple{Inclusion,BlockSlice}}, dims...) where {T,N} =
     factorize(view(PiecewisePolynomial(parent(V)), parentindices(V)...), dims...)
 
-plan_grid_transform(P::ContinuousPolynomial{0}, args...) = plan_grid_transform(PiecewisePolynomial(P), args...)
-plan_grid_transform(P::ContinuousPolynomial{0}, lng::Union{Integer, Block{1}}, args...) = plan_grid_transform(PiecewisePolynomial(P), lng, args...)
+plan_transform(P::ContinuousPolynomial{0}, szs::NTuple{N,Union{Int,Block{1}}}, dims=ntuple(identity,Val(N))) where N = plan_transform(PiecewisePolynomial(P), szs, dims)
+
 
 for grd in (:grid, :plotgrid)
-    @eval $grd(C::ContinuousPolynomial, n...) = $grd(PiecewisePolynomial(C), n...)
+    @eval begin
+        $grd(C::ContinuousPolynomial, n::Block{1}) = $grd(PiecewisePolynomial(C), n) 
+        $grd(C::ContinuousPolynomial, n::Int) = $grd(PiecewisePolynomial(C), n) 
+    end
 end
 
 function adaptivetransform_ldiv(Q::ContinuousPolynomial{1,V}, f::AbstractQuasiVector) where V

src/dirichlet.jl

@@ -101,7 +101,10 @@ function diff(Q::DirichletPolynomial{T}; dims=1) where T
 end
 
 for grd in (:grid, :plotgrid)
-    @eval $grd(C::DirichletPolynomial, n...) = $grd(PiecewisePolynomial(C), n...)
+    @eval begin
+        $grd(C::DirichletPolynomial, n::Integer) = $grd(PiecewisePolynomial(C), n)
+        $grd(C::DirichletPolynomial, n::Block{1}) = $grd(PiecewisePolynomial(C), n)
+    end
 end
 
 ###

src/piecewisepolynomial.jl

@@ -67,8 +67,8 @@ function _perm_blockvec(X::AbstractArray{T,3}, dims=1) where T
     end
     ret
 end
-function _perm_blockvec(X::AbstractArray{T,4}, dims=1:2) where T
-    @assert dims == 1:2
+function _perm_blockvec(X::AbstractArray{T,4}, dims=(1,2)) where T
+    @assert dims == 1:2 || dims == (1,2)
     X1 = _perm_blockvec(X[:,:,1,1])
     X2 = _perm_blockvec(X[1,1,:,:])
     ret = PseudoBlockMatrix{T}(undef, (axes(X1,1), axes(X2,1)))
@@ -83,19 +83,19 @@ _interlace_const(n, m, ms...) = (m, n, _interlace_const(n, ms...)...)
 
 # we transform a piecewise transform into a tensor transform where each even dimensional slice corresponds to a different piece.
 # that is, we don't transform the last dimension.
-function plan_grid_transform(P::PiecewisePolynomial, Ns::NTuple{N,Block{1}}, dims=1:N) where N
+function plan_transform(P::PiecewisePolynomial, Ns::NTuple{N,Block{1}}, dims=ntuple(identity,Val(N))) where N
     @assert dims == 1:N || dims == ntuple(identity,Val(N)) || (N == dims == 1)
-    x,F = plan_grid_transform(P.basis, _interlace_const(length(P.points)-1, Int.(Ns)...), range(1; step=2, length=N))
-    repeatgrid(axes(P.basis, 1), x, P.points), ApplyPlan(_perm_blockvec, F, (dims,))
+    F = plan_transform(P.basis, _interlace_const(length(P.points)-1, Int.(Ns)...), range(1; step=2, length=N))
+    ApplyPlan(_perm_blockvec, F,  (dims,))
 end
 
 
 # If one dimension is an integer then this means its a vector transform. That is, we are only transforming
 # along one dimension.We add an extra dimension for the different entries in the vectors.
-function plan_grid_transform(P::PiecewisePolynomial, (M,n)::Tuple{Block{1},Int}, dims::Int)
+function plan_transform(P::PiecewisePolynomial, (M,n)::Tuple{Block{1},Int}, dims::Int)
     @assert dims == 1
-    x,F = plan_grid_transform(P.basis, (Int(M), length(P.points)-1, n), dims)
-    repeatgrid(axes(P.basis, 1), x, P.points), ApplyPlan(_perm_blockvec, F, (dims,))
+    F = plan_transform(P.basis, (Int(M), length(P.points)-1, n), dims)
+    ApplyPlan(_perm_blockvec, F, (dims,))
 end
 
 function factorize(V::SubQuasiArray{<:Any,2,<:PiecewisePolynomial,<:Tuple{Inclusion,BlockSlice}}, dims...)

test/test_continuouspolynomial.jl

@@ -1,5 +1,6 @@
 using PiecewiseOrthogonalPolynomials, StaticArrays, InfiniteArrays, ContinuumArrays, Test
-
+import LazyBandedMatrices: MemoryLayout, AbstractBandedBlockBandedLayout, BlockVec
+import ForwardDiff: derivative
 
 @testset "ContinuousPolynomial" begin
     @testset "transform" begin