Skip to content

Commit 4ff5f1e

Browse files
authored
Julia v1.9 (#143)
* Julia v1.9 * Update ci.yml
1 parent d44eab0 commit 4ff5f1e

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
version:
1313
- '1.6'
1414
- '1'
15+
- '^1.9.0-0'
1516
os:
1617
- ubuntu-latest
1718
- macOS-latest

Project.toml

Lines changed: 2 additions & 2 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.12.3"
3+
version = "0.12.4"
44

55
[deps]
66
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -30,7 +30,7 @@ InfiniteArrays = "0.12"
3030
Infinities = "0.1"
3131
IntervalSets = "0.5, 0.6, 0.7"
3232
LazyArrays = "0.22"
33-
QuasiArrays = "0.9.3"
33+
QuasiArrays = "0.9.6"
3434
RecipesBase = "1.0"
3535
StaticArrays = "1.0"
3636
julia = "1.6"

src/ContinuumArrays.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module ContinuumArrays
22
using IntervalSets, DomainSets, LinearAlgebra, LazyArrays, FillArrays, BandedMatrices, QuasiArrays, Infinities, InfiniteArrays, StaticArrays, BlockArrays, RecipesBase
33
import Base: @_inline_meta, @_propagate_inbounds_meta, axes, size, getindex, convert, prod, *, /, \, +, -, ==, ^,
4-
IndexStyle, IndexLinear, ==, OneTo, _maybetail, tail, similar, copyto!, copy, diff,
4+
IndexStyle, IndexLinear, ==, OneTo, tail, similar, copyto!, copy, diff,
55
first, last, show, isempty, findfirst, findlast, findall, Slice, union, minimum, maximum, sum, _sum,
66
getproperty, isone, iszero, zero, abs, <, , >, , string, summary, to_indices, view
77
import Base.Broadcast: materialize, BroadcastStyle, broadcasted, Broadcasted
@@ -17,7 +17,7 @@ import ArrayLayouts: mul, ZerosLayout, ScalarLayout, AbstractStridedLayout
1717
import QuasiArrays: cardinality, checkindex, QuasiAdjoint, QuasiTranspose, Inclusion, SubQuasiArray,
1818
QuasiDiagonal, MulQuasiArray, MulQuasiMatrix, MulQuasiVector, QuasiMatMulMat, QuasiArrayLayout,
1919
ApplyQuasiArray, ApplyQuasiMatrix, LazyQuasiArrayApplyStyle, AbstractQuasiArrayApplyStyle, AbstractQuasiLazyLayout,
20-
LazyQuasiArray, LazyQuasiVector, LazyQuasiMatrix, LazyLayout, LazyQuasiArrayStyle, _factorize,
20+
LazyQuasiArray, LazyQuasiVector, LazyQuasiMatrix, LazyLayout, LazyQuasiArrayStyle, _factorize, _cutdim,
2121
AbstractQuasiFill, UnionDomain, __sum, _cumsum, __cumsum, applylayout, _equals, layout_broadcasted, PolynomialLayout
2222
import InfiniteArrays: Infinity, InfAxes
2323
import AbstractFFTs: Plan
@@ -74,15 +74,15 @@ function BlockArrays.blockaxes(A::AbstractQuasiArray{T,N}, d) where {T,N}
7474
end
7575

7676
@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{Block{1}, Vararg{Any}}) =
77-
(unblock(A, inds, I), to_indices(A, _maybetail(inds), tail(I))...)
77+
(unblock(A, inds, I), to_indices(A, _cutdim(inds, I[1]), tail(I))...)
7878
@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockRange{1,R}, Vararg{Any}}) where R =
79-
(unblock(A, inds, I), to_indices(A, _maybetail(inds), tail(I))...)
79+
(unblock(A, inds, I), to_indices(A, _cutdim(inds, I[1]), tail(I))...)
8080
@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{BlockIndex{1}, Vararg{Any}}) =
81-
(inds[1][I[1]], to_indices(A, _maybetail(inds), tail(I))...)
81+
(inds[1][I[1]], to_indices(A, _cutdim(inds, I[1]), tail(I))...)
8282
@inline to_indices(A::AbstractQuasiArray, I::Tuple{BlockRange, Vararg{Any}}) = to_indices(A, axes(A), I)
8383

8484
@inline to_indices(A::AbstractQuasiArray, inds, I::Tuple{AbstractArray{<:BlockIndex{1}}, Vararg{Any}}) =
85-
(inds[1][I[1]], to_indices(A, _maybetail(inds), tail(I))...)
85+
(inds[1][I[1]], to_indices(A, _cutdim(inds, I[1]), tail(I))...)
8686

8787
checkpoints(x::Number) = x
8888
checkpoints(d::AbstractInterval{T}) where T = width(d) .* SVector{3,float(T)}(0.823972,0.01,0.3273484) .+ leftendpoint(d)

0 commit comments

Comments
 (0)