From 89dc0b3a28a2eaf297ccc78100437fe53cedfe27 Mon Sep 17 00:00:00 2001 From: Juniper Tyree Date: Sun, 2 Feb 2025 19:26:25 +0000 Subject: [PATCH] Switch deps --- Cargo.toml | 10 +++------- src/deps.rs | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f4d43727a..4e52e113f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,15 +23,12 @@ rust-cuda = { version = "0.1", path = ".", default-features = false } rust-cuda-derive = { version = "0.1", path = "rust-cuda-derive", default-features = false } rust-cuda-kernel = { version = "0.1", path = "rust-cuda-kernel", default-features = false } -# third-party dependencies with unpublished patches -rustacuda = { git = "https://github.com/juntyr/RustaCUDA", rev = "c6ea7cc", default-features = false } -rustacuda_core = { git = "https://github.com/juntyr/RustaCUDA", rev = "c6ea7cc", default-features = false } - # crates.io third-party dependencies cargo_metadata = { version = "0.19", default-features = false } cargo-util = { version = "=0.2.16", default-features = false } # TODO: keep in sync with toolchain colored = { version = "3.0", default-features = false } const-type-layout = { version = "0.3.2", default-features = false } +cudarc = { version = "0.13", default-features = false } final = { version = "0.1.1", default-features = false } find_cuda_helper = { version = "0.2", default-features = false } oneshot = { version = "0.1", default-features = false } @@ -92,16 +89,15 @@ default = [] derive = ["dep:rust-cuda-derive"] device = [] final = ["dep:final"] -host = ["dep:rustacuda", "dep:regex", "dep:oneshot", "dep:safer_owning_ref"] +host = ["dep:cudarc", "dep:regex", "dep:oneshot", "dep:safer_owning_ref"] kernel = ["dep:rust-cuda-kernel"] [dependencies] const-type-layout = { workspace = true, features = ["derive"] } +cudarc = { workspace = true, optional = true, features = ["cuda-version-from-build-system"] } final = { workspace = true, optional = true } oneshot = { workspace = true, features = ["std", "async"], optional = true } regex = { workspace = true, optional = true } -rustacuda = { workspace = true, optional = true } -rustacuda_core = { workspace = true } rust-cuda-derive = { workspace = true, optional = true } rust-cuda-kernel = { workspace = true, optional = true } safer_owning_ref = { workspace = true, optional = true } diff --git a/src/deps.rs b/src/deps.rs index 50fd38f3f..c4edf860e 100644 --- a/src/deps.rs +++ b/src/deps.rs @@ -7,6 +7,4 @@ pub extern crate const_type_layout; pub extern crate owning_ref; #[cfg(feature = "host")] -pub extern crate rustacuda; - -pub extern crate rustacuda_core; +pub extern crate cudarc;