Skip to content

Commit 4fe2206

Browse files
authored
Bump minimum Julia requirement to Julia 1.8 (#495)
1 parent f1924a7 commit 4fe2206

File tree

14 files changed

+131
-267
lines changed

14 files changed

+131
-267
lines changed

.buildkite/pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- label: "CUDA.jl"
33
plugins:
44
- JuliaCI/julia#v1:
5-
version: 1.6
5+
version: 1.8
66
- JuliaCI/julia-coverage#v1:
77
codecov: true
88
command: |
@@ -25,7 +25,7 @@ steps:
2525
- label: "oneAPI.jl"
2626
plugins:
2727
- JuliaCI/julia#v1:
28-
version: 1.6
28+
version: 1.8
2929
- JuliaCI/julia-coverage#v1:
3030
codecov: true
3131
command: |
@@ -76,7 +76,7 @@ steps:
7676
# - label: "AMDGPU.jl"
7777
# plugins:
7878
# - JuliaCI/julia#v1:
79-
# version: 1.6
79+
# version: 1.8
8080
# - JuliaCI/julia-coverage#v1:
8181
# codecov: true
8282
# command: |
@@ -99,7 +99,7 @@ steps:
9999
- label: "Enzyme.jl"
100100
plugins:
101101
- JuliaCI/julia#v1:
102-
version: 1.6
102+
version: 1.8
103103
- JuliaCI/julia-coverage#v1:
104104
codecov: true
105105
command: |

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
version: ['1.6', '1.7', '1.8', '1.9.0-beta4']
16+
version: ['1.8', '1.9', '1.10.0-beta2']
1717
os: [ubuntu-latest, macOS-latest, windows-latest]
1818
arch: [x64]
1919
steps:

Manifest.toml

Lines changed: 64 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,180 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
[[ArgTools]]
3+
manifest_format = "2.0"
4+
5+
[[deps.ArgTools]]
46
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
7+
version = "1.1.1"
58

6-
[[Artifacts]]
9+
[[deps.Artifacts]]
710
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
811

9-
[[Base64]]
12+
[[deps.Base64]]
1013
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1114

12-
[[CEnum]]
15+
[[deps.CEnum]]
1316
git-tree-sha1 = "eb4cb44a499229b3b8426dcfb5dd85333951ff90"
1417
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
1518
version = "0.4.2"
1619

17-
[[Dates]]
20+
[[deps.Dates]]
1821
deps = ["Printf"]
1922
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
2023

21-
[[Downloads]]
22-
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
24+
[[deps.Downloads]]
25+
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
2326
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
27+
version = "1.6.0"
2428

25-
[[ExprTools]]
29+
[[deps.ExprTools]]
2630
git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec"
2731
uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
2832
version = "0.1.10"
2933

30-
[[InteractiveUtils]]
34+
[[deps.FileWatching]]
35+
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
36+
37+
[[deps.InteractiveUtils]]
3138
deps = ["Markdown"]
3239
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
3340

34-
[[JLLWrappers]]
35-
deps = ["Artifacts", "Preferences"]
36-
git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca"
41+
[[deps.JLLWrappers]]
42+
deps = ["Preferences"]
43+
git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
3744
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
38-
version = "1.5.0"
45+
version = "1.4.1"
3946

40-
[[LLVM]]
47+
[[deps.LLVM]]
4148
deps = ["CEnum", "LLVMExtra_jll", "Libdl", "Printf", "Unicode"]
4249
git-tree-sha1 = "8695a49bfe05a2dc0feeefd06b4ca6361a018729"
4350
uuid = "929cbde3-209d-540e-8aea-75f648917ca0"
4451
version = "6.1.0"
4552

46-
[[LLVMExtra_jll]]
53+
[[deps.LLVMExtra_jll]]
4754
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
4855
git-tree-sha1 = "c35203c1e1002747da220ffc3c0762ce7754b08c"
4956
uuid = "dad2f222-ce93-54a1-a47d-0025e8a3acab"
5057
version = "0.0.23+0"
5158

52-
[[LazyArtifacts]]
59+
[[deps.LazyArtifacts]]
5360
deps = ["Artifacts", "Pkg"]
5461
uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
5562

56-
[[LibCURL]]
63+
[[deps.LibCURL]]
5764
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
5865
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
66+
version = "0.6.3"
5967

60-
[[LibCURL_jll]]
68+
[[deps.LibCURL_jll]]
6169
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
6270
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
71+
version = "7.84.0+0"
6372

64-
[[LibGit2]]
73+
[[deps.LibGit2]]
6574
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
6675
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
6776

68-
[[LibSSH2_jll]]
77+
[[deps.LibSSH2_jll]]
6978
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
7079
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
80+
version = "1.10.2+0"
7181

72-
[[Libdl]]
82+
[[deps.Libdl]]
7383
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
7484

75-
[[Logging]]
85+
[[deps.Logging]]
7686
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
7787

78-
[[Markdown]]
88+
[[deps.Markdown]]
7989
deps = ["Base64"]
8090
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
8191

82-
[[MbedTLS_jll]]
92+
[[deps.MbedTLS_jll]]
8393
deps = ["Artifacts", "Libdl"]
8494
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
95+
version = "2.28.0+0"
8596

86-
[[MozillaCACerts_jll]]
97+
[[deps.MozillaCACerts_jll]]
8798
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
99+
version = "2022.2.1"
88100

89-
[[NetworkOptions]]
101+
[[deps.NetworkOptions]]
90102
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
103+
version = "1.2.0"
91104

92-
[[Pkg]]
105+
[[deps.Pkg]]
93106
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
94107
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
108+
version = "1.8.0"
95109

96-
[[Preferences]]
110+
[[deps.Preferences]]
97111
deps = ["TOML"]
98112
git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
99113
uuid = "21216c6a-2e73-6563-6e65-726566657250"
100114
version = "1.4.0"
101115

102-
[[Printf]]
116+
[[deps.Printf]]
103117
deps = ["Unicode"]
104118
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
105119

106-
[[REPL]]
120+
[[deps.REPL]]
107121
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
108122
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
109123

110-
[[Random]]
111-
deps = ["Serialization"]
124+
[[deps.Random]]
125+
deps = ["SHA", "Serialization"]
112126
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
113127

114-
[[SHA]]
128+
[[deps.SHA]]
115129
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
130+
version = "0.7.0"
116131

117-
[[Scratch]]
132+
[[deps.Scratch]]
118133
deps = ["Dates"]
119134
git-tree-sha1 = "30449ee12237627992a99d5e30ae63e4d78cd24a"
120135
uuid = "6c6a2e73-6563-6170-7368-637461726353"
121136
version = "1.2.0"
122137

123-
[[Serialization]]
138+
[[deps.Serialization]]
124139
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
125140

126-
[[Sockets]]
141+
[[deps.Sockets]]
127142
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
128143

129-
[[TOML]]
144+
[[deps.TOML]]
130145
deps = ["Dates"]
131146
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
147+
version = "1.0.0"
132148

133-
[[Tar]]
149+
[[deps.Tar]]
134150
deps = ["ArgTools", "SHA"]
135151
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
152+
version = "1.10.1"
136153

137-
[[TimerOutputs]]
154+
[[deps.TimerOutputs]]
138155
deps = ["ExprTools", "Printf"]
139156
git-tree-sha1 = "f548a9e9c490030e545f72074a41edfd0e5bcdd7"
140157
uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
141158
version = "0.5.23"
142159

143-
[[UUIDs]]
160+
[[deps.UUIDs]]
144161
deps = ["Random", "SHA"]
145162
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
146163

147-
[[Unicode]]
164+
[[deps.Unicode]]
148165
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
149166

150-
[[Zlib_jll]]
167+
[[deps.Zlib_jll]]
151168
deps = ["Libdl"]
152169
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
170+
version = "1.2.12+3"
153171

154-
[[nghttp2_jll]]
172+
[[deps.nghttp2_jll]]
155173
deps = ["Artifacts", "Libdl"]
156174
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
175+
version = "1.48.0+0"
157176

158-
[[p7zip_jll]]
177+
[[deps.p7zip_jll]]
159178
deps = ["Artifacts", "Libdl"]
160179
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
180+
version = "17.4.0+0"

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "GPUCompiler"
22
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
33
authors = ["Tim Besard <tim.besard@gmail.com>"]
4-
version = "0.22.0"
4+
version = "0.23.0"
55

66
[deps]
77
ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
@@ -18,4 +18,4 @@ ExprTools = "0.1"
1818
LLVM = "6"
1919
Scratch = "1"
2020
TimerOutputs = "0.5"
21-
julia = "1.6"
21+
julia = "1.8"

src/interface.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,6 @@ end
229229
function optimization_params(@nospecialize(job::CompilerJob))
230230
kwargs = NamedTuple()
231231

232-
if VERSION < v"1.8.0-DEV.486"
233-
kwargs = (kwargs..., unoptimize_throw_blocks=false)
234-
end
235-
236232
if job.config.always_inline
237233
kwargs = (kwargs..., inline_cost_threshold=typemax(Int))
238234
end

src/irgen.jl

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -398,35 +398,23 @@ function classify_arguments(@nospecialize(job::CompilerJob), codegen_ft::LLVM.Fu
398398
return args
399399
end
400400

401-
if VERSION >= v"1.7.0-DEV.204"
402-
function is_immutable_datatype(T::Type)
403-
isa(T,DataType) && !Base.ismutabletype(T)
404-
end
405-
else
406-
function is_immutable_datatype(T::Type)
407-
isa(T,DataType) && !T.mutable
408-
end
401+
function is_immutable_datatype(T::Type)
402+
isa(T,DataType) && !Base.ismutabletype(T)
409403
end
410404

411-
if VERSION >= v"1.7.0-DEV.204"
412-
function is_inlinealloc(T::Type)
413-
mayinlinealloc = (T.name.flags >> 2) & 1 == true
414-
# FIXME: To simple
415-
if mayinlinealloc
416-
if !Base.datatype_pointerfree(T)
417-
t_name(dt::DataType)=dt.name
418-
if t_name(T).n_uninitialized != 0
419-
return false
420-
end
405+
function is_inlinealloc(T::Type)
406+
mayinlinealloc = (T.name.flags >> 2) & 1 == true
407+
# FIXME: To simple
408+
if mayinlinealloc
409+
if !Base.datatype_pointerfree(T)
410+
t_name(dt::DataType)=dt.name
411+
if t_name(T).n_uninitialized != 0
412+
return false
421413
end
422-
return true
423414
end
424-
return false
425-
end
426-
else
427-
function is_inlinealloc(T::Type)
428-
return T.isinlinealloc
415+
return true
429416
end
417+
return false
430418
end
431419

432420
function is_concrete_immutable(T::Type)

0 commit comments

Comments
 (0)