Fixes for non-Int based lengths #37741
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,9 +58,9 @@ Alignment is reported as a vector of (left,right) tuples, one for each | |
| column going across the screen. | ||
| """ | ||
| function alignment(io::IO, X::AbstractVecOrMat, | ||
| rows::AbstractVector{T}, cols::AbstractVector{V}, | ||
| cols_if_complete::Integer, cols_otherwise::Integer, sep::Integer) where {T,V} | ||
| a = Tuple{T, V}[] | ||
|
There was a problem hiding this comment. This change is more concerning. I'm a little surprised that we don't julia> include("/tmp/sv.jl")
2-element SquaresVector:
1
4 0.395123 seconds (1.06 M allocations: 58.098 MiB, 6.47% gc time, 99.91% compilation time)where struct SquaresVector <: AbstractArray{Int, 1}
count::Int
end
Base.size(S::SquaresVector) = (S.count,)
Base.IndexStyle(::Type{<:SquaresVector}) = IndexLinear()
Base.getindex(S::SquaresVector, i::Int) = i*i
sv = SquaresVector(2)
@time show(stdout, MIME("text/plain"), sv)0.4s is a long time, and we have to pay it if stuff gets invalidated. Since the code_warntype(Base.alignment, (IO, AbstractVecOrMat, AbstractVector, AbstractVector, Integer, Integer, Integer))and code_warntype(Base.print_matrix, (IO, AbstractVecOrMat, AbstractString, AbstractString, AbstractString, AbstractString, AbstractString, AbstractString, Integer, Integer))to see the invalidation risks and how much the type-asserts currently save us. You might compare this branch against master and check for differences. There was a problem hiding this comment.
It seems what we want to say is that we are iterating over the "range" of a vector. A more descriptive way would be to change it to julia> union(Base.OneTo(5))
5-element Vector{Int64}:
1
2
3
4
5There's a very good argument for adding special overloads for |
||
| for j in cols # need to go down each column one at a time | ||
| l = r = 0 | ||
| for i in rows # plumb down and see what largest element sizes are | ||
|
|
@@ -166,6 +166,11 @@ function print_matrix(io::IO, @nospecialize(X::AbstractVecOrMat), | |
| vdots::AbstractString = "\u22ee", | ||
| ddots::AbstractString = " \u22f1 ", | ||
| hmod::Integer = 5, vmod::Integer = 5) | ||
| # use invokelatest to avoid backtracing in type invalidation, ref #37741 | ||
| invokelatest(_print_matrix, io, X, pre, sep, post, hdots, vdots, ddots, hmod, vmod, unitrange(axes(X,1)), unitrange(axes(X,2))) | ||
| end | ||
|
|
||
| function _print_matrix(io, @nospecialize(X::AbstractVecOrMat), pre, sep, post, hdots, vdots, ddots, hmod, vmod, rowsA, colsA) | ||
| hmod, vmod = Int(hmod)::Int, Int(vmod)::Int | ||
| if !(get(io, :limit, false)::Bool) | ||
| screenheight = screenwidth = typemax(Int) | ||
|
|
@@ -178,7 +183,6 @@ function print_matrix(io::IO, @nospecialize(X::AbstractVecOrMat), | |
| postsp = "" | ||
| @assert textwidth(hdots) == textwidth(ddots) | ||
| sepsize = length(sep)::Int | ||
| m, n = length(rowsA), length(colsA) | ||
| # To figure out alignments, only need to look at as many rows as could | ||
| # fit down screen. If screen has at least as many rows as A, look at A. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # This file is a part of Julia. License is MIT: https://julialang.org/license | ||
|
|
||
| # InfiniteArrays (arrays with infinite size) | ||
|
|
||
| # This test file is designed to exercise support for generic sizing, | ||
| # even though infinite arrays aren't implemented in Base. | ||
|
|
||
| module InfiniteArrays | ||
|
|
||
| export OneToInf, Infinity | ||
|
|
||
| """ | ||
| Infinity() | ||
|
|
||
| represents infinite cardinality. Note that `Infinity <: Integer` to support | ||
| being treated as an index. | ||
| """ | ||
| struct Infinity <: Integer end | ||
|
|
||
| Base.:(==)(::Infinity, ::Int) = false | ||
| Base.:(==)(::Int, ::Infinity) = false | ||
| Base.:(<)(::Int, ::Infinity) = true | ||
| Base.:(≤)(::Int, ::Infinity) = true | ||
| Base.:(≤)(::Infinity, ::Int) = false | ||
| Base.:(≤)(::Infinity, ::Infinity) = true | ||
| Base.:(-)(::Infinity, ::Int) = Infinity() | ||
| Base.:(+)(::Infinity, ::Int) = Infinity() | ||
| Base.:(:)(::Infinity, ::Infinity) = 1:0 | ||
|
|
||
| """ | ||
| OneToInf(n) | ||
|
|
||
| Define an `AbstractInfUnitRange` that behaves like `1:∞`, with the added | ||
| distinction that the limits are guaranteed (by the type system) to | ||
| be 1 and ∞. | ||
| """ | ||
| struct OneToInf{T<:Integer} <: AbstractUnitRange{T} end | ||
|
|
||
| OneToInf() = OneToInf{Int}() | ||
|
|
||
| Base.axes(r::OneToInf) = (r,) | ||
| Base.unsafe_indices(r::OneToInf) = (r,) | ||
| Base.unsafe_length(r::OneToInf) = Infinity() | ||
| Base.size(r::OneToInf) = (Infinity(),) | ||
| Base.first(r::OneToInf{T}) where {T} = oneunit(T) | ||
| Base.length(r::OneToInf{T}) where {T} = Infinity() | ||
| Base.last(r::OneToInf{T}) where {T} = Infinity() | ||
| Base.unitrange(r::OneToInf) = r | ||
| Base.oneto(::Infinity) = OneToInf() | ||
|
|
||
| end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From the perspective of Base & stdlibs, this change seems safe because
_typed_vcathas no backedges that extend deeper thantyped_vcat---we expunged them from the system image (probably mostly in #37163). You can create more backedges withvcat(1:3, [1,2,3]), and so this may cause some worsening of package interactions, but I think that can argued to be their problem rather than Julia's.