Skip to content

Commit a07675d

Browse files
Don't export MTL (#392)
Co-authored-by: Tim Besard <[email protected]>
1 parent 740f4ae commit a07675d

40 files changed

+416
-179
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ steps:
5454
matrix:
5555
setup:
5656
storage:
57-
- "Shared"
58-
- "Managed"
57+
- "shared"
58+
- "managed"
5959
commands: |
6060
echo -e "[Metal]\ndefault_storage = \"{{matrix.storage}}\"" >LocalPreferences.toml
6161
- label: "API validation"

LocalPreferences.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[Metal]
22
# which storage mode unspecified allocations should default to.
3-
# possible values: "Private", "Shared", "Managed"
4-
#default_storage = "Private"
3+
# possible values: "private", "shared", "managed"
4+
#default_storage = "private"

Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250"
2121
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
2222
Python_jll = "93d3a430-8e7c-50da-8e8d-3dfcfb3baf05"
2323
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
24-
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
2524
SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
2625
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2726
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
@@ -50,7 +49,6 @@ ObjectFile = "0.4"
5049
ObjectiveC = "2.1, 3"
5150
PrecompileTools = "1"
5251
Preferences = "1"
53-
Reexport = "1.0"
5452
SHA = "0.7"
5553
SpecialFunctions = "2"
5654
StaticArrays = "1"

bin/metallib-as

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ function main(args)
1414
force = false
1515
output = nothing
1616
downgrade = false
17-
air_version = air_support()
18-
metal_version = metal_support()
17+
air_version = Metal.air_support()
18+
metal_version = Metal.metal_support()
1919
usage = "metallib-as [-h] [-f] [-d] [-l] [-o output.metallib] inputs.(bc|ll)..."
2020
while !isempty(args)
2121
arg = popfirst!(args)

bin/metallib-load

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DIR="$(dirname "$(cd "$(dirname "$0")" && pwd)")"
55
exec julia --project="$DIR" "$0" "$@"
66
=#
77

8-
using Metal
8+
using Metal, .MTL
99

1010
function main(args)
1111
# parse arguments

docs/Manifest.toml

Lines changed: 189 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,142 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.8.5"
3+
julia_version = "1.10.4"
44
manifest_format = "2.0"
5-
project_hash = "2f8db419dfdb71e751be08e523f22250f9afa480"
5+
project_hash = "547b38d4fef962d28135073fdff2e2cad080b03d"
66

77
[[deps.ANSIColoredPrinters]]
88
git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c"
99
uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9"
1010
version = "0.0.1"
1111

12+
[[deps.AbstractTrees]]
13+
git-tree-sha1 = "2d9c9a55f9c93e8887ad391fbae72f8ef55e1177"
14+
uuid = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
15+
version = "0.4.5"
16+
17+
[[deps.ArgTools]]
18+
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
19+
version = "1.1.1"
20+
21+
[[deps.Artifacts]]
22+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
23+
1224
[[deps.Base64]]
1325
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1426

27+
[[deps.CodecZlib]]
28+
deps = ["TranscodingStreams", "Zlib_jll"]
29+
git-tree-sha1 = "b8fe8546d52ca154ac556809e10c75e6e7430ac8"
30+
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
31+
version = "0.7.5"
32+
1533
[[deps.Dates]]
1634
deps = ["Printf"]
1735
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
1836

1937
[[deps.DocStringExtensions]]
2038
deps = ["LibGit2"]
21-
git-tree-sha1 = "c36550cb29cbe373e95b3f40486b9a4148f89ffd"
39+
git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
2240
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
23-
version = "0.9.2"
41+
version = "0.9.3"
2442

2543
[[deps.Documenter]]
26-
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
27-
git-tree-sha1 = "6030186b00a38e9d0434518627426570aac2ef95"
44+
deps = ["ANSIColoredPrinters", "AbstractTrees", "Base64", "CodecZlib", "Dates", "DocStringExtensions", "Downloads", "Git", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "MarkdownAST", "Pkg", "PrecompileTools", "REPL", "RegistryInstances", "SHA", "TOML", "Test", "Unicode"]
45+
git-tree-sha1 = "76deb8c15f37a3853f13ea2226b8f2577652de05"
2846
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
29-
version = "0.27.23"
47+
version = "1.5.0"
48+
49+
[[deps.Downloads]]
50+
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
51+
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
52+
version = "1.6.0"
53+
54+
[[deps.Expat_jll]]
55+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
56+
git-tree-sha1 = "1c6317308b9dc757616f0b5cb379db10494443a7"
57+
uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
58+
version = "2.6.2+0"
59+
60+
[[deps.FileWatching]]
61+
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
62+
63+
[[deps.Git]]
64+
deps = ["Git_jll"]
65+
git-tree-sha1 = "04eff47b1354d702c3a85e8ab23d539bb7d5957e"
66+
uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
67+
version = "1.3.1"
68+
69+
[[deps.Git_jll]]
70+
deps = ["Artifacts", "Expat_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"]
71+
git-tree-sha1 = "d18fb8a1f3609361ebda9bf029b60fd0f120c809"
72+
uuid = "f8c6e375-362e-5223-8a59-34ff63f689eb"
73+
version = "2.44.0+2"
3074

3175
[[deps.IOCapture]]
3276
deps = ["Logging", "Random"]
33-
git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
77+
git-tree-sha1 = "b6d6bfdd7ce25b0f9b2f6b3dd56b2673a66c8770"
3478
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
35-
version = "0.2.2"
79+
version = "0.2.5"
3680

3781
[[deps.InteractiveUtils]]
3882
deps = ["Markdown"]
3983
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
4084

85+
[[deps.JLLWrappers]]
86+
deps = ["Artifacts", "Preferences"]
87+
git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca"
88+
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
89+
version = "1.5.0"
90+
4191
[[deps.JSON]]
4292
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
43-
git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
93+
git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
4494
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
45-
version = "0.21.3"
95+
version = "0.21.4"
96+
97+
[[deps.LazilyInitializedFields]]
98+
git-tree-sha1 = "8f7f3cabab0fd1800699663533b6d5cb3fc0e612"
99+
uuid = "0e77f7df-68c5-4e49-93ce-4cd80f5598bf"
100+
version = "1.2.2"
101+
102+
[[deps.LibCURL]]
103+
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
104+
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
105+
version = "0.6.4"
106+
107+
[[deps.LibCURL_jll]]
108+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
109+
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
110+
version = "8.4.0+0"
46111

47112
[[deps.LibGit2]]
48-
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
113+
deps = ["Base64", "LibGit2_jll", "NetworkOptions", "Printf", "SHA"]
49114
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
50115

116+
[[deps.LibGit2_jll]]
117+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"]
118+
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
119+
version = "1.6.4+0"
120+
121+
[[deps.LibSSH2_jll]]
122+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
123+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
124+
version = "1.11.0+1"
125+
126+
[[deps.Libdl]]
127+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
128+
129+
[[deps.Libiconv_jll]]
130+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
131+
git-tree-sha1 = "f9557a255370125b405568f9767d6d195822a175"
132+
uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
133+
version = "1.17.0+0"
134+
51135
[[deps.Literate]]
52136
deps = ["Base64", "IOCapture", "JSON", "REPL"]
53-
git-tree-sha1 = "1c4418beaa6664041e0f9b48f0710f57bff2fcbe"
137+
git-tree-sha1 = "eef2e1fc1dc38af90a18eb16e519e06d1fd10c2a"
54138
uuid = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
55-
version = "2.14.0"
139+
version = "2.19.0"
56140

57141
[[deps.Logging]]
58142
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -61,18 +145,61 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
61145
deps = ["Base64"]
62146
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
63147

148+
[[deps.MarkdownAST]]
149+
deps = ["AbstractTrees", "Markdown"]
150+
git-tree-sha1 = "465a70f0fc7d443a00dcdc3267a497397b8a3899"
151+
uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391"
152+
version = "0.1.2"
153+
154+
[[deps.MbedTLS_jll]]
155+
deps = ["Artifacts", "Libdl"]
156+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
157+
version = "2.28.2+1"
158+
64159
[[deps.Mmap]]
65160
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
66161

162+
[[deps.MozillaCACerts_jll]]
163+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
164+
version = "2023.1.10"
165+
67166
[[deps.NetworkOptions]]
68167
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
69168
version = "1.2.0"
70169

170+
[[deps.OpenSSL_jll]]
171+
deps = ["Artifacts", "JLLWrappers", "Libdl"]
172+
git-tree-sha1 = "a028ee3cb5641cccc4c24e90c36b0a4f7707bdf5"
173+
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
174+
version = "3.0.14+0"
175+
176+
[[deps.PCRE2_jll]]
177+
deps = ["Artifacts", "Libdl"]
178+
uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15"
179+
version = "10.42.0+1"
180+
71181
[[deps.Parsers]]
72-
deps = ["Dates", "SnoopPrecompile"]
73-
git-tree-sha1 = "b64719e8b4504983c7fca6cc9db3ebc8acc2a4d6"
182+
deps = ["Dates", "PrecompileTools", "UUIDs"]
183+
git-tree-sha1 = "8489905bcdbcfac64d1daa51ca07c0d8f0283821"
74184
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
75-
version = "2.5.1"
185+
version = "2.8.1"
186+
187+
[[deps.Pkg]]
188+
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
189+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
190+
version = "1.10.0"
191+
192+
[[deps.PrecompileTools]]
193+
deps = ["Preferences"]
194+
git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f"
195+
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
196+
version = "1.2.1"
197+
198+
[[deps.Preferences]]
199+
deps = ["TOML"]
200+
git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
201+
uuid = "21216c6a-2e73-6563-6e65-726566657250"
202+
version = "1.4.3"
76203

77204
[[deps.Printf]]
78205
deps = ["Unicode"]
@@ -83,27 +210,66 @@ deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
83210
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
84211

85212
[[deps.Random]]
86-
deps = ["SHA", "Serialization"]
213+
deps = ["SHA"]
87214
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
88215

216+
[[deps.RegistryInstances]]
217+
deps = ["LazilyInitializedFields", "Pkg", "TOML", "Tar"]
218+
git-tree-sha1 = "ffd19052caf598b8653b99404058fce14828be51"
219+
uuid = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
220+
version = "0.1.0"
221+
89222
[[deps.SHA]]
90223
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
91224
version = "0.7.0"
92225

93226
[[deps.Serialization]]
94227
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
95228

96-
[[deps.SnoopPrecompile]]
97-
git-tree-sha1 = "f604441450a3c0569830946e5b33b78c928e1a85"
98-
uuid = "66db9d55-30c0-4569-8b51-7e840670fc0c"
99-
version = "1.0.1"
100-
101229
[[deps.Sockets]]
102230
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
103231

232+
[[deps.TOML]]
233+
deps = ["Dates"]
234+
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
235+
version = "1.0.3"
236+
237+
[[deps.Tar]]
238+
deps = ["ArgTools", "SHA"]
239+
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
240+
version = "1.10.0"
241+
104242
[[deps.Test]]
105243
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
106244
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
107245

246+
[[deps.TranscodingStreams]]
247+
git-tree-sha1 = "60df3f8126263c0d6b357b9a1017bb94f53e3582"
248+
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
249+
version = "0.11.0"
250+
weakdeps = ["Random", "Test"]
251+
252+
[deps.TranscodingStreams.extensions]
253+
TestExt = ["Test", "Random"]
254+
255+
[[deps.UUIDs]]
256+
deps = ["Random", "SHA"]
257+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
258+
108259
[[deps.Unicode]]
109260
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
261+
262+
[[deps.Zlib_jll]]
263+
deps = ["Libdl"]
264+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
265+
version = "1.2.13+1"
266+
267+
[[deps.nghttp2_jll]]
268+
deps = ["Artifacts", "Libdl"]
269+
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
270+
version = "1.52.0+1"
271+
272+
[[deps.p7zip_jll]]
273+
deps = ["Artifacts", "Libdl"]
274+
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
275+
version = "17.4.0+2"

docs/Project.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
5+
6+
[compat]
7+
Documenter = "1"
8+
Literate = "2"

docs/make.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function main()
2121
analytics = "", # TODO
2222
),
2323
doctest = true,
24-
#strict = true,
24+
warnonly = true,
2525
modules = [Metal],
2626
pages = Any[
2727
"Home" => "index.md",

docs/src/api/array.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ MtlVecOrMat
1515

1616
## Storage modes
1717

18-
The Metal API has various storage modes that dictate how a resource can be accessed. `MtlArray`s are `Private` by default, but they can also be `Shared` or `Managed`. For more information on storage modes, see the official [Metal documentation](https://developer.apple.com/documentation/metal/resource_fundamentals/setting_resource_storage_modes).
18+
The Metal API has various storage modes that dictate how a resource can be accessed. `MtlArray`s are `Metal.PrivateStorage` by default, but they can also be `Metal.SharedStorage` or `Metal.ManagedStorage`. For more information on storage modes, see the official [Metal documentation](https://developer.apple.com/documentation/metal/resource_fundamentals/setting_resource_storage_modes).
1919

2020
```@docs
21-
Private
22-
Shared
23-
Managed
24-
CPUStorage
21+
Metal.PrivateStorage
22+
Metal.SharedStorage
23+
Metal.ManagedStorage
2524
```
2625

2726
There also exist the following convenience functions to check if an MtlArray is using a specific storage mode:

0 commit comments

Comments
 (0)