Skip to content

Commit 7a66da1

Browse files
authored
Merge pull request #3 from arhik/main
LInux compatibility and windows placeholder for further implementation
2 parents 79e113a + 2c664e0 commit 7a66da1

25 files changed

+4207
-3976
lines changed

Manifest.toml

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.8.1"
3+
julia_version = "1.8.2"
44
manifest_format = "2.0"
5-
project_hash = "050710a4e78e3077b0f8faa93c5fe743295c45eb"
5+
project_hash = "856506fc0308c5f9da31b9ecff8a3bf884d0a1e3"
6+
7+
[[deps.Aqua]]
8+
deps = ["Compat", "Pkg", "Test"]
9+
git-tree-sha1 = "81ba3aaf28af90fcd3e6ead8450747e418e45a7b"
10+
uuid = "4c88cf16-eb10-579e-8560-4a9242c79595"
11+
version = "0.5.5"
612

713
[[deps.ArgTools]]
814
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -19,6 +25,17 @@ git-tree-sha1 = "eb4cb44a499229b3b8426dcfb5dd85333951ff90"
1925
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
2026
version = "0.4.2"
2127

28+
[[deps.Compat]]
29+
deps = ["Dates", "LinearAlgebra", "UUIDs"]
30+
git-tree-sha1 = "3ca828fe1b75fa84b021a7860bd039eaea84d2f2"
31+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
32+
version = "4.3.0"
33+
34+
[[deps.CompilerSupportLibraries_jll]]
35+
deps = ["Artifacts", "Libdl"]
36+
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
37+
version = "0.5.2+0"
38+
2239
[[deps.Dates]]
2340
deps = ["Printf"]
2441
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -33,7 +50,7 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
3350

3451
[[deps.GLFW]]
3552
deps = ["GLFW_jll"]
36-
path = "/Users/arhik/May2022/GLFW.jl/"
53+
git-tree-sha1 = "35dbc482f0967d8dceaa7ce007d16f9064072166"
3754
uuid = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
3855
version = "3.4.1"
3956

@@ -99,6 +116,10 @@ git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778"
99116
uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
100117
version = "1.16.1+1"
101118

119+
[[deps.LinearAlgebra]]
120+
deps = ["Libdl", "libblastrampoline_jll"]
121+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
122+
102123
[[deps.Logging]]
103124
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
104125

@@ -119,6 +140,11 @@ version = "2022.2.1"
119140
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
120141
version = "1.2.0"
121142

143+
[[deps.OpenBLAS_jll]]
144+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
145+
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
146+
version = "0.3.20+0"
147+
122148
[[deps.Pkg]]
123149
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
124150
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -165,7 +191,7 @@ version = "1.0.0"
165191
[[deps.Tar]]
166192
deps = ["ArgTools", "SHA"]
167193
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
168-
version = "1.10.0"
194+
version = "1.10.1"
169195

170196
[[deps.Test]]
171197
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
@@ -179,10 +205,10 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
179205
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
180206

181207
[[deps.WGPUNative]]
182-
deps = ["CEnum", "Libdl", "Pkg", "Reexport"]
183-
git-tree-sha1 = "f95283fd0096787b7192f49c4a36fc07445426f9"
208+
deps = ["Aqua", "CEnum", "Libdl", "Pkg", "Reexport"]
209+
git-tree-sha1 = "fbc7f75a3e105d442193b41eb96b9aaa0db01f84"
184210
uuid = "c14bfd16-04f9-4c2f-a915-b355584b5509"
185-
version = "0.1.1"
211+
version = "0.1.2"
186212

187213
[[deps.XML2_jll]]
188214
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
@@ -279,6 +305,11 @@ deps = ["Libdl"]
279305
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
280306
version = "1.2.12+3"
281307

308+
[[deps.libblastrampoline_jll]]
309+
deps = ["Artifacts", "Libdl", "OpenBLAS_jll"]
310+
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
311+
version = "5.1.1+0"
312+
282313
[[deps.nghttp2_jll]]
283314
deps = ["Artifacts", "Libdl"]
284315
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "0.1.1"
66
[deps]
77
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
88
GLFW = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
9+
GLFW_jll = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
910
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1011
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1112
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -14,7 +15,6 @@ WGPUNative = "c14bfd16-04f9-4c2f-a915-b355584b5509"
1415

1516
[compat]
1617
CEnum = "^0.4"
17-
GLFW = "^3.4"
1818
Reexport = "^1.2"
1919
WGPUNative = "^0.1"
2020
julia = "^1.8.0"

deps/artifacts.jl

Lines changed: 52 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,57 +16,67 @@ archs = ["arm64", "x86_64"]
1616
io = IOBuffer()
1717

1818
function writeIO(io, arch, kernel, sha1, sha256, filename, url)
19-
write(
20-
io,
21-
"""
22-
[[WGPU]]
23-
arch = "$arch"
24-
git-tree-sha1 = "$sha1"
25-
os = "$kernel"
19+
write(
20+
io,
21+
"""
22+
[[WGPU]]
23+
arch = "$arch"
24+
git-tree-sha1 = "$sha1"
25+
os = "$kernel"
2626
27-
[[WGPU.download]]
28-
sha256 = "$sha256"
29-
url = "$url"
30-
31-
"""
32-
)
27+
[[WGPU.download]]
28+
sha256 = "$sha256"
29+
url = "$url"
30+
31+
""",
32+
)
3333
end
3434

3535
remoteurl = "https://github.com/dvijaha/WGPU.jl/releases/download/v.0.1.1"
3636

3737
function generateArtifacts()
38-
for kernel in kernels
39-
for arch in archs
40-
tarfile = "WGPU.$version.$(arch)-$(kernel).tar.gz"
41-
try
42-
run(`make clean`)
43-
run(`make AARCH=$arch`)
44-
run(`tar -czvf $tarfile cocoa.dylib`)
45-
catch(e)
46-
println("$e")
47-
end
48-
end
49-
end
38+
for kernel in kernels
39+
for arch in archs
40+
tarfile = "WGPU.$version.$(arch)-$(kernel).tar.gz"
41+
try
42+
run(`make clean`)
43+
run(`make AARCH=$arch`)
44+
run(`tar -czvf $tarfile cocoa.dylib`)
45+
catch
46+
(e)
47+
println("$e")
48+
end
49+
end
50+
end
5051
end
5152

5253
function writeArtifactsTOML()
53-
for kernel in kernels
54-
for arch in archs
55-
tarfile = "WGPU.$version.$(arch)-$(kernel).tar.gz"
56-
try
57-
Downloads.download(joinpath(remoteurl, tarfile), tarfile)
58-
sha256Val = bytes2hex(open(sha256, tarfile))
59-
sha1Val = Tar.tree_hash(IOBuffer(inflate_gzip(tarfile)))
60-
writeIO(io, arch, kernel, sha1Val, sha256Val, "", joinpath(remoteurl, tarfile))
61-
catch(e)
62-
println("$e")
63-
end
64-
end
65-
end
66-
seek(io, 0)
67-
f = open("Artifacts.toml", "w")
68-
write(f, io)
69-
close(f)
54+
for kernel in kernels
55+
for arch in archs
56+
tarfile = "WGPU.$version.$(arch)-$(kernel).tar.gz"
57+
try
58+
Downloads.download(joinpath(remoteurl, tarfile), tarfile)
59+
sha256Val = bytes2hex(open(sha256, tarfile))
60+
sha1Val = Tar.tree_hash(IOBuffer(inflate_gzip(tarfile)))
61+
writeIO(
62+
io,
63+
arch,
64+
kernel,
65+
sha1Val,
66+
sha256Val,
67+
"",
68+
joinpath(remoteurl, tarfile),
69+
)
70+
catch
71+
(e)
72+
println("$e")
73+
end
74+
end
75+
end
76+
seek(io, 0)
77+
f = open("Artifacts.toml", "w")
78+
write(f, io)
79+
close(f)
7080
end
7181

7282
generateArtifacts()

0 commit comments

Comments
 (0)