Vortex crate doesn't unconditionally depend on vortex-cuda-macros (#6580)

Signed-off-by: Robert Kruszewski <github@robertk.io>

Author: robert3005

Cargo.lock

@@ -22,7 +22,7 @@ default = ["native"]
 native = ["libfuzzer-sys", "zstd", "vortex-file", "vortex/files"]
 wasmfuzz = []
 zstd = ["vortex/zstd", "vortex-btrblocks/zstd", "vortex-btrblocks/pco"]
-cuda = ["vortex-cuda", "vortex/cuda", "tokio"]
+cuda = ["vortex-cuda", "tokio"]
 
 [dependencies]
 # Always needed - arbitrary is used for input generation
@@ -38,7 +38,6 @@ vortex-buffer = { workspace = true }
 vortex-dtype = { workspace = true, features = ["arbitrary"] }
 vortex-error = { workspace = true }
 vortex-io = { workspace = true }
-vortex-layout = { workspace = true }
 vortex-mask = { workspace = true }
 vortex-runend = { workspace = true, features = ["arbitrary"] }
 vortex-session = { workspace = true }

fuzz/Cargo.toml

@@ -41,8 +41,19 @@ mod native_runtime {
     use vortex_session::VortexSession;
 
     pub static RUNTIME: LazyLock<CurrentThreadRuntime> = LazyLock::new(CurrentThreadRuntime::new);
-    pub static SESSION: LazyLock<VortexSession> =
-        LazyLock::new(|| VortexSession::default().with_handle(RUNTIME.handle()));
+    pub static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
+        #[allow(unused_mut)]
+        let mut session = VortexSession::default().with_handle(RUNTIME.handle());
+        #[cfg(all(feature = "cuda", target_os = "linux"))]
+        // Even if the CUDA feature is enabled we need to check at
+        // runtime whether CUDA is available in the current environment.
+        if vortex_cuda::cuda_available() {
+            use vortex_cuda::CudaSessionExt;
+            session = session.with::<vortex_cuda::CudaSession>();
+            vortex_cuda::initialize_cuda(&session.cuda_session());
+        }
+        session
+    });
 }
 
 #[cfg(not(target_arch = "wasm32"))]

fuzz/src/lib.rs

@@ -25,8 +25,6 @@ vortex-array = { workspace = true }
 vortex-btrblocks = { workspace = true }
 vortex-buffer = { workspace = true }
 vortex-bytebool = { workspace = true }
-
-vortex-cuda-macros = { workspace = true }
 vortex-datetime-parts = { workspace = true }
 vortex-decimal-byte-parts = { workspace = true }
 vortex-dtype = { workspace = true }
@@ -51,9 +49,6 @@ vortex-utils = { workspace = true }
 vortex-zigzag = { workspace = true }
 vortex-zstd = { workspace = true, optional = true }
 
-[target.'cfg(target_os = "linux")'.dependencies]
-vortex-cuda = { workspace = true, optional = true }
-
 [dev-dependencies]
 anyhow = { workspace = true }
 arrow-array = { workspace = true }
@@ -86,11 +81,9 @@ serde = [
 # This feature enabled unstable encodings for which we don't guarantee stability.
 unstable_encodings = [
     "vortex-btrblocks/unstable_encodings",
-    "vortex-cuda?/unstable_encodings",
     "vortex-file?/unstable_encodings",
     "vortex-zstd?/unstable_encodings",
 ]
-cuda = ["dep:vortex-cuda"]
 
 [[bench]]
 name = "single_encoding_throughput"

vortex/Cargo.toml

@@ -158,15 +158,6 @@ impl VortexSessionDefault for VortexSession {
             .with::<ExprSession>()
             .with::<RuntimeSession>();
 
-        #[cfg(all(feature = "cuda", target_os = "linux"))]
-        // Even if the CUDA feature is enabled we need to check at
-        // runtime whether CUDA is available in the current environment.
-        if vortex_cuda::cuda_available() {
-            use vortex_cuda::CudaSessionExt;
-            session = session.with::<vortex_cuda::CudaSession>();
-            vortex_cuda::initialize_cuda(&session.cuda_session());
-        }
-
         #[cfg(feature = "files")]
         file::register_default_encodings(&mut session);