Skip to content

update for new ArrayLayouts #49

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 4 commits into from
Apr 13, 2020
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ os:
- windows
julia:
- 1.3
- 1.4
- nightly
matrix:
allow_failures:
Expand Down
10 changes: 5 additions & 5 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.2.1"
version = "0.2.2"

[deps]
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
Expand All @@ -12,12 +12,12 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
QuasiArrays = "c4ea9172-b204-11e9-377d-29865faadc5c"

[compat]
ArrayLayouts = "0.1"
BandedMatrices = "0.14.2"
ArrayLayouts = "0.2.4"
BandedMatrices = "0.15"
FillArrays = "0.8.2"
IntervalSets = "0.3.2, 0.4"
LazyArrays = "0.14.11, 0.15"
QuasiArrays = "0.1.1, 0.2"
LazyArrays = "0.16"
QuasiArrays = "0.2"
julia = "1.3"

[extras]
Expand Down
2 changes: 1 addition & 1 deletion src/ContinuumArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Base: @_inline_meta, @_propagate_inbounds_meta, axes, getindex, convert,
getproperty
import Base.Broadcast: materialize, BroadcastStyle, broadcasted
import LazyArrays: MemoryLayout, Applied, ApplyStyle, flatten, _flatten, colsupport,
adjointlayout, LdivApplyStyle, arguments, _arguments, call, broadcastlayout, lazy_getindex,
adjointlayout, LdivApplyStyle, arguments, _arguments, call, broadcastlayout, layout_getindex,
sublayout, sub_materialize, ApplyLayout, BroadcastLayout, combine_mul_styles
import LinearAlgebra: pinv
import BandedMatrices: AbstractBandedLayout, _BandedMatrix
Expand Down
2 changes: 1 addition & 1 deletion src/bases/bases.jl
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ end
@inline function copy(L::Ldiv{SubBasisLayout,BasisLayout})
P = parent(L.A)
kr, jr = parentindices(L.A)
lazy_getindex(apply(\, P, L.B), jr, :) # avoid sparse arrays
layout_getindex(apply(\, P, L.B), jr, :) # avoid sparse arrays
end


Expand Down
2 changes: 1 addition & 1 deletion src/bases/splines.jl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ grid(L::LinearSpline) = L.points
transform(L::LinearSpline{T}) where T = grid(L),Eye{T}(size(L,2))
function transform(V::SubQuasiArray{<:Any,2,<:LinearSpline,<:Tuple{<:Inclusion,<:Any}})
g, T = transform(parent(V))
g, qr(lazy_getindex(T,:,parentindices(V)[2])) # avoid sparse matrices of sub-diagonal
g, qr(layout_getindex(T,:,parentindices(V)[2])) # avoid sparse matrices of sub-diagonal
end

## Sub-bases
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ end
x = axes(L,1)
@test (L \ x) == [1,2,3]
@test factorize(L[:,2:end-1]) isa ContinuumArrays.ProjectionFactorization
@test L[:,1:2] \ x == [1,2]

L = LinearSpline(range(0,1; length=10_000))
x = axes(L,1)
Expand Down