Skip to content

Commit 6d29402

Browse files
authored
Merge pull request #148 from JuliaGPU/jps/hip_jll
Use HIP_jll and ROCmDeviceLibs_jll
2 parents 4590e6d + b1ee328 commit 6d29402

File tree

7 files changed

+272
-127
lines changed

7 files changed

+272
-127
lines changed

Manifest.toml

+119-15
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ version = "0.5.10"
2929

3030
[[Bzip2_jll]]
3131
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
32-
git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e"
32+
git-tree-sha1 = "19a35467a82e236ff51bc17a3a44b69ef35185a2"
3333
uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
34-
version = "1.0.6+5"
34+
version = "1.0.8+0"
3535

3636
[[CEnum]]
3737
git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
@@ -74,9 +74,9 @@ uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
7474

7575
[[Elfutils_jll]]
7676
deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "XZ_jll", "Zlib_jll", "argp_standalone_jll", "fts_jll", "obstack_jll"]
77-
git-tree-sha1 = "76cbf1134983cfb371ad77117bb2659600ed64d6"
77+
git-tree-sha1 = "8f9fcde6d89b0a3ca51cb2028beab462705c5436"
7878
uuid = "ab5a07f8-06af-567f-a878-e8bb879eba5a"
79-
version = "0.179.0+0"
79+
version = "0.182.0+0"
8080

8181
[[ExprTools]]
8282
git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92"
@@ -99,6 +99,12 @@ git-tree-sha1 = "e8a09182a4440489e2e3dedff5ad3f6bbe555396"
9999
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
100100
version = "0.12.5"
101101

102+
[[HIP_jll]]
103+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "ROCmCompilerSupport_jll", "ROCmDeviceLibs_jll", "ROCmOpenCLRuntime_jll", "hsa_rocr_jll"]
104+
git-tree-sha1 = "0a7a9fb9cde9cd2225d9b6dc32c744785514e9b8"
105+
uuid = "2696aab5-0948-5276-aa9a-2a86a37016b8"
106+
version = "4.0.0+0"
107+
102108
[[InteractiveUtils]]
103109
deps = ["Markdown"]
104110
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
@@ -140,6 +146,30 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
140146
[[Libdl]]
141147
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
142148

149+
[[Libgcrypt_jll]]
150+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"]
151+
git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae"
152+
uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4"
153+
version = "1.8.7+0"
154+
155+
[[Libglvnd_jll]]
156+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"]
157+
git-tree-sha1 = "7739f837d6447403596a75d19ed01fd08d6f56bf"
158+
uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29"
159+
version = "1.3.0+3"
160+
161+
[[Libgpg_error_jll]]
162+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
163+
git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9"
164+
uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8"
165+
version = "1.42.0+0"
166+
167+
[[Libiconv_jll]]
168+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
169+
git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778"
170+
uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
171+
version = "1.16.1+1"
172+
143173
[[LinearAlgebra]]
144174
deps = ["Libdl"]
145175
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -182,7 +212,7 @@ uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
182212
version = "1.4.1"
183213

184214
[[Pkg]]
185-
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
215+
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs"]
186216
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
187217

188218
[[Preferences]]
@@ -199,6 +229,24 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
199229
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
200230
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
201231

232+
[[ROCmCompilerSupport_jll]]
233+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "ROCmDeviceLibs_jll", "hsa_rocr_jll"]
234+
git-tree-sha1 = "56ddcfb5d8b60c9f8c1bc619886f8d363fd1926d"
235+
uuid = "8fbdd1d2-db62-5cd0-981e-905da1486e17"
236+
version = "4.0.0+1"
237+
238+
[[ROCmDeviceLibs_jll]]
239+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
240+
git-tree-sha1 = "d764f0f28b5af89aa004871a6a38e5d061f77257"
241+
uuid = "873c0968-716b-5aa7-bb8d-d1e2e2aeff2d"
242+
version = "4.0.0+0"
243+
244+
[[ROCmOpenCLRuntime_jll]]
245+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "ROCmCompilerSupport_jll", "ROCmDeviceLibs_jll", "Xorg_libX11_jll", "Xorg_xorgproto_jll", "hsa_rocr_jll"]
246+
git-tree-sha1 = "f9e3e2cb40a7990535efa7da9b9dd0e0b458a973"
247+
uuid = "10ae2a08-2eea-53f8-8c20-eec175020e9f"
248+
version = "4.0.0+1"
249+
202250
[[Random]]
203251
deps = ["Serialization"]
204252
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -261,21 +309,81 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
261309
[[Unicode]]
262310
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
263311

312+
[[XML2_jll]]
313+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
314+
git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a"
315+
uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
316+
version = "2.9.12+0"
317+
318+
[[XSLT_jll]]
319+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"]
320+
git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a"
321+
uuid = "aed1982a-8fda-507f-9586-7b0439959a61"
322+
version = "1.1.34+0"
323+
264324
[[XZ_jll]]
265325
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
266326
git-tree-sha1 = "9f76853ea2ba894054e24640abfb73d73e5a4cb5"
267327
uuid = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
268328
version = "5.2.5+0"
269329

330+
[[Xorg_libX11_jll]]
331+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"]
332+
git-tree-sha1 = "5be649d550f3f4b95308bf0183b82e2582876527"
333+
uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc"
334+
version = "1.6.9+4"
335+
336+
[[Xorg_libXau_jll]]
337+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
338+
git-tree-sha1 = "4e490d5c960c314f33885790ed410ff3a94ce67e"
339+
uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec"
340+
version = "1.0.9+4"
341+
342+
[[Xorg_libXdmcp_jll]]
343+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
344+
git-tree-sha1 = "4fe47bd2247248125c428978740e18a681372dd4"
345+
uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05"
346+
version = "1.1.3+4"
347+
348+
[[Xorg_libXext_jll]]
349+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"]
350+
git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3"
351+
uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3"
352+
version = "1.3.4+4"
353+
354+
[[Xorg_libpthread_stubs_jll]]
355+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
356+
git-tree-sha1 = "6783737e45d3c59a4a4c4091f5f88cdcf0908cbb"
357+
uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74"
358+
version = "0.1.0+3"
359+
360+
[[Xorg_libxcb_jll]]
361+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"]
362+
git-tree-sha1 = "daf17f441228e7a3833846cd048892861cff16d6"
363+
uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b"
364+
version = "1.13.0+3"
365+
366+
[[Xorg_xorgproto_jll]]
367+
deps = ["Libdl", "Pkg"]
368+
git-tree-sha1 = "9a9eb8ce756fe0bca01b4be16da770e18d264972"
369+
uuid = "c4d99508-4286-5418-9131-c86396af500b"
370+
version = "2019.2.0+2"
371+
372+
[[Xorg_xtrans_jll]]
373+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
374+
git-tree-sha1 = "79c31e7844f6ecf779705fbc12146eb190b7d845"
375+
uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10"
376+
version = "1.4.0+3"
377+
270378
[[Zlib_jll]]
271379
deps = ["Libdl"]
272380
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
273381

274382
[[argp_standalone_jll]]
275383
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
276-
git-tree-sha1 = "c4fa3457046fc93249b63e8319e743b6c8590609"
384+
git-tree-sha1 = "feaf9f6293003c2bf53056fd6930d677ed340b34"
277385
uuid = "c53206cc-00f7-50bf-ad1e-3ae1f6e49bc3"
278-
version = "1.3.0+0"
386+
version = "1.3.1+0"
279387

280388
[[fts_jll]]
281389
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -285,15 +393,15 @@ version = "1.2.7+1"
285393

286394
[[hsa_rocr_jll]]
287395
deps = ["Artifacts", "Elfutils_jll", "JLLWrappers", "Libdl", "NUMA_jll", "Pkg", "Zlib_jll", "hsakmt_roct_jll"]
288-
git-tree-sha1 = "42189f176d6ae4f37c0c0e652fec339bb0bfab5d"
396+
git-tree-sha1 = "df8d73efec8b1e53ad527d208f5343c0368f0fcd"
289397
uuid = "dd59ff1a-a01a-568d-8b29-0669330f116a"
290-
version = "3.7.0+1"
398+
version = "4.0.0+0"
291399

292400
[[hsakmt_roct_jll]]
293401
deps = ["Artifacts", "JLLWrappers", "Libdl", "NUMA_jll", "Pkg"]
294-
git-tree-sha1 = "8a9ee6c091e952e4ea6585d15131d43f789ae041"
402+
git-tree-sha1 = "80e0c9940e15cfd6f1f1e9d9f3953ec4d48d3d4a"
295403
uuid = "1cecccd7-a9b6-5045-9cdc-a44c19b16d76"
296-
version = "3.8.0+0"
404+
version = "4.0.0+0"
297405

298406
[[nghttp2_jll]]
299407
deps = ["Artifacts", "Libdl"]
@@ -304,7 +412,3 @@ deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
304412
git-tree-sha1 = "1c4a6b66e934fc6db4649cb2910c72f53bbfea7e"
305413
uuid = "c88a4935-d25e-5644-aacc-5db6f1b8ef79"
306414
version = "1.2.2+0"
307-
308-
[[p7zip_jll]]
309-
deps = ["Artifacts", "Libdl"]
310-
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"

Project.toml

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "AMDGPU"
22
uuid = "21141c5a-9bdb-4563-92ae-f87d6854732e"
33
authors = ["Julian P Samaroo <jpsamaroo@jpsamaroo.me>"]
4-
version = "0.2.9"
4+
version = "0.2.10"
55

66
[deps]
77
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -10,16 +10,18 @@ BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
1010
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
1111
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
1212
GPUCompiler = "61eb1bfa-7361-4325-ad38-22787b887f55"
13+
HIP_jll = "2696aab5-0948-5276-aa9a-2a86a37016b8"
1314
LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
1415
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1516
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1617
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
18+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1719
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
20+
ROCmDeviceLibs_jll = "873c0968-716b-5aa7-bb8d-d1e2e2aeff2d"
1821
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
1922
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
2023
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
2124
hsa_rocr_jll = "dd59ff1a-a01a-568d-8b29-0669330f116a"
22-
hsakmt_roct_jll = "1cecccd7-a9b6-5045-9cdc-a44c19b16d76"
2325

2426
[compat]
2527
AbstractFFTs = "0.5, 1.0"
@@ -28,10 +30,11 @@ BinaryProvider = "0.5"
2830
CEnum = "0.2, 0.3, 0.4"
2931
GPUArrays = "6"
3032
GPUCompiler = "0.12"
33+
HIP_jll = "4"
3134
LLVM = "4"
3235
MacroTools = "0.5"
36+
ROCmDeviceLibs_jll = "4"
3337
Requires = "1"
3438
Setfield = "0.5, 0.6, 0.7"
35-
hsa_rocr_jll = "3.7"
36-
hsakmt_roct_jll = "3.7"
39+
hsa_rocr_jll = "4"
3740
julia = "1.6"

0 commit comments

Comments
 (0)