Skip to content

Commit d5236cb

Browse files
committed
further Static 0.7 updates; drop older ones to reduce chances of regressions
1 parent 0bc0da9 commit d5236cb

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ArrayInterfaceOffsetArrays = "0.1.2"
3535
ArrayInterfaceStaticArrays = "0.1.2"
3636
CPUSummary = "0.1.3 - 0.1.8, 0.1.11"
3737
ChainRulesCore = "1"
38-
CloseOpenIntervals = "0.1.2"
38+
CloseOpenIntervals = "0.1.10"
3939
DocStringExtensions = "0.8, 0.9"
4040
ForwardDiff = "0.9, 0.10"
4141
HostCPUFeatures = "0.1.3"
@@ -47,7 +47,7 @@ SIMDDualNumbers = "0.1"
4747
SIMDTypes = "0.1"
4848
SLEEFPirates = "0.6.23"
4949
SpecialFunctions = "1, 2"
50-
Static = "0.3.3, 0.4, 0.6, 0.7"
50+
Static = "0.7"
5151
ThreadingUtilities = "0.5"
5252
UnPack = "1"
5353
VectorizationBase = "0.21.21"

src/broadcast.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function LowDimArray{D0}(data::LowDimArray{D1,T,N,A}) where {D0,T,N,D1,A<:Abstra
2323
end
2424
Base.@propagate_inbounds Base.getindex(
2525
A::LowDimArray,
26-
i::Vararg{Union{Integer,CartesianIndex},K},
26+
i::Vararg{Union{StaticInt,Integer,CartesianIndex},K},
2727
) where {K} = getindex(A.data, i...)
2828
@inline Base.size(A::LowDimArray) = Base.size(A.data)
2929
@inline Base.size(A::LowDimArray, i) = Base.size(A.data, i)

src/codegen/lower_memory_common.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ end
5757
function _addoffset!(
5858
ret::Expr,
5959
vloopstride,
60-
indexstride::Union{Integer,MaybeKnown},
60+
indexstride::Union{Int,MaybeKnown},
6161
index,
6262
offset,
6363
calcbypointeroffset::Bool,
@@ -90,8 +90,8 @@ function __addoffset!(
9090
end
9191
function __addoffset!(
9292
ret::Expr,
93-
vloopstride::Union{Integer,MaybeKnown},
94-
indexstride::Union{Integer,MaybeKnown},
93+
vloopstride::Union{Int,MaybeKnown},
94+
indexstride::Union{Int,MaybeKnown},
9595
index,
9696
offset,
9797
calcbypointeroffset::Bool,

src/condense_loopset.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ end
357357
val(x) = Expr(:call, Expr(:curly, :Val, x))
358358

359359
@inline gespf1(x, i) = gesp(x, i)
360-
@inline gespf1(x::StridedPointer{T,1}, i::Tuple{I}) where {T,I<:Integer} = gesp(x, i)
361-
@inline gespf1(x::StridedBitPointer{T,1}, i::Tuple{I}) where {T,I<:Integer} = gesp(x, i)
360+
@inline gespf1(x::StridedPointer{T,1}, i::Tuple{I}) where {T,I<:Union{Integer,StaticInt}} = gesp(x, i)
361+
@inline gespf1(x::StridedBitPointer{T,1}, i::Tuple{I}) where {T,I<:Union{Integer,StaticInt}} = gesp(x, i)
362362
@inline gespf1(x::StridedPointer{T,1}, i::Tuple{Zero}) where {T} = x
363363
@inline gespf1(x::StridedBitPointer{T,1}, i::Tuple{Zero}) where {T} = x
364364
@generated function gespf1(
365365
x::AbstractStridedPointer{T,N,C,B,R},
366366
i::Tuple{I},
367-
) where {T,N,I<:Integer,C,B,R}
367+
) where {T,N,I<:Union{Integer,StaticInt},C,B,R}
368368
ri = argmin(R)
369369
quote
370370
$(Expr(:meta, :inline))

src/vectorizationbase_compat/subsetview.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ end
1111
@generated function subsetview(
1212
ptr::AbstractStridedPointer{T,N,C,B,R,X,O},
1313
::StaticInt{I},
14-
i::Integer,
14+
i::Union{Integer,StaticInt},
1515
) where {T,N,C,B,R,X,O,I}
1616
I > N && return :ptr
1717
@assert B 0 "Batched dims not currently supported."
@@ -55,7 +55,7 @@ end
5555
@generated function _gesp(
5656
sp::AbstractStridedPointer{T,N},
5757
::StaticInt{I},
58-
i::Integer,
58+
i::Union{Integer,StaticInt},
5959
::StaticInt{D},
6060
) where {I,N,T,D}
6161
t = Expr(:tuple)

test/dot.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ using Test
297297
@test myselfdot_avx(a) s
298298
@test myselfdotavx(a) s
299299

300-
A = OffsetArray(rand(37, 61), -5, 10)
300+
A = OffsetArray(rand(T, 37, 61), -5, 10);
301301
s = myselfdot(A)
302302
@test myselfdotavx(A) myselfdotavx(A') s
303303
@test myselfdotavx_v2(A) myselfdotavx_v2(A') s

0 commit comments

Comments
 (0)