Skip to content

Commit 686c5ba

Browse files
authored
BlockArrays v1.0 and LazyArrays v2.0 (#183)
* Support LazyArrays v2.0 and BlockArrays v1.0 * fixes * Require Julia v1.10 * Update documentation.yml
1 parent 3d14726 commit 686c5ba

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
version:
23-
- '1.9'
24-
- '1'
23+
- '1.10'
2524
os:
2625
- ubuntu-latest
2726
- macOS-latest

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: julia-actions/setup-julia@v2
1818
with:
19-
version: '1.9'
19+
version: '1.10'
2020
- name: Install dependencies
21-
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
21+
run: julia --project=docs/ -e 'using Pkg; Pkg.update(); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
2222
- name: Build and deploy
2323
env:
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token

Project.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ContinuumArrays"
22
uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
3-
version = "0.17.3"
3+
version = "0.18"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -28,20 +28,20 @@ ContinuumArraysRecipesBaseExt = "RecipesBase"
2828
[compat]
2929
AbstractFFTs = "1.0"
3030
ArrayLayouts = "1.0"
31-
BandedMatrices = "0.17, 1"
32-
BlockArrays = "0.16"
31+
BandedMatrices = "1"
32+
BlockArrays = "1"
3333
DomainSets = "0.6, 0.7"
34-
FastTransforms = "0.15"
34+
FastTransforms = "0.15, 0.16"
3535
FillArrays = "1.0"
36-
InfiniteArrays = "0.12, 0.13"
36+
InfiniteArrays = "0.14"
3737
Infinities = "0.1"
3838
IntervalSets = "0.7"
39-
LazyArrays = "1.7"
39+
LazyArrays = "2"
4040
Makie = "0.19"
41-
QuasiArrays = "0.11.1"
41+
QuasiArrays = "0.11.5"
4242
RecipesBase = "1.0"
4343
StaticArrays = "1.0"
44-
julia = "1.9"
44+
julia = "1.10"
4545

4646
[extras]
4747
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/ContinuumArrays.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Base.Broadcast: materialize, BroadcastStyle, broadcasted, Broadcasted
88
import LazyArrays: MemoryLayout, Applied, ApplyStyle, flatten, _flatten, colsupport, combine_mul_styles, AbstractArrayApplyStyle,
99
adjointlayout, arguments, _mul_arguments, call, broadcastlayout, layout_getindex, UnknownLayout,
1010
sublayout, sub_materialize, ApplyLayout, BroadcastLayout, combine_mul_styles, applylayout,
11-
simplifiable, _simplify, AbstractLazyLayout, PaddedLayout, simplify, Dot
11+
simplifiable, _simplify, AbstractLazyLayout, AbstractPaddedLayout, simplify, Dot
1212
import LinearAlgebra: pinv, inv, dot, norm2, ldiv!, mul!
1313
import BandedMatrices: AbstractBandedLayout, _BandedMatrix
1414
import BlockArrays: block, blockindex, unblock, blockedrange, _BlockedUnitRange, _BlockArray

src/bases/bases.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ _factorize(::WeightedBasisLayouts, wS, dims...; kws...) = WeightedFactorization(
353353
##
354354

355355
struct ExpansionLayout{Lay} <: AbstractLazyLayout end
356-
const CoefficientLayouts = Union{PaddedLayout,AbstractStridedLayout,ZerosLayout}
356+
const CoefficientLayouts = Union{AbstractPaddedLayout,AbstractStridedLayout,ZerosLayout}
357357
applylayout(::Type{typeof(*)}, ::Lay, ::CoefficientLayouts) where Lay <: AbstractBasisLayout = ExpansionLayout{Lay}()
358358

359359
tocoefficients(v) = tocoefficients_layout(MemoryLayout(v), v)

test/test_basisconcat.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ import ContinuumArrays: PiecewiseBasis, VcatBasis, HvcatBasis, arguments, ApplyL
3737

3838
@testset "Vec case" begin
3939
Sv = PiecewiseBasis([S1,S2])
40-
@test axes(Sv,2) isa BlockedUnitRange
40+
@test axes(Sv,2) isa BlockedOneTo
4141
@test Sv[0.5,1:4] == S[0.5,1:4]
42+
@test Sv[0.5,Block(1)] == [0.5,0.5]
4243
end
4344

4445
@testset "UnionDomain with point checkpoints" begin

0 commit comments

Comments
 (0)