diff --git a/Cargo.lock b/Cargo.lock index 836424dd..92ce0871 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -654,12 +654,12 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" dependencies = [ - "bitflags 1.3.2", - "libloading 0.7.4", + "bitflags 2.4.0", + "libloading 0.8.0", "winapi", ] @@ -995,7 +995,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", ] [[package]] @@ -1004,6 +1025,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -1195,21 +1222,21 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "gpu-alloc-types", ] [[package]] name = "gpu-alloc-types" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] @@ -1862,16 +1889,17 @@ dependencies = [ [[package]] name = "metal" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "block", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "log", "objc", + "paste", ] [[package]] @@ -1930,12 +1958,12 @@ dependencies = [ [[package]] name = "naga" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags 2.4.0", "codespan-reporting", "hexf-parse", "indexmap", @@ -2161,7 +2189,7 @@ checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ "bitflags 2.4.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -3879,9 +3907,9 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.16.3" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +checksum = "ed547920565c56c7a29afb4538ac5ae5048865a5d2f05bff3ad4fbeb921a9a2c" dependencies = [ "arrayvec", "cfg-if", @@ -3903,9 +3931,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7" dependencies = [ "arrayvec", "bit-vec", @@ -3926,9 +3954,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.16.2" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17" dependencies = [ "android_system_properties", "arrayvec", @@ -3938,7 +3966,6 @@ dependencies = [ "block", "core-graphics-types", "d3d12", - "foreign-types", "glow", "gpu-alloc", "gpu-allocator", @@ -3968,9 +3995,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" dependencies = [ "bitflags 2.4.0", "js-sys", diff --git a/wonnx-cli/Cargo.toml b/wonnx-cli/Cargo.toml index 871341b5..0967e31b 100644 --- a/wonnx-cli/Cargo.toml +++ b/wonnx-cli/Cargo.toml @@ -30,7 +30,7 @@ protobuf = { version = "2.27.1", features = ["with-bytes"] } structopt = { version = "0.3.26", features = ["paw"] } thiserror = "1.0.31" tract-onnx = { version = "0.19.12", optional = true } -wgpu = "0.16.0" +wgpu = "0.17.1" wonnx = { version = "^0.5.1" } wonnx-preprocessing = { version = "^0.5.1" } human_bytes = "0.4.1" diff --git a/wonnx-preprocessing/Cargo.toml b/wonnx-preprocessing/Cargo.toml index 8e9cd427..5442ea79 100644 --- a/wonnx-preprocessing/Cargo.toml +++ b/wonnx-preprocessing/Cargo.toml @@ -20,7 +20,7 @@ protobuf = { version = "2.27.1", features = ["with-bytes"] } thiserror = "1.0.31" tokenizers = "0.13.3" tract-onnx = { version = "0.19.2", optional = true } -wgpu = "0.16.0" +wgpu = "0.17.1" wonnx = { version = "^0.5.1" } serde_json = "^1.0" bytemuck = "1.9.1" diff --git a/wonnx/Cargo.toml b/wonnx/Cargo.toml index 07bbb740..dc8c150c 100644 --- a/wonnx/Cargo.toml +++ b/wonnx/Cargo.toml @@ -22,7 +22,7 @@ exclude = [ ] [dependencies] -wgpu = "0.16.0" +wgpu = "0.17.1" bytemuck = { version = "1.9.1", features = ["extern_crate_alloc"] } protobuf = { version = "2.27.1", features = ["with-bytes"] } log = "0.4.17" diff --git a/wonnx/src/resource.rs b/wonnx/src/resource.rs index 88a88063..b196b6e6 100644 --- a/wonnx/src/resource.rs +++ b/wonnx/src/resource.rs @@ -8,7 +8,7 @@ pub async fn request_device_queue() -> (wgpu::Device, wgpu::Queue) { dx12_shader_compiler: wgpu::Dx12Compiler::Fxc, }; let instance = wgpu::Instance::new(instance_descriptor); - let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, backends, None) + let adapter = wgpu::util::initialize_adapter_from_env_or_default(&instance, None) .await .expect("No GPU found given preference");