Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

device capabilities

eugene29842b7e45e1
diff --git a/Cargo.lock b/Cargo.lock
index e53cf9531..37289b08c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,9 +33,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.21"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -48,15 +48,15 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
[[package]]
name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
dependencies = [
"utf8parse",
]
@@ -83,9 +83,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.101"
+version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
[[package]]
name = "aquamarine"
@@ -131,7 +131,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -142,7 +142,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -211,7 +211,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -223,7 +223,7 @@ dependencies = [
"autocxx-engine",
"env_logger",
"indexmap 1.9.3",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -250,7 +250,7 @@ dependencies = [
"regex_static",
"rustversion",
"serde_json",
- "syn 2.0.114",
+ "syn 2.0.117",
"tempfile",
"thiserror 1.0.69",
"version_check",
@@ -266,7 +266,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -283,7 +283,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.114",
+ "syn 2.0.117",
"thiserror 1.0.69",
]
@@ -343,7 +343,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -363,9 +363,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
[[package]]
name = "bitflags"
-version = "2.10.0"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
[[package]]
name = "blake3"
@@ -407,9 +407,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.19.1"
+version = "3.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
[[package]]
name = "bytemuck"
@@ -428,7 +428,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -443,6 +443,12 @@ version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+[[package]]
+name = "bytesize"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3"
+
[[package]]
name = "castaway"
version = "0.2.4"
@@ -466,16 +472,16 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.114",
+ "syn 2.0.117",
"tempfile",
- "toml 0.9.11+spec-1.1.0",
+ "toml 0.9.12+spec-1.1.0",
]
[[package]]
name = "cc"
-version = "1.2.55"
+version = "1.2.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
+checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
dependencies = [
"find-msvc-tools",
"shlex",
@@ -536,9 +542,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.57"
+version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
+checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
dependencies = [
"clap_builder",
"clap_derive",
@@ -546,9 +552,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.57"
+version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
dependencies = [
"anstream",
"anstyle",
@@ -558,21 +564,21 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.55"
+version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
+checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
name = "clap_lex"
-version = "0.7.7"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
[[package]]
name = "cli"
@@ -581,10 +587,10 @@ dependencies = [
"benchmarks",
"clap",
"comfy-table",
- "console 0.16.2",
+ "console 0.16.3",
"ctrlc",
"futures",
- "indicatif 0.18.3",
+ "indicatif 0.18.4",
"inquire",
"rocket",
"serde",
@@ -616,9 +622,9 @@ dependencies = [
[[package]]
name = "colorchoice"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
[[package]]
name = "comfy-table"
@@ -661,13 +667,12 @@ dependencies = [
[[package]]
name = "console"
-version = "0.16.2"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
+checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
dependencies = [
"encode_unicode",
"libc",
- "once_cell",
"unicode-width 0.2.2",
"windows-sys 0.61.2",
]
@@ -724,19 +729,6 @@ version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-[[package]]
-name = "core-graphics"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
-dependencies = [
- "bitflags",
- "core-foundation 0.10.1",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "libc",
-]
-
[[package]]
name = "core-graphics-types"
version = "0.2.0"
@@ -845,9 +837,9 @@ dependencies = [
[[package]]
name = "ctrlc"
-version = "3.5.1"
+version = "3.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
+checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
dependencies = [
"dispatch2",
"nix",
@@ -881,7 +873,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -894,7 +886,7 @@ dependencies = [
"indexmap 2.13.0",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -908,7 +900,7 @@ dependencies = [
"indexmap 2.13.0",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -926,7 +918,7 @@ dependencies = [
"indexmap 2.13.0",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -950,7 +942,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -961,7 +953,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -984,9 +976,9 @@ dependencies = [
[[package]]
name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
dependencies = [
"powerfmt",
]
@@ -1009,7 +1001,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1019,7 +1011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [
"derive_builder_core",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1041,7 +1033,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1074,7 +1066,7 @@ dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1110,9 +1102,9 @@ dependencies = [
[[package]]
name = "dispatch2"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
"bitflags",
"block2",
@@ -1128,7 +1120,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1146,7 +1138,7 @@ version = "0.1.8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1295,7 +1287,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -1321,9 +1313,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
dependencies = [
"futures-channel",
"futures-core",
@@ -1336,9 +1328,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
dependencies = [
"futures-core",
"futures-sink",
@@ -1346,15 +1338,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
[[package]]
name = "futures-executor"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
dependencies = [
"futures-core",
"futures-task",
@@ -1363,38 +1355,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
[[package]]
name = "futures-macro"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
[[package]]
name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
[[package]]
name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
dependencies = [
"futures-channel",
"futures-core",
@@ -1404,7 +1396,6 @@ dependencies = [
"futures-task",
"memchr",
"pin-project-lite",
- "pin-utils",
"slab",
]
@@ -1459,19 +1450,19 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"libc",
- "r-efi",
+ "r-efi 5.3.0",
"wasip2",
]
[[package]]
name = "getrandom"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
dependencies = [
"cfg-if",
"libc",
- "r-efi",
+ "r-efi 6.0.0",
"rand_core 0.10.0",
"wasip2",
"wasip3",
@@ -1768,7 +1759,7 @@ dependencies = [
"libc",
"percent-encoding",
"pin-project-lite",
- "socket2 0.6.2",
+ "socket2 0.6.3",
"system-configuration",
"tokio",
"tower-service",
@@ -1928,11 +1919,11 @@ dependencies = [
[[package]]
name = "indicatif"
-version = "0.18.3"
+version = "0.18.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88"
+checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb"
dependencies = [
- "console 0.16.2",
+ "console 0.16.3",
"portable-atomic",
"unicode-width 0.2.2",
"unit-prefix",
@@ -1953,9 +1944,9 @@ checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
[[package]]
name = "inquire"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "979f5ab9760427ada4fa5762b2d905e5b12704fb1fada07b6bfa66aeaa586f87"
+checksum = "6654738b8024300cf062d04a1c13c10c8e2cea598ec1c47dc9b6641159429756"
dependencies = [
"bitflags",
"crossterm",
@@ -1967,9 +1958,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
[[package]]
name = "iri-string"
@@ -2051,9 +2042,9 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
[[package]]
name = "js-sys"
-version = "0.3.85"
+version = "0.3.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
+checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
dependencies = [
"once_cell",
"wasm-bindgen",
@@ -2073,9 +2064,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
[[package]]
name = "libc"
-version = "0.2.181"
+version = "0.2.183"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
[[package]]
name = "libloading"
@@ -2095,11 +2086,10 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
[[package]]
name = "libredox"
-version = "0.1.12"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
+checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
dependencies = [
- "bitflags",
"libc",
]
@@ -2114,9 +2104,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
[[package]]
name = "litemap"
@@ -2165,9 +2155,9 @@ dependencies = [
"lazy_static",
"proc-macro2",
"quote",
- "regex-syntax 0.8.9",
+ "regex-syntax 0.8.10",
"rustc_version",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -2294,7 +2284,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -2305,18 +2295,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minijinja"
-version = "2.15.1"
+version = "2.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b479616bb6f0779fb0f3964246beda02d4b01144e1b0d5519616e012ccc2a245"
+checksum = "5ea5ea1e90055f200af6b8e52a4a34e05e77e7fee953a9fb40c631efdc43cab1"
dependencies = [
"serde",
]
[[package]]
name = "minijinja-contrib"
-version = "2.15.1"
+version = "2.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7826089e6af7bc638f69a44b100ebe7f6c64b182cfde16558d5cd38ac8adde20"
+checksum = "b2fce60cb2e26ba7ddd485c8f5d3d635535e465c195bfb4af85971b428a985d0"
dependencies = [
"minijinja",
"serde",
@@ -2369,7 +2359,7 @@ checksum = "e4db6d5580af57bf992f59068d4ea26fd518574ff48d7639b255a36f9de6e7e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -2396,22 +2386,17 @@ dependencies = [
[[package]]
name = "mtl-rs"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58a3be973d8600d37fdd35e4ba6319890b36a8ac0e189a61456ce191af6f6e8a"
+checksum = "6a7969f8b744900e5bde1fcbd0ebb1d60d98fef60f08c6f1b8cd39ea96ab3256"
dependencies = [
"bitflags",
"block2",
- "bytemuck",
- "core-graphics",
- "core-graphics-types",
"dispatch2",
- "libc",
"objc2",
"objc2-core-foundation",
"objc2-foundation",
"objc2-io-surface",
- "once_cell",
]
[[package]]
@@ -2435,9 +2420,9 @@ dependencies = [
[[package]]
name = "native-tls"
-version = "0.2.14"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
dependencies = [
"libc",
"log",
@@ -2467,9 +2452,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.30.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
dependencies = [
"bitflags",
"cfg-if",
@@ -2566,18 +2551,18 @@ dependencies = [
[[package]]
name = "objc2"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
dependencies = [
"objc2-encode",
]
[[package]]
name = "objc2-core-foundation"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
"bitflags",
"block2",
@@ -2594,9 +2579,9 @@ checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
[[package]]
name = "objc2-foundation"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
"bitflags",
"block2",
@@ -2607,9 +2592,9 @@ dependencies = [
[[package]]
name = "objc2-io-kit"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
dependencies = [
"libc",
"objc2-core-foundation",
@@ -2617,9 +2602,9 @@ dependencies = [
[[package]]
name = "objc2-io-surface"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [
"bitflags",
"libc",
@@ -2630,9 +2615,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
[[package]]
name = "once_cell_polyfill"
@@ -2664,9 +2649,9 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.75"
+version = "0.10.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
dependencies = [
"bitflags",
"cfg-if",
@@ -2685,20 +2670,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
name = "openssl-probe"
-version = "0.1.6"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
[[package]]
name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.112"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
dependencies = [
"cc",
"libc",
@@ -2761,7 +2746,7 @@ dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -2800,7 +2785,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -2815,9 +2800,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
[[package]]
name = "pin-utils"
@@ -2877,7 +2862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
"proc-macro2",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -2921,7 +2906,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
"version_check",
"yansi",
]
@@ -2939,7 +2924,7 @@ dependencies = [
"rand 0.9.2",
"rand_chacha 0.9.0",
"rand_xorshift",
- "regex-syntax 0.8.9",
+ "regex-syntax 0.8.10",
"rusty-fork",
"tempfile",
"unarray",
@@ -2953,9 +2938,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
-version = "1.0.44"
+version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
dependencies = [
"proc-macro2",
]
@@ -2966,6 +2951,12 @@ version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
[[package]]
name = "rand"
version = "0.8.5"
@@ -2994,7 +2985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
dependencies = [
"chacha20",
- "getrandom 0.4.1",
+ "getrandom 0.4.2",
"rand_core 0.10.0",
]
@@ -3135,7 +3126,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3147,7 +3138,7 @@ dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
- "regex-syntax 0.8.9",
+ "regex-syntax 0.8.10",
]
[[package]]
@@ -3158,7 +3149,7 @@ checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.9",
+ "regex-syntax 0.8.10",
]
[[package]]
@@ -3169,9 +3160,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.9"
+version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
[[package]]
name = "regex_static"
@@ -3314,7 +3305,7 @@ dependencies = [
"proc-macro2",
"quote",
"rocket_http",
- "syn 2.0.114",
+ "syn 2.0.117",
"unicode-xid",
"version_check",
]
@@ -3363,9 +3354,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "1.1.3"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
dependencies = [
"bitflags",
"errno",
@@ -3376,9 +3367,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.36"
+version = "0.23.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
+checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4"
dependencies = [
"log",
"once_cell",
@@ -3444,9 +3435,9 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
dependencies = [
"windows-sys 0.61.2",
]
@@ -3473,7 +3464,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3496,12 +3487,12 @@ checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
[[package]]
name = "security-framework"
-version = "2.11.1"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
dependencies = [
"bitflags",
- "core-foundation 0.9.4",
+ "core-foundation 0.10.1",
"core-foundation-sys",
"libc",
"security-framework-sys",
@@ -3509,9 +3500,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.15.0"
+version = "2.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
dependencies = [
"core-foundation-sys",
"libc",
@@ -3550,7 +3541,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3561,7 +3552,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3705,12 +3696,12 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
dependencies = [
"libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -3797,9 +3788,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.114"
+version = "2.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
dependencies = [
"proc-macro2",
"quote",
@@ -3823,14 +3814,14 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
name = "sysinfo"
-version = "0.38.1"
+version = "0.38.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5792d209c2eac902426c0c4a166c9f72147db453af548cf9bf3242644c4d4fe3"
+checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f"
dependencies = [
"libc",
"memchr",
@@ -3863,12 +3854,12 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.25.0"
+version = "3.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
- "getrandom 0.4.1",
+ "getrandom 0.4.2",
"once_cell",
"rustix",
"windows-sys 0.61.2",
@@ -3891,7 +3882,7 @@ checksum = "e5a2455608f6a56fc2ce66c89dd005501c169688f29165468e65f0b47e060333"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3920,7 +3911,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3931,7 +3922,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -3997,7 +3988,7 @@ dependencies = [
"derive_builder",
"esaxx-rs",
"getrandom 0.3.4",
- "indicatif 0.18.3",
+ "indicatif 0.18.4",
"itertools 0.14.0",
"log",
"macro_rules_attribute",
@@ -4008,7 +3999,7 @@ dependencies = [
"rayon",
"rayon-cond",
"regex",
- "regex-syntax 0.8.9",
+ "regex-syntax 0.8.10",
"serde",
"serde_json",
"spm_precompiled",
@@ -4020,9 +4011,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.49.0"
+version = "1.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
dependencies = [
"bytes",
"libc",
@@ -4030,20 +4021,20 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.6.2",
+ "socket2 0.6.3",
"tokio-macros",
"windows-sys 0.61.2",
]
[[package]]
name = "tokio-macros"
-version = "2.6.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -4104,9 +4095,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.9.11+spec-1.1.0"
+version = "0.9.12+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
dependencies = [
"indexmap 2.13.0",
"serde_core",
@@ -4151,9 +4142,9 @@ dependencies = [
[[package]]
name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.9+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
dependencies = [
"winnow",
]
@@ -4234,7 +4225,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -4260,9 +4251,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
dependencies = [
"matchers",
"nu-ansi-term",
@@ -4321,9 +4312,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.23"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
[[package]]
name = "unicode-normalization-alignments"
@@ -4422,11 +4413,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
-version = "1.20.0"
+version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
+checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.2",
"js-sys",
"wasm-bindgen",
]
@@ -4442,6 +4433,7 @@ dependencies = [
"blake3",
"block2",
"bytemuck",
+ "bytesize",
"cbindgen",
"clang-ast",
"clap",
@@ -4450,7 +4442,7 @@ dependencies = [
"dsl",
"futures",
"half",
- "indicatif 0.18.3",
+ "indicatif 0.18.4",
"is_close",
"itertools 0.14.0",
"libc",
@@ -4474,7 +4466,7 @@ dependencies = [
"serde",
"serde_json",
"serde_json5",
- "syn 2.0.114",
+ "syn 2.0.117",
"sysinfo",
"tempfile",
"test-tag",
@@ -4559,9 +4551,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen"
-version = "0.2.108"
+version = "0.2.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
dependencies = [
"cfg-if",
"once_cell",
@@ -4572,9 +4564,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.58"
+version = "0.4.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
+checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
dependencies = [
"cfg-if",
"futures-util",
@@ -4586,9 +4578,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.108"
+version = "0.2.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
+checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4596,22 +4588,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.108"
+version = "0.2.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
+checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
dependencies = [
"bumpalo",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.108"
+version = "0.2.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
dependencies = [
"unicode-ident",
]
@@ -4665,9 +4657,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.85"
+version = "0.3.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
+checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4794,7 +4786,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -4805,7 +4797,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -5086,9 +5078,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winnow"
-version = "0.7.14"
+version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
dependencies = [
"memchr",
]
@@ -5123,7 +5115,7 @@ dependencies = [
"heck",
"indexmap 2.13.0",
"prettyplease",
- "syn 2.0.114",
+ "syn 2.0.117",
"wasm-metadata",
"wit-bindgen-core",
"wit-component",
@@ -5139,7 +5131,7 @@ dependencies = [
"prettyplease",
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
"wit-bindgen-core",
"wit-bindgen-rust",
]
@@ -5237,28 +5229,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
"synstructure",
]
[[package]]
name = "zerocopy"
-version = "0.8.39"
+version = "0.8.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
+checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.39"
+version = "0.8.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
+checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
@@ -5278,7 +5270,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
"synstructure",
]
@@ -5318,11 +5310,11 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.114",
+ "syn 2.0.117",
]
[[package]]
name = "zmij"
-version = "1.0.20"
+version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de98dfa5d5b7fef4ee834d0073d560c9ca7b6c46a71d058c48db7960f8cfaf7"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/Cargo.toml b/Cargo.toml
index 9ff6e7c77..b19869d93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "3"
[workspace.package]
version = "0.1.8"
edition = "2024"
-rust-version = "1.93"
+rust-version = "1.94"
license = "MIT"
authors = ["Mirai Tech <https://trymirai.com>"]
repository = "https://github.com/trymirai/uzu"
@@ -24,19 +24,20 @@ tokenizers = "0.22"
mpsgraph = "0.2"
objc2 = "0.6"
objc2-foundation = "0.3"
-metal = { package = "mtl-rs", version = "0.1.6" }
+metal = { package = "mtl-rs", version = "0.1" }
block2 = "0.6"
bytemuck = "1.23"
+bytesize = "2"
zerocopy = "0.8.27"
xxhash-rust = "0.8.15"
memmap2 = "0.9.8"
num-traits = "0.2"
regex = "1.12"
libc = "0.2"
-bitflags = "2.10"
-minijinja = "2.15"
-minijinja-contrib = { version = "2.15", features = ["pycompat"] }
-clap = { version = "4.5", features = ["derive"] }
+bitflags = "2.11"
+minijinja = "2.17"
+minijinja-contrib = { version = "2.17", features = ["pycompat"] }
+clap = { version = "4.6", features = ["derive"] }
rand = "0.10"
rand_distr = "0.6.0"
sysinfo = "0.38"
@@ -71,8 +72,8 @@ autocxx = "0.30"
cxx = "1.0"
cmake = "0.1"
autocxx-build = "0.30"
-test-tag = "0.1.6"
-proptest = "1.10.0"
+test-tag = "0.1"
+proptest = "1.10"
# optimize the build script in debug builds
[profile.dev.build-override]
diff --git a/crates/uzu/Cargo.toml b/crates/uzu/Cargo.toml
index 2e581cd82..414aa97a3 100644
--- a/crates/uzu/Cargo.toml
+++ b/crates/uzu/Cargo.toml
@@ -31,6 +31,7 @@ itertools.workspace = true
schemars.workspace = true
# metal feature requires objc2, block2 (for callbacks) and metal
+bytesize = { workspace = true, optional = true }
objc2 = { workspace = true, optional = true }
objc2-foundation = { workspace = true, optional = true }
block2 = { workspace = true, optional = true }
@@ -78,14 +79,13 @@ clang-ast = { workspace = true, optional = true }
default = ["metal"]
metal = [
+ "dep:bytesize",
"dep:clang-ast",
"dep:objc2",
"dep:objc2-foundation",
"dep:block2",
"dep:metal",
]
-metal-nax = []
-
tracing = []
audio-runtime = []
diff --git a/crates/uzu/build/metal/compiler.rs b/crates/uzu/build/metal/compiler.rs
index 41671d934..cfafd4d6a 100644
--- a/crates/uzu/build/metal/compiler.rs
+++ b/crates/uzu/build/metal/compiler.rs
@@ -1,8 +1,4 @@
-use std::{
- collections::HashMap,
- env, fs,
- path::{Path, PathBuf},
-};
+use std::{collections::HashMap, env, fs, path::PathBuf};
use anyhow::Context;
use async_trait::async_trait;
@@ -51,10 +47,6 @@ impl ObjectInfo {
}
}
-fn is_nax_source(path: &Path) -> bool {
- path.file_name().and_then(|s| s.to_str()).map(|s| s.contains("_nax")).unwrap_or(false)
-}
-
async fn hash_dependencies(
dependencies: impl Iterator<Item = Box<str>>
) -> anyhow::Result<HashMap<Box<str>, [u8; blake3::OUT_LEN]>> {
@@ -322,22 +314,11 @@ impl MetalCompiler {
#[async_trait]
impl Compiler for MetalCompiler {
async fn build(&self) -> anyhow::Result<HashMap<Box<[Box<str>]>, Box<[Kernel]>>> {
- let nax_enabled = cfg!(feature = "metal-nax");
- debug_log!(
- "metal nax {}",
- if nax_enabled {
- "enabled"
- } else {
- "disabled"
- }
- );
-
let metal_sources: Vec<PathBuf> = WalkDir::new(&self.src_dir)
.into_iter()
.filter_map(|e| e.ok())
.filter(|e| e.file_type().is_file() && e.path().extension().and_then(|s| s.to_str()) == Some("metal"))
.map(|e| e.into_path())
- .filter(|p| nax_enabled || !is_nax_source(p))
.collect();
let num_concurrent_compiles = std::thread::available_parallelism().map(|x| x.get()).unwrap_or(4) * 2;
diff --git a/crates/uzu/build/metal/toolchain.rs b/crates/uzu/build/metal/toolchain.rs
index 7c4743f10..e0a792d92 100644
--- a/crates/uzu/build/metal/toolchain.rs
+++ b/crates/uzu/build/metal/toolchain.rs
@@ -70,32 +70,19 @@ impl MetalSdk {
#[derive(Debug)]
pub enum MetalStd {
- Metal3_1,
Metal4_0,
}
impl MetalStd {
pub fn to_str(&self) -> &'static str {
match self {
- MetalStd::Metal3_1 => "metal3.1",
- MetalStd::Metal4_0 => "metal4.0",
+ Self::Metal4_0 => "metal4.0",
}
}
pub fn min_os(&self) -> &'static str {
match self {
- MetalStd::Metal3_1 => "14.0",
- MetalStd::Metal4_0 => "26.0",
- }
- }
-}
-
-impl Default for MetalStd {
- fn default() -> Self {
- if cfg!(feature = "metal-nax") {
- Self::Metal4_0
- } else {
- Self::Metal3_1
+ Self::Metal4_0 => "26.0",
}
}
}
@@ -112,7 +99,7 @@ pub struct MetalToolchain {
impl MetalToolchain {
pub fn from_env_with_include_dir(include_dir: Option<PathBuf>) -> anyhow::Result<Self> {
let sdk = MetalSdk::from_env().context("cannot get sdk")?;
- let std = MetalStd::default();
+ let std = MetalStd::Metal4_0;
let opt_flags = match env::var("OPT_LEVEL").context("missing OPT_LEVEL")?.as_str() {
"0" => {
diff --git a/crates/uzu/src/backends/common/context.rs b/crates/uzu/src/backends/common/context.rs
index 264f8ed4e..6daca784b 100644
--- a/crates/uzu/src/backends/common/context.rs
+++ b/crates/uzu/src/backends/common/context.rs
@@ -3,44 +3,17 @@ use std::{env, path::Path, rc::Rc};
use super::Backend;
use crate::backends::common::CommandBuffer;
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DeviceClass {
- Ultra,
- Max,
- Pro,
- Base,
- IPhone,
-}
-
-impl DeviceClass {
- pub fn is_high_end(&self) -> bool {
- matches!(self, DeviceClass::Ultra | DeviceClass::Max)
- }
-}
-
-/// Device performance class based on the last character of architecture name.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DeviceType {
- Phone, // 'p' - iPhone/iPad integrated
- Integrated, // 'g' - Mac integrated GPU
- Desktop, // 'd' - Mac Pro/Max discrete-class GPU
- Unknown(char),
-}
-
-impl DeviceType {
- pub fn is_high_performance(&self) -> bool {
- matches!(self, Self::Desktop)
- }
-}
-
pub trait Context: Sized {
type Backend: Backend<Context = Self>;
fn new() -> Result<Rc<Self>, <Self::Backend as Backend>::Error>;
- fn device_class(&self) -> DeviceClass;
+ fn recommended_async_batch_size(
+ &self,
+ model_path: &Path,
+ ) -> usize;
- fn device_type(&self) -> DeviceType;
+ fn is_high_performance(&self) -> bool;
fn debug_active(&self) -> bool;
diff --git a/crates/uzu/src/backends/common/kernel/matmul/gemm/specialization.rs b/crates/uzu/src/backends/common/kernel/matmul/gemm/specialization.rs
index 4e0249017..216c2b6cd 100644
--- a/crates/uzu/src/backends/common/kernel/matmul/gemm/specialization.rs
+++ b/crates/uzu/src/backends/common/kernel/matmul/gemm/specialization.rs
@@ -1,6 +1,6 @@
use crate::{
DataType,
- backends::common::{Backend, Context, context::DeviceType, kernel::matmul::MatmulArguments},
+ backends::common::{Backend, Context, kernel::matmul::MatmulArguments},
};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -150,47 +150,30 @@ impl GemmSpecialization {
let prefer_half_or_tf32 = !is_float32 || B::Context::tf32_enabled();
let (block_rows, block_cols, block_depth, warps_per_row, warps_per_col, swizzle_log2) =
- match context.device_type() {
- DeviceType::Integrated | DeviceType::Phone | DeviceType::Unknown(_) => {
- if prefer_half_or_tf32 {
- if arguments.transpose_b {
- (64, 32, 32, 2, 2, 0)
- } else {
- (64, 64, 16, 2, 2, 0)
- }
+ if context.is_high_performance() && overall_work_elements >= (1_i64 << 20) {
+ if prefer_half_or_tf32 {
+ if 2 * std::cmp::max(arguments.batch, arguments.output_dim) > arguments.input_dim {
+ (64, 64, 16, 2, 2, 0)
} else if arguments.transpose_b {
- (32, 64, 16, 2, 2, 0)
- } else {
(64, 32, 32, 2, 2, 0)
- }
- },
- DeviceType::Desktop => {
- if overall_work_elements >= (1_i64 << 20) {
- if prefer_half_or_tf32 {
- if 2 * std::cmp::max(arguments.batch, arguments.output_dim) > arguments.input_dim {
- (64, 64, 16, 2, 2, 0)
- } else if arguments.transpose_b {
- (64, 32, 32, 2, 2, 0)
- } else {
- (32, 64, 16, 2, 2, 0)
- }
- } else if arguments.transpose_b {
- (32, 64, 16, 2, 2, 0)
- } else {
- (64, 32, 32, 2, 2, 0)
- }
- } else if prefer_half_or_tf32 {
- if arguments.transpose_b {
- (64, 32, 32, 2, 2, 0)
- } else {
- (64, 64, 16, 2, 2, 0)
- }
- } else if arguments.transpose_b {
- (32, 64, 16, 2, 2, 0)
} else {
- (64, 32, 32, 2, 2, 0)
+ (32, 64, 16, 2, 2, 0)
}
- },
+ } else if arguments.transpose_b {
+ (32, 64, 16, 2, 2, 0)
+ } else {
+ (64, 32, 32, 2, 2, 0)
+ }
+ } else if prefer_half_or_tf32 {
+ if arguments.transpose_b {
+ (64, 32, 32, 2, 2, 0)
+ } else {
+ (64, 64, 16, 2, 2, 0)
+ }
+ } else if arguments.transpose_b {
+ (32, 64, 16, 2, 2, 0)
+ } else {
+ (64, 32, 32, 2, 2, 0)
};
let m = arguments.batch;
diff --git a/crates/uzu/src/backends/common/mod.rs b/crates/uzu/src/backends/common/mod.rs
index eee34aca0..660d6a9f8 100644
--- a/crates/uzu/src/backends/common/mod.rs
+++ b/crates/uzu/src/backends/common/mod.rs
@@ -12,6 +12,6 @@ pub use command_buffer::{
CommandBuffer, CommandBufferCompleted, CommandBufferEncoding, CommandBufferExecutable, CommandBufferInitial,
CommandBufferPending,
};
-pub use context::{Context, DeviceClass, DeviceType};
+pub use context::Context;
pub use event::Event;
pub use kernel::Kernels;
diff --git a/crates/uzu/src/backends/cpu/context.rs b/crates/uzu/src/backends/cpu/context.rs
index 1fd61d943..43e1c13b2 100644
--- a/crates/uzu/src/backends/cpu/context.rs
+++ b/crates/uzu/src/backends/cpu/context.rs
@@ -1,7 +1,7 @@
-use std::{cell::RefCell, rc::Rc};
+use std::{cell::RefCell, path::Path, rc::Rc};
use super::{Cpu, command_buffer::CpuCommandBuffer, error::CpuError};
-use crate::backends::common::{Context, DeviceClass, DeviceType};
+use crate::backends::common::Context;
pub struct CpuContext;
@@ -12,8 +12,15 @@ impl Context for CpuContext {
Ok(Rc::new(CpuContext))
}
- fn device_class(&self) -> DeviceClass {
- DeviceClass::Base
+ fn recommended_async_batch_size(
+ &self,
+ _model_path: &Path,
+ ) -> usize {
+ 1
+ }
+
+ fn is_high_performance(&self) -> bool {
+ false
}
fn debug_active(&self) -> bool {
@@ -47,8 +54,4 @@ impl Context for CpuContext {
fn stop_capture(&self) -> Result<(), CpuError> {
Err(CpuError::NotSupported)
}
-
- fn device_type(&self) -> DeviceType {
- DeviceType::Integrated
- }
}
diff --git a/crates/uzu/src/backends/metal/command_buffer.rs b/crates/uzu/src/backends/metal/command_buffer.rs
index 7f97b6dac..e27990986 100644
--- a/crates/uzu/src/backends/metal/command_buffer.rs
+++ b/crates/uzu/src/backends/metal/command_buffer.rs
@@ -84,7 +84,7 @@ impl MetalCommandBufferEncoding {
if !matches!(self.encoding_state, MetalCommandBufferEncodingEncodingState::Compute(_)) {
self.ensure_none();
self.encoding_state = MetalCommandBufferEncodingEncodingState::Compute(
- self.command_buffer.new_compute_command_encoder().expect("Failed to create compute command encoder"),
+ self.command_buffer.compute_command_encoder().expect("Failed to create compute command encoder"),
);
}
@@ -98,7 +98,7 @@ impl MetalCommandBufferEncoding {
if !matches!(self.encoding_state, MetalCommandBufferEncodingEncodingState::Blit(_)) {
self.ensure_none();
self.encoding_state = MetalCommandBufferEncodingEncodingState::Blit(
- self.command_buffer.new_blit_command_encoder().expect("Failed to create blit command encoder"),
+ self.command_buffer.blit_command_encoder().expect("Failed to create blit command encoder"),
);
}
diff --git a/crates/uzu/src/backends/metal/context.rs b/crates/uzu/src/backends/metal/context.rs
index 2625b7390..de0547a48 100644
--- a/crates/uzu/src/backends/metal/context.rs
+++ b/crates/uzu/src/backends/metal/context.rs
@@ -1,4 +1,4 @@
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::{cell::RefCell, collections::HashMap, path::Path, rc::Rc};
use metal::{
MTLBuffer, MTLCaptureDescriptor, MTLCaptureDestination, MTLCaptureManager, MTLCommandQueue, MTLCommandQueueExt,
@@ -7,130 +7,29 @@ use metal::{
};
use objc2::{rc::Retained, runtime::ProtocolObject};
-use super::{Metal, error::MetalError, kernel, metal_extensions::LibraryPipelineExtensions};
-use crate::backends::{
- common::{Context, DeviceClass as CommonDeviceClass, DeviceType},
- metal::command_buffer::MetalCommandBufferInitial,
+use super::{
+ Metal,
+ device_capabilities::MetalDeviceCapabilities,
+ error::MetalError,
+ kernel,
+ metal_extensions::{DeviceGeneration, LibraryPipelineExtensions},
+};
+use crate::{
+ backends::{common::Context, metal::command_buffer::MetalCommandBufferInitial},
+ utils::ModelSize,
};
-
-/// Apple GPU architecture generation.
-/// Based on Apple GPU family naming convention (e.g., "applegpu_g13p").
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DeviceGeneration {
- Gen13, // M1 family
- Gen14, // M2 family
- Gen15, // M3 family
- Gen16, // M3 Pro/Max with enhanced features
- Gen17, // M4 family
- Gen18, // M5 family (NAX capable)
- Unknown(u8),
-}
-
-impl DeviceGeneration {
- pub fn generation_number(&self) -> u8 {
- match self {
- Self::Gen13 => 13,
- Self::Gen14 => 14,
- Self::Gen15 => 15,
- Self::Gen16 => 16,
- Self::Gen17 => 17,
- Self::Gen18 => 18,
- Self::Unknown(n) => *n,
- }
- }
-}
-
-/// Complete device architecture information.
-#[derive(Debug, Clone)]
-pub struct DeviceArchitecture {
- pub generation: DeviceGeneration,
- pub device_class: DeviceType,
- #[allow(dead_code)]
- pub arch_string: String,
-}
-
-impl DeviceArchitecture {
- pub fn from_device(device: &ProtocolObject<dyn MTLDevice>) -> Self {
- let arch_string = device.name();
-
- // Extract generation from architecture name
- // Format is typically like "Apple M3 Pro" or the GPU name "applegpu_g15d"
- let (generation, device_class) = Self::parse_architecture_info(&arch_string);
-
- Self {
- generation,
- device_class,
- arch_string,
- }
- }
-
- fn parse_architecture_info(arch: &str) -> (DeviceGeneration, DeviceType) {
- // Parse generation and class from device name (e.g. "Apple M3 Pro")
- let generation = if arch.contains("M5") {
- DeviceGeneration::Gen18
- } else if arch.contains("M4") {
- DeviceGeneration::Gen17
- } else if arch.contains("M3") {
- if arch.contains("Max") || arch.contains("Ultra") {
- DeviceGeneration::Gen16
- } else {
- DeviceGeneration::Gen15
- }
- } else if arch.contains("M2") {
- DeviceGeneration::Gen14
- } else if arch.contains("M1") {
- DeviceGeneration::Gen13
- } else {
- DeviceGeneration::Unknown(0)
- };
-
- let device_class = if arch.contains("Max") || arch.contains("Ultra") || arch.contains("Pro") {
- DeviceType::Desktop
- } else if arch.contains("iPhone") || arch.contains("iPad") {
- DeviceType::Phone
- } else {
- DeviceType::Integrated
- };
-
- (generation, device_class)
- }
-
- /// Returns true if NAX (New Accelerator eXtensions) is available.
- /// NAX requires M5 or later (generation >= 18) and macOS 26.2+.
- /// Since we can't check macOS version at compile time in Rust,
- /// we check generation only - the kernels will fail gracefully if unavailable.
- pub fn is_nax_available(&self) -> bool {
- self.generation.generation_number() >= 18
- }
-
- /// Returns true if this is a high-performance device (Pro/Max class).
- pub fn is_high_performance(&self) -> bool {
- self.device_class.is_high_performance()
- }
-}
pub struct MetalContext {
pub device: Retained<ProtocolObject<dyn MTLDevice>>,
pub command_queue: Retained<ProtocolObject<dyn MTLCommandQueue>>,
- architecture: DeviceArchitecture,
+ device_capabilities: MetalDeviceCapabilities,
library: Retained<ProtocolObject<dyn MTLLibrary>>,
pipeline_cache: RefCell<HashMap<String, Retained<ProtocolObject<dyn MTLComputePipelineState>>>>,
}
impl MetalContext {
- /// Returns true if NAX kernels are available on this device.
- pub fn is_nax_available(&self) -> bool {
- cfg!(feature = "metal-nax") && self.architecture.is_nax_available()
- }
-
- /// Returns true if this is a high-performance device (Pro/Max class).
- pub fn is_high_performance(&self) -> bool {
- self.architecture.is_high_performance()
- }
-
- /// Returns the device generation for tile size selection.
pub fn device_generation(&self) -> DeviceGeneration {
- self.architecture.generation
+ self.device_capabilities.generation
}
pub fn compute_pipeline_state(
@@ -165,36 +64,35 @@ impl Context for MetalContext {
.new_library_with_data(kernel::MTLB)
.map_err(|nserror| MetalError::CannotCreateLibrary(nserror.to_string()))?;
- let architecture = DeviceArchitecture::from_device(&device);
+ let device_capabilities = MetalDeviceCapabilities::from_device(&device);
Ok(Rc::new(Self {
device,
command_queue,
- architecture,
+ device_capabilities,
library,
pipeline_cache: RefCell::new(HashMap::new()),
}))
}
- fn device_class(&self) -> CommonDeviceClass {
- let name = self.device.name().to_lowercase();
-
- if name.contains("ultra") {
- CommonDeviceClass::Ultra
- } else if name.contains("max") {
- CommonDeviceClass::Max
- } else if name.contains("pro") {
- CommonDeviceClass::Pro
- } else if name.contains("iphone") || name.contains("a1") {
- CommonDeviceClass::IPhone
- } else {
- CommonDeviceClass::Base
- }
+ fn is_high_performance(&self) -> bool {
+ self.device_capabilities.is_high_performance()
}
- /// Returns the device class for performance tuning.
- fn device_type(&self) -> DeviceType {
- self.architecture.device_class
+ fn recommended_async_batch_size(
+ &self,
+ model_path: &Path,
+ ) -> usize {
+ let cores = self.device_capabilities.gpu_core_count;
+ let model_size = ModelSize::from_path(model_path);
+ match (model_size, cores) {
+ (ModelSize::Large, c) if c > 20 => 32,
+ (ModelSize::Large, c) if c > 10 => 16,
+ (ModelSize::Large, _) => 8,
+ (ModelSize::Small, c) if c > 20 => 256,
+ (ModelSize::Small, c) if c > 10 => 128,
+ (ModelSize::Small, _) => 64,
+ }
}
fn debug_active(&self) -> bool {
diff --git a/crates/uzu/src/backends/metal/device_capabilities.rs b/crates/uzu/src/backends/metal/device_capabilities.rs
new file mode 100644
index 000000000..6908d8b91
--- /dev/null
+++ b/crates/uzu/src/backends/metal/device_capabilities.rs
@@ -0,0 +1,71 @@
+use bytesize::ByteSize;
+use metal::{MTLDevice, MTLDeviceExt as _};
+use objc2::runtime::ProtocolObject;
+
+use super::metal_extensions::{DeviceExt, DeviceGeneration};
+
+const HIGH_PERFORMANCE_CORE_THRESHOLD: u32 = 10;
+
+#[derive(Debug, Clone)]
+pub struct MetalDeviceCapabilities {
+ pub generation: DeviceGeneration,
+ pub family_name: String,
+ pub gpu_core_count: u32,
+ pub max_threadgroup_memory: ByteSize,
+ pub shared_memory_size: ByteSize,
+ pub supports_simd_group: bool,
+ pub supports_simd_group_matrix: bool,
+ pub supports_simd_reduction: bool,
+ pub supports_simd_shuffle_and_fill: bool,
+ pub supports_simd_shuffles_and_broadcast: bool,
+ pub supports_mxu: bool,
+ pub supports_tls: bool,
+}
+
+impl MetalDeviceCapabilities {
+ pub fn from_device(device: &ProtocolObject<dyn MTLDevice>) -> Self {
+ let architecture_name = device.architecture().name();
+ let generation = Self::parse_generation(&architecture_name);
+ let max_threadgroup_memory = ByteSize(device.max_threadgroup_memory_length() as u64);
+
+ Self {
+ generation,
+ family_name: device.family_name(),
+ gpu_core_count: device.gpu_core_count(),
+ max_threadgroup_memory,
+ shared_memory_size: device.shared_memory_size(),
+ supports_simd_group: device.supports_simd_group(),
+ supports_simd_group_matrix: device.supports_simd_group_matrix(),
+ supports_simd_reduction: device.supports_simd_reduction(),
+ supports_simd_shuffle_and_fill: device.supports_simd_shuffle_and_fill(),
+ supports_simd_shuffles_and_broadcast: device.supports_simd_shuffles_and_broadcast(),
+ supports_mxu: device.supports_mxu(),
+ supports_tls: device.supports_tls(),
+ }
+ }
+
+ pub fn is_high_performance(&self) -> bool {
+ self.gpu_core_count > HIGH_PERFORMANCE_CORE_THRESHOLD
+ }
+
+ fn parse_generation(architecture_name: &str) -> DeviceGeneration {
+ let Some(suffix_start) = architecture_name.find("applegpu_g") else {
+ return DeviceGeneration::Unknown(0);
+ };
+ let after_prefix = &architecture_name[suffix_start + "applegpu_g".len()..];
+
+ let digit_end = after_prefix
+ .char_indices()
+ .find(|(_, character)| !character.is_ascii_digit())
+ .map_or(after_prefix.len(), |(index, _)| index);
+
+ if digit_end == 0 {
+ return DeviceGeneration::Unknown(0);
+ }
+
+ match after_prefix[..digit_end].parse::<u8>() {
+ Ok(n) => DeviceGeneration::from_generation_number(n),
+ Err(_) => DeviceGeneration::Unknown(0),
+ }
+ }
+}
diff --git a/crates/uzu/src/backends/metal/metal_extensions/device_extensions.rs b/crates/uzu/src/backends/metal/metal_extensions/device_extensions.rs
new file mode 100644
index 000000000..042aa33c9
--- /dev/null
+++ b/crates/uzu/src/backends/metal/metal_extensions/device_extensions.rs
@@ -0,0 +1,97 @@
+use bytesize::ByteSize;
+use metal::MTLDevice;
+use objc2::{Message, msg_send, rc::Retained, runtime::ProtocolObject};
+use objc2_foundation::NSString;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum DeviceGeneration {
+ Gen13,
+ Gen14,
+ Gen15,
+ Gen16,
+ Gen17,
+ Gen18,
+ Unknown(u8),
+}
+
+impl DeviceGeneration {
+ pub fn generation_number(&self) -> u8 {
+ match self {
+ Self::Gen13 => 13,
+ Self::Gen14 => 14,
+ Self::Gen15 => 15,
+ Self::Gen16 => 16,
+ Self::Gen17 => 17,
+ Self::Gen18 => 18,
+ Self::Unknown(n) => *n,
+ }
+ }
+
+ pub(crate) fn from_generation_number(generation_number: u8) -> Self {
+ match generation_number {
+ 13 => Self::Gen13,
+ 14 => Self::Gen14,
+ 15 => Self::Gen15,
+ 16 => Self::Gen16,
+ 17 => Self::Gen17,
+ 18 => Self::Gen18,
+ _ => Self::Unknown(generation_number),
+ }
+ }
+}
+
+pub trait DeviceExt: MTLDevice + Message {
+ /// Human-readable chip name, e.g. "M2 Max", "M4 Pro", "A17 Pro".
+ fn family_name(&self) -> String {
+ let ns: Retained<NSString> = unsafe { msg_send![self, familyName] };
+ ns.to_string()
+ }
+
+ /// Number of GPU shader cores.
+ fn gpu_core_count(&self) -> u32 {
+ unsafe { msg_send![self, gpuCoreCount] }
+ }
+
+ /// Total unified (shared) memory.
+ fn shared_memory_size(&self) -> ByteSize {
+ ByteSize(unsafe { msg_send![self, sharedMemorySize] })
+ }
+
+ /// Whether the GPU supports SIMD group (warp-level) operations.
+ fn supports_simd_group(&self) -> bool {
+ unsafe { msg_send![self, supportsSIMDGroup] }
+ }
+
+ /// Whether the GPU supports `simdgroup_matrix` (8x8 matrix multiply).
+ fn supports_simd_group_matrix(&self) -> bool {
+ unsafe { msg_send![self, supportsSIMDGroupMatrix] }
+ }
+
+ /// Whether the GPU supports SIMD reduction operations.
+ fn supports_simd_reduction(&self) -> bool {
+ unsafe { msg_send![self, supportsSIMDReduction] }
+ }
+
+ /// Whether the GPU supports SIMD shuffle-and-fill operations.
+ fn supports_simd_shuffle_and_fill(&self) -> bool {
+ unsafe { msg_send![self, supportsSIMDShuffleAndFill] }
+ }
+
+ /// Whether the GPU supports SIMD shuffles and broadcast.
+ fn supports_simd_shuffles_and_broadcast(&self) -> bool {
+ unsafe { msg_send![self, supportsSIMDShufflesAndBroadcast] }
+ }
+
+ /// Whether the GPU has a Matrix eXtension Unit (neural accelerator for compute).
+ /// True on M5+ (Gen18+), false on M1-M4.
+ fn supports_mxu(&self) -> bool {
+ unsafe { msg_send![self, supportsMXU] }
+ }
+
+ /// Whether the GPU supports Thread-Local Storage.
+ fn supports_tls(&self) -> bool {
+ unsafe { msg_send![self, supportsTLS] }
+ }
+}
+
+impl DeviceExt for ProtocolObject<dyn MTLDevice> {}
diff --git a/crates/uzu/src/backends/metal/metal_extensions/mod.rs b/crates/uzu/src/backends/metal/metal_extensions/mod.rs
index 963d89656..3bcccae95 100644
--- a/crates/uzu/src/backends/metal/metal_extensions/mod.rs
+++ b/crates/uzu/src/backends/metal/metal_extensions/mod.rs
@@ -1,9 +1,11 @@
mod compute_command_encoder_extensions_set_value;
mod data_type;
+mod device_extensions;
mod function_constant_values_extensions_set_value;
mod library_extensions_pipeline;
pub use compute_command_encoder_extensions_set_value::ComputeEncoderSetValue;
pub use data_type::MetalDataTypeExt;
+pub use device_extensions::{DeviceExt, DeviceGeneration};
pub use function_constant_values_extensions_set_value::FunctionConstantValuesSetValue;
pub use library_extensions_pipeline::LibraryPipelineExtensions;
diff --git a/crates/uzu/src/backends/metal/mod.rs b/crates/uzu/src/backends/metal/mod.rs
index 47b00fc47..f747f319c 100644
--- a/crates/uzu/src/backends/metal/mod.rs
+++ b/crates/uzu/src/backends/metal/mod.rs
@@ -2,9 +2,13 @@ mod backend;
mod buffer;
mod command_buffer;
mod context;
+mod device_capabilities;
mod error;
mod event;
mod kernel;
mod metal_extensions;
pub use backend::Metal;
+pub use context::MetalContext;
+pub use device_capabilities::MetalDeviceCapabilities;
+pub use metal_extensions::DeviceGeneration;
diff --git a/crates/uzu/src/session/parameter/async_batch_size.rs b/crates/uzu/src/session/parameter/async_batch_size.rs
index 31139ff16..b46a48f78 100644
--- a/crates/uzu/src/session/parameter/async_batch_size.rs
+++ b/crates/uzu/src/session/parameter/async_batch_size.rs
@@ -1,9 +1,6 @@
use std::path::Path;
-use crate::{
- backends::common::{Backend, Context, DeviceClass},
- utils::ModelSize,
-};
+use crate::backends::common::{Backend, Context};
#[derive(Debug, Clone, Copy)]
pub enum AsyncBatchSize {
@@ -24,26 +21,8 @@ impl AsyncBatchSize {
context: &B::Context,
) -> usize {
match self {
- AsyncBatchSize::Default => {
- let device_class = context.device_class();
- let model_size = ModelSize::from_path(model_path);
- default_batch_size(device_class, model_size)
- },
+ AsyncBatchSize::Default => context.recommended_async_batch_size(model_path),
AsyncBatchSize::Custom(value) => *value,
}
}
}
-
-fn default_batch_size(
- device: DeviceClass,
- model_size: ModelSize,
-) -> usize {
- match (model_size, device.is_high_end(), device) {
- (ModelSize::Large, true, _) => 32,
- (ModelSize::Large, _, DeviceClass::IPhone) => 4,
- (ModelSize::Large, _, _) => 8,
- (ModelSize::Small, true, _) => 256,
- (ModelSize::Small, _, DeviceClass::IPhone) => 8,
- (ModelSize::Small, _, _) => 64,
- }
-}
diff --git a/crates/uzu/src/utils/storage.rs b/crates/uzu/src/utils/storage.rs
index 48c615766..cde74aeff 100644
--- a/crates/uzu/src/utils/storage.rs
+++ b/crates/uzu/src/utils/storage.rs
@@ -1,6 +1,6 @@
use std::path::PathBuf;
-use objc2::rc::Retained;
+use objc2::rc::{Retained, autoreleasepool};
use objc2_foundation::{NSHomeDirectory, NSSearchPathDirectory, NSString};
const STORAGE_DIR_NAME: &str = "com.mirai.sdk.storage";
@@ -12,7 +12,7 @@ pub fn user_domain_path(dir: NSSearchPathDirectory) -> PathBuf {
{
use objc2_foundation::{NSFileManager, NSSearchPathDomainMask};
- if let Some(path) = objc2::rc::autoreleasepool(|_| unsafe {
+ if let Some(path) = autoreleasepool(|_| {
let fm = NSFileManager::defaultManager();
let urls = fm.URLsForDirectory_inDomains(dir, NSSearchPathDomainMask::UserDomainMask);
@@ -56,7 +56,7 @@ pub fn storage_path() -> PathBuf {
// `~/Library/Containers/<bundle-id>/Data`. Persist model files inside
// the app-scoped caches directory to comply with sandbox rules:
// `~/Library/Containers/<bundle-id>/Data/Library/Caches/…`.
- let home = unsafe { NSHomeDirectory() }.to_string();
+ let home = NSHomeDirectory().to_string();
PathBuf::from(&home).join("Library").join("Caches")
};