Skip to content

Commit 4bc7eda

Browse files
authored
Merge branch 'master' into jishnub/matrix_structured_zero
2 parents d05a39b + 62c8100 commit 4bc7eda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1525
-1037
lines changed

.ci/Manifest.toml

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ version = "1.11.0"
1919
[[deps.CompilerSupportLibraries_jll]]
2020
deps = ["Artifacts", "Libdl"]
2121
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
22-
version = "1.2.0+0"
22+
version = "1.3.0+1"
2323

2424
[[deps.Dates]]
2525
deps = ["Printf"]
@@ -52,7 +52,7 @@ version = "1.11.0"
5252

5353
[[deps.JuliaSyntaxHighlighting]]
5454
deps = ["StyledStrings"]
55-
uuid = "dc6e5ff7-fb65-4e79-a425-ec3bc9c03011"
55+
uuid = "ac6e5ff7-fb65-4e79-a425-ec3bc9c03011"
5656
version = "1.12.0"
5757

5858
[[deps.LazyArtifacts]]
@@ -66,24 +66,24 @@ uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
6666
version = "0.6.4"
6767

6868
[[deps.LibCURL_jll]]
69-
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
69+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"]
7070
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
71-
version = "8.6.0+0"
71+
version = "8.11.1+1"
7272

7373
[[deps.LibGit2]]
7474
deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
7575
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
7676
version = "1.11.0"
7777

7878
[[deps.LibGit2_jll]]
79-
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
79+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"]
8080
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
81-
version = "1.8.0+0"
81+
version = "1.9.0+0"
8282

8383
[[deps.LibSSH2_jll]]
84-
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
84+
deps = ["Artifacts", "Libdl", "OpenSSL_jll"]
8585
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
86-
version = "1.11.0+1"
86+
version = "1.11.3+1"
8787

8888
[[deps.Libdl]]
8989
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -93,7 +93,7 @@ version = "1.11.0"
9393
deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
9494
path = ".."
9595
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
96-
version = "1.11.0"
96+
version = "1.12.0"
9797

9898
[[deps.Logging]]
9999
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -104,31 +104,29 @@ deps = ["Base64", "JuliaSyntaxHighlighting", "StyledStrings"]
104104
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
105105
version = "1.11.0"
106106

107-
[[deps.MbedTLS_jll]]
108-
deps = ["Artifacts", "Libdl"]
109-
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
110-
version = "2.28.6+1"
111-
112107
[[deps.MozillaCACerts_jll]]
113108
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
114-
version = "2024.3.11"
109+
version = "2024.12.31"
115110

116111
[[deps.NetworkOptions]]
117112
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
118-
version = "1.2.0"
113+
version = "1.3.0"
119114

120115
[[deps.OpenBLAS_jll]]
121116
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
122117
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
123-
version = "0.3.28+3"
118+
version = "0.3.29+0"
119+
120+
[[deps.OpenSSL_jll]]
121+
deps = ["Artifacts", "Libdl"]
122+
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
123+
version = "3.0.15+2"
124124

125125
[[deps.PackageCompiler]]
126126
deps = ["Artifacts", "Glob", "LazyArtifacts", "Libdl", "Pkg", "Printf", "RelocatableFolders", "TOML", "UUIDs", "p7zip_jll"]
127-
git-tree-sha1 = "946623a388d8cb5874a0e2cb062dbbcfbb90cea5"
128-
repo-rev = "kc/artifacts"
129-
repo-url = "https://github.com/JuliaLang/PackageCompiler.jl.git"
127+
git-tree-sha1 = "5d13e5b70011762b74f86fc08385303589f80272"
130128
uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
131-
version = "2.1.24"
129+
version = "2.2.0"
132130

133131
[[deps.Pkg]]
134132
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -206,19 +204,19 @@ version = "1.11.0"
206204
[[deps.Zlib_jll]]
207205
deps = ["Libdl"]
208206
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
209-
version = "1.3.1+1"
207+
version = "1.3.1+2"
210208

211209
[[deps.libblastrampoline_jll]]
212210
deps = ["Artifacts", "Libdl"]
213211
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
214-
version = "5.11.2+0"
212+
version = "5.12.0+0"
215213

216214
[[deps.nghttp2_jll]]
217215
deps = ["Artifacts", "Libdl"]
218216
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
219-
version = "1.63.0+1"
217+
version = "1.64.0+1"
220218

221219
[[deps.p7zip_jll]]
222220
deps = ["Artifacts", "Libdl"]
223221
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
224-
version = "17.5.0+1"
222+
version = "17.5.0+2"

.ci/create_sysimage.jl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using PackageCompiler, Libdl
2+
3+
function create_sysimage_linear_algebra()
4+
sysimage = tempname() * "." * Libdl.dlext
5+
6+
if haskey(ENV, "BUILDKITE")
7+
ncores = Sys.CPU_THREADS
8+
else
9+
ncores = ceil(Int, Sys.CPU_THREADS / 2)
10+
end
11+
12+
withenv("JULIA_IMAGE_THREADS" => ncores) do
13+
create_sysimage(["LinearAlgebra", "Test", "Distributed", "Dates", "Printf", "Random"]; sysimage_path=sysimage, incremental=false, filter_stdlibs=true)
14+
end
15+
return sysimage, ncores
16+
end
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
include("create_sysimage.jl")
2+
sysimage, ncores = create_sysimage_linear_algebra()
3+
doc_file = joinpath(@__DIR__, "..", "docs", "make.jl")
4+
withenv("JULIA_NUM_THREADS" => 1) do
5+
run(`$(Base.julia_cmd()) --sysimage=$sysimage --project=$(dirname(doc_file)) $doc_file`)
6+
end

.ci/create_sysimage_and_run_tests.jl

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
using PackageCompiler, Libdl
2-
3-
sysimage = tempname() * "." * Libdl.dlext
4-
5-
if haskey(ENV, "BUILDKITE")
6-
ncores = Sys.CPU_THREADS
7-
else
8-
ncores = ceil(Int, Sys.CPU_THREADS / 2)
9-
end
10-
11-
withenv("JULIA_IMAGE_THREADS" => ncores) do
12-
create_sysimage(["LinearAlgebra", "Test", "Distributed", "Dates", "Printf", "Random"]; sysimage_path=sysimage, incremental=false, filter_stdlibs=true)
13-
end
14-
1+
include("create_sysimage.jl")
2+
sysimage, ncores = create_sysimage_linear_algebra()
153
current_dir = @__DIR__
164
cmd = """Base.runtests(["LinearAlgebra"]; propagate_project=true, ncores=$ncores)"""
175
withenv("JULIA_NUM_THREADS" => 1) do

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
version: 'nightly'
2222
- name: Generate docs
2323
run: |
24-
julia --project --color=yes -e ''
25-
julia --project --color=yes -e 'using Pkg; Pkg.respect_sysimage_versions(false); Pkg.activate("docs"); Pkg.develop(PackageSpec(path = pwd()))'
26-
julia --project=docs --color=yes docs/make.jl
24+
julia --color=yes --project=.ci -e 'using Pkg; Pkg.instantiate()'
25+
julia --color=yes --project=docs -e 'using Pkg; Pkg.instantiate()'
26+
julia --color=yes --project=.ci .ci/create_sysimage_and_run_docs.jl
2727
env:
2828
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LinearAlgebra"
22
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
3-
version = "1.11.0"
3+
version = "1.12.0"
44

55
[deps]
66
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

docs/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[deps]
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
33
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
4+
5+
[sources]
6+
LinearAlgebra = {path = ".."}

src/LinearAlgebra.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import Base: USE_BLAS64, abs, acos, acosh, acot, acoth, acsc, acsch, adjoint, as
1616
permutedims, permuterows!, power_by_squaring, promote_rule, real, sec, sech, setindex!,
1717
show, similar, sin, sincos, sinh, size, sqrt, strides, stride, tan, tanh, transpose, trunc,
1818
typed_hcat, vec, view, zero
19+
import Base: AbstractArray, AbstractMatrix, Array, Matrix
1920
using Base: IndexLinear, promote_eltype, promote_op, print_matrix,
2021
@propagate_inbounds, reduce, typed_hvcat, typed_vcat, require_one_based_indexing,
2122
splat, BitInteger

src/abstractq.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ QRPackedQ(factors::AbstractMatrix{T}, τ::AbstractVector{T}) where {T} =
277277
QRPackedQ{T,typeof(factors),typeof(τ)}(factors, τ)
278278
QRPackedQ{T}(factors::AbstractMatrix, τ::AbstractVector) where {T} =
279279
QRPackedQ(convert(AbstractMatrix{T}, factors), convert(AbstractVector{T}, τ))
280+
QRPackedQ{T}(Q::QRPackedQ) where {T} = QRPackedQ{T}(Q.factors, Q.τ)
280281
# backwards-compatible constructors (remove with Julia 2.0)
281282
@deprecate(QRPackedQ{T,S}(factors::AbstractMatrix{T}, τ::AbstractVector{T}) where {T,S},
282283
QRPackedQ{T,S,typeof(τ)}(factors, τ), false)
@@ -300,12 +301,11 @@ QRCompactWYQ(factors::AbstractMatrix{S}, T::AbstractMatrix{S}) where {S} =
300301
QRCompactWYQ{S,typeof(factors),typeof(T)}(factors, T)
301302
QRCompactWYQ{S}(factors::AbstractMatrix, T::AbstractMatrix) where {S} =
302303
QRCompactWYQ(convert(AbstractMatrix{S}, factors), convert(AbstractMatrix{S}, T))
304+
QRCompactWYQ{S}(Q::QRCompactWYQ) where {S} = QRCompactWYQ{S}(Q.factors, Q.T)
303305
# backwards-compatible constructors (remove with Julia 2.0)
304306
@deprecate(QRCompactWYQ{S,M}(factors::AbstractMatrix{S}, T::AbstractMatrix{S}) where {S,M},
305307
QRCompactWYQ{S,M,typeof(T)}(factors, T), false)
306308

307-
QRPackedQ{T}(Q::QRPackedQ) where {T} = QRPackedQ(convert(AbstractMatrix{T}, Q.factors), convert(AbstractVector{T}, Q.τ))
308-
QRCompactWYQ{S}(Q::QRCompactWYQ) where {S} = QRCompactWYQ(convert(AbstractMatrix{S}, Q.factors), convert(AbstractMatrix{S}, Q.T))
309309

310310
# override generic square fallback
311311
Matrix{T}(Q::Union{QRCompactWYQ{S},QRPackedQ{S}}) where {T,S} =

src/adjtrans.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ const AdjointAbsVec{T} = Adjoint{T,<:AbstractVector}
319319
const AdjointAbsMat{T} = Adjoint{T,<:AbstractMatrix}
320320
const TransposeAbsVec{T} = Transpose{T,<:AbstractVector}
321321
const TransposeAbsMat{T} = Transpose{T,<:AbstractMatrix}
322-
const AdjOrTransAbsVec{T} = AdjOrTrans{T,<:AbstractVector}
323-
const AdjOrTransAbsMat{T} = AdjOrTrans{T,<:AbstractMatrix}
322+
const AdjOrTransAbsVec{T,V<:AbstractVector} = AdjOrTrans{T,V}
323+
const AdjOrTransAbsMat{T,M<:AbstractMatrix} = AdjOrTrans{T,M}
324324

325325
# for internal use below
326326
wrapperop(_) = identity

0 commit comments

Comments
 (0)