Skip to content

Commit 150dc27

Browse files
authored
Bump minimal Julia requirement to v1.10. (#552)
1 parent 6f3345a commit 150dc27

File tree

8 files changed

+91
-115
lines changed

8 files changed

+91
-115
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
version: ['1.8', '1.9', '1.10', 'nightly']
17+
version: ['1.10', 'pre', 'nightly']
1818
os: [ubuntu-latest, macOS-latest, windows-latest]
1919
arch: [x64]
2020
steps:
@@ -56,7 +56,7 @@ jobs:
5656
- uses: actions/checkout@v4
5757
- uses: julia-actions/setup-julia@v2
5858
with:
59-
version: '1.8'
59+
version: '1.10'
6060
- name: Develop packages
6161
run: |
6262
julia -e "

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ Random = "1"
2323
Reexport = "1"
2424
Serialization = "1"
2525
Statistics = "1"
26-
julia = "1.8"
26+
julia = "1.10"

docs/Manifest.toml

Lines changed: 79 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,135 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
[[Base64]]
3+
julia_version = "1.10.4"
4+
manifest_format = "2.0"
5+
project_hash = "e0c77beb18dc1f6cce661ebd60658c0c1a77390f"
6+
7+
[[deps.Artifacts]]
8+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
9+
10+
[[deps.Base64]]
411
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
512

6-
[[Dates]]
13+
[[deps.Dates]]
714
deps = ["Printf"]
815
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
916

10-
[[Distributed]]
11-
deps = ["Random", "Serialization", "Sockets"]
12-
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
13-
14-
[[DocStringExtensions]]
15-
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
16-
git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1"
17+
[[deps.DocStringExtensions]]
18+
deps = ["LibGit2"]
19+
git-tree-sha1 = "b19534d1895d702889b219c382a6e18010797f0b"
1720
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
18-
version = "0.8.3"
21+
version = "0.8.6"
1922

20-
[[Documenter]]
23+
[[deps.Documenter]]
2124
deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
2225
git-tree-sha1 = "b7715ae18be02110a8cf9cc8ed2ccdb1e3e3aba2"
2326
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
2427
version = "0.26.1"
2528

26-
[[IOCapture]]
29+
[[deps.IOCapture]]
2730
deps = ["Logging"]
2831
git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59"
2932
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
3033
version = "0.1.1"
3134

32-
[[InteractiveUtils]]
35+
[[deps.InteractiveUtils]]
3336
deps = ["Markdown"]
3437
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
3538

36-
[[JSON]]
39+
[[deps.JSON]]
3740
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
38-
git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4"
41+
git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
3942
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
40-
version = "0.21.1"
43+
version = "0.21.4"
4144

42-
[[LibGit2]]
45+
[[deps.LibGit2]]
46+
deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
4347
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
4448

45-
[[Logging]]
49+
[[deps.LibGit2_jll]]
50+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
51+
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
52+
version = "1.6.4+0"
53+
54+
[[deps.LibSSH2_jll]]
55+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
56+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
57+
version = "1.11.0+1"
58+
59+
[[deps.Libdl]]
60+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
61+
62+
[[deps.Logging]]
4663
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
4764

48-
[[Markdown]]
65+
[[deps.Markdown]]
4966
deps = ["Base64"]
5067
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
5168

52-
[[Mmap]]
69+
[[deps.MbedTLS_jll]]
70+
deps = ["Artifacts", "Libdl"]
71+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
72+
version = "2.28.2+1"
73+
74+
[[deps.Mmap]]
5375
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
5476

55-
[[Parsers]]
56-
deps = ["Dates"]
57-
git-tree-sha1 = "50c9a9ed8c714945e01cd53a21007ed3865ed714"
77+
[[deps.NetworkOptions]]
78+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
79+
version = "1.2.0"
80+
81+
[[deps.Parsers]]
82+
deps = ["Dates", "PrecompileTools", "UUIDs"]
83+
git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
5884
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
59-
version = "1.0.15"
85+
version = "2.8.1"
6086

61-
[[Pkg]]
62-
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
63-
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
87+
[[deps.PrecompileTools]]
88+
deps = ["Preferences"]
89+
git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f"
90+
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
91+
version = "1.2.1"
6492

65-
[[Printf]]
93+
[[deps.Preferences]]
94+
deps = ["TOML"]
95+
git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
96+
uuid = "21216c6a-2e73-6563-6e65-726566657250"
97+
version = "1.4.3"
98+
99+
[[deps.Printf]]
66100
deps = ["Unicode"]
67101
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
68102

69-
[[REPL]]
70-
deps = ["InteractiveUtils", "Markdown", "Sockets"]
103+
[[deps.REPL]]
104+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
71105
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
72106

73-
[[Random]]
74-
deps = ["Serialization"]
107+
[[deps.Random]]
108+
deps = ["SHA"]
75109
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
76110

77-
[[SHA]]
111+
[[deps.SHA]]
78112
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
113+
version = "0.7.0"
79114

80-
[[Serialization]]
115+
[[deps.Serialization]]
81116
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
82117

83-
[[Sockets]]
118+
[[deps.Sockets]]
84119
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
85120

86-
[[Test]]
87-
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
121+
[[deps.TOML]]
122+
deps = ["Dates"]
123+
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
124+
version = "1.0.3"
125+
126+
[[deps.Test]]
127+
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
88128
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
89129

90-
[[UUIDs]]
130+
[[deps.UUIDs]]
91131
deps = ["Random", "SHA"]
92132
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
93133

94-
[[Unicode]]
134+
[[deps.Unicode]]
95135
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

lib/GPUArraysCore/src/GPUArraysCore.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,11 @@ function repl_frontend_task()
5757
end
5858
_repl_frontend_task[]
5959
end
60-
function get_repl_frontend_task()
61-
@static if VERSION >= v"1.10.0-DEV.444" || v"1.9-beta4" <= VERSION < v"1.10-"
62-
if isdefined(Base, :active_repl)
63-
Base.active_repl.frontend_task
64-
else
65-
missing
66-
end
60+
@noinline function get_repl_frontend_task()
61+
if isdefined(Base, :active_repl)
62+
Base.active_repl.frontend_task
6763
else
68-
nothing
64+
missing
6965
end
7066
end
7167

src/host/base.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,8 @@ GPUIndexStyle(i1::Colon, I...) = GPUIndexStyle(I...)
289289
viewlength() = ()
290290
@inline viewlength(::Real, I...) = viewlength(I...) # skip scalar
291291

292-
if VERSION >= v"1.8.0-DEV.120"
293292
@inline viewlength(i1::AbstractUnitRange, I...) = (Base.length(i1), viewlength(I...)...)
294293
@inline viewlength(i1::AbstractUnitRange, ::Base.ScalarIndex...) = (Base.length(i1),)
295-
else
296-
@inline viewlength(i1::AbstractUnitRange, I...) = (length(i1), viewlength(I...)...)
297-
@inline viewlength(i1::AbstractUnitRange, ::Base.ScalarIndex...) = (length(i1),)
298-
end
299294

300295
# adaptor to upload an array to the GPU
301296
struct ToGPU

src/host/linalg.jl

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
# integration with LinearAlgebra stdlib
22

3-
using LinearAlgebra: MulAddMul
4-
5-
if isdefined(LinearAlgebra, :wrap) # i.e., VERSION >= v"1.10.0-DEV.1365"
6-
using LinearAlgebra: wrap
7-
else
8-
function wrap(A::AbstractVecOrMat, tA::AbstractChar)
9-
if tA == 'N'
10-
return A
11-
elseif tA == 'T'
12-
return transpose(A)
13-
elseif tA == 'C'
14-
return adjoint(A)
15-
elseif tA == 'H'
16-
return Hermitian(A, :U)
17-
elseif tA == 'h'
18-
return Hermitian(A, :L)
19-
elseif tA == 'S'
20-
return Symmetric(A, :U)
21-
else # tA == 's'
22-
return Symmetric(A, :L)
23-
end
24-
end
25-
end
3+
using LinearAlgebra: MulAddMul, wrap
264

275
## transpose and adjoint
286

@@ -558,46 +536,12 @@ function generic_mattrimul!(C::AbstractGPUVecOrMat{R}, uploc, isunitc, tfun::Fun
558536
C
559537
end
560538

561-
if VERSION >= v"1.10-"
562539
function LinearAlgebra.generic_trimatmul!(C::AbstractGPUVecOrMat, uploc, isunitc, tfun::Function, A::AbstractGPUMatrix, B::AbstractGPUVecOrMat)
563540
generic_trimatmul!(C, uploc, isunitc, tfun, A, B)
564541
end
565542
function LinearAlgebra.generic_mattrimul!(C::AbstractGPUMatrix, uploc, isunitc, tfun::Function, A::AbstractGPUMatrix, B::AbstractGPUMatrix)
566543
generic_mattrimul!(C, uploc, isunitc, tfun, A, B)
567544
end
568-
end
569-
570-
if VERSION < v"1.10.0-DEV.1365"
571-
# catch other functions that are called by LinearAlgebra's mul!
572-
function LinearAlgebra.gemv!(C::AbstractGPUVector, tA::AbstractChar, A::AbstractGPUMatrix, B::AbstractGPUVector, a::Number, b::Number)
573-
generic_matmatmul!(C, wrap(A, tA), B, MulAddMul(a, b))
574-
end
575-
# disambiguation
576-
function LinearAlgebra.gemv!(C::AbstractGPUVector{T}, tA::AbstractChar, A::AbstractGPUMatrix{T}, B::AbstractGPUVector{T}, a::Number, b::Number) where {T<:LinearAlgebra.BlasFloat}
577-
generic_matmatmul!(C, wrap(A, tA), B, MulAddMul(a, b))
578-
end
579-
580-
LinearAlgebra.gemm_wrapper!(C::AbstractGPUVecOrMat, tA::AbstractChar, tB::AbstractChar, A::AbstractGPUVecOrMat, B::AbstractGPUVecOrMat, _add::MulAddMul) =
581-
generic_matmatmul!(C, wrap(A, tA), wrap(B, tB), _add)
582-
# disambiguation
583-
LinearAlgebra.gemm_wrapper!(C::AbstractGPUVecOrMat{T}, tA::AbstractChar, tB::AbstractChar, A::AbstractGPUVecOrMat{T}, B::AbstractGPUVecOrMat{T}, _add::MulAddMul) where {T<:LinearAlgebra.BlasFloat} =
584-
generic_matmatmul!(C, wrap(A, tA), wrap(B, tB), _add)
585-
586-
function LinearAlgebra.syrk_wrapper!(C::AbstractGPUMatrix, tA::AbstractChar, A::AbstractGPUVecOrMat, _add::MulAddMul = MulAddMul())
587-
if tA == 'T'
588-
generic_matmatmul!(C, wrap(A, 'T'), A, _add)
589-
else # tA == 'N'
590-
generic_matmatmul!(C, A, wrap(A, 'T'), _add)
591-
end
592-
end
593-
function LinearAlgebra.herk_wrapper!(C::AbstractGPUMatrix, tA::AbstractChar, A::AbstractGPUVecOrMat, _add::MulAddMul = MulAddMul())
594-
if tA == 'C'
595-
generic_matmatmul!(C, wrap(A, 'C'), A, _add)
596-
else # tA == 'N'
597-
generic_matmatmul!(C, A, wrap(A, 'C'), _add)
598-
end
599-
end
600-
end # VERSION
601545

602546
function generic_rmul!(X::AbstractArray, s::Number)
603547
gpu_call(X, s; name="rmul!") do ctx, X, s

test/testsuite/base.jl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,10 @@ end
378378
@test b isa AT{Float32, 2}
379379
end
380380
@test(Array(b) == [1.0 0.0 0.0; 2.0 2.0 3.0],
381-
broken=(AT <: Array && VERSION >= v"1.11.0-DEV.727"))
381+
broken=(AT <: Array &&
382+
VERSION >= v"1.11.0-DEV.727" && # broken in JuliaLang/julia#51760
383+
!(v"1.11-rc1" <= VERSION < v"1.12-")) # reverted in -rc1
384+
)
382385

383386
a = AT(Float32[1.0 0.0 0.0; 2.0 2.0 3.0])
384387
b = reinterpret(reshape, ComplexF32, a)

test/testsuite/linalg.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
end
134134
end
135135

136-
if VERSION >= v"1.10-"
137136
@testset "mul! + Triangular" begin
138137
@testset "trimatmul! ($TR x $T, $f)" for T in (Float32, ComplexF32), TR in (UpperTriangular, LowerTriangular, UnitUpperTriangular, UnitLowerTriangular), f in (identity, transpose, adjoint)
139138
n = 128
@@ -164,7 +163,6 @@
164163
@test collect(Ct) C
165164
end
166165
end
167-
end
168166
end
169167

170168
@testset "diagonal" begin

0 commit comments

Comments
 (0)