Skip to content

BlockArrays v1.0 and LazyArrays v2.0 #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- '1'
- '1.10'
os:
- ubuntu-latest
- macOS-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: '1.9'
version: '1.10'
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
run: julia --project=docs/ -e 'using Pkg; Pkg.update(); Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # If authenticating with GitHub Actions token
Expand Down
16 changes: 8 additions & 8 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ContinuumArrays"
uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
version = "0.17.3"
version = "0.18"

[deps]
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
Expand Down Expand Up @@ -28,20 +28,20 @@ ContinuumArraysRecipesBaseExt = "RecipesBase"
[compat]
AbstractFFTs = "1.0"
ArrayLayouts = "1.0"
BandedMatrices = "0.17, 1"
BlockArrays = "0.16"
BandedMatrices = "1"
BlockArrays = "1"
DomainSets = "0.6, 0.7"
FastTransforms = "0.15"
FastTransforms = "0.15, 0.16"
FillArrays = "1.0"
InfiniteArrays = "0.12, 0.13"
InfiniteArrays = "0.14"
Infinities = "0.1"
IntervalSets = "0.7"
LazyArrays = "1.7"
LazyArrays = "2"
Makie = "0.19"
QuasiArrays = "0.11.1"
QuasiArrays = "0.11.5"
RecipesBase = "1.0"
StaticArrays = "1.0"
julia = "1.9"
julia = "1.10"

[extras]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down
2 changes: 1 addition & 1 deletion src/ContinuumArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Base.Broadcast: materialize, BroadcastStyle, broadcasted, Broadcasted
import LazyArrays: MemoryLayout, Applied, ApplyStyle, flatten, _flatten, colsupport, combine_mul_styles, AbstractArrayApplyStyle,
adjointlayout, arguments, _mul_arguments, call, broadcastlayout, layout_getindex, UnknownLayout,
sublayout, sub_materialize, ApplyLayout, BroadcastLayout, combine_mul_styles, applylayout,
simplifiable, _simplify, AbstractLazyLayout, PaddedLayout, simplify, Dot
simplifiable, _simplify, AbstractLazyLayout, AbstractPaddedLayout, simplify, Dot
import LinearAlgebra: pinv, inv, dot, norm2, ldiv!, mul!
import BandedMatrices: AbstractBandedLayout, _BandedMatrix
import BlockArrays: block, blockindex, unblock, blockedrange, _BlockedUnitRange, _BlockArray
Expand Down
2 changes: 1 addition & 1 deletion src/bases/bases.jl
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ _factorize(::WeightedBasisLayouts, wS, dims...; kws...) = WeightedFactorization(
##

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

tocoefficients(v) = tocoefficients_layout(MemoryLayout(v), v)
Expand Down
3 changes: 2 additions & 1 deletion test/test_basisconcat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ import ContinuumArrays: PiecewiseBasis, VcatBasis, HvcatBasis, arguments, ApplyL

@testset "Vec case" begin
Sv = PiecewiseBasis([S1,S2])
@test axes(Sv,2) isa BlockedUnitRange
@test axes(Sv,2) isa BlockedOneTo
@test Sv[0.5,1:4] == S[0.5,1:4]
@test Sv[0.5,Block(1)] == [0.5,0.5]
end

@testset "UnionDomain with point checkpoints" begin
Expand Down