Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ webgpu = [ "khal/webgpu" ]
cpu = ["khal/cpu", "vortx-shaders/cpu"]
cpu-parallel = ["cpu", "vortx-shaders/cpu-parallel"]
cuda = ["khal/cuda", "khal-builder/cuda", "vortx-shaders/cuda"]
# Native CUDA with kernels compiled by cuda-oxide (`cargo oxide`) instead of
# rust-cuda's `cargo cuda`. Implies `cuda`.
# Not forwarded to `vortx-shaders/cuda-oxide`: khal-builder enables that in its
# own `cargo oxide` build; in the host build it would break the CPU backend
# (GPU-only libdevice externs in khal-std's `Float`).
cuda-oxide = ["cuda", "khal-builder/cuda-oxide"]
metal = ["khal/metal"]
push_constants = ["khal/push_constants", "vortx-shaders/push_constants"]
subgroup_ops = ["khal/subgroup_ops", "vortx-shaders/subgroup_ops"]
Expand Down Expand Up @@ -62,8 +68,10 @@ khal-builder = "0.3"
vortx-shaders = { version = "0.4", path = "./vortx-shaders" }

[patch.crates-io]
#khal-builder = { path = "../khal/crates/khal-builder" }
#khal = { path = "../khal/crates/khal" }
#khal-std = { path = "../khal/crates/khal-std" }
#khal-derive = { path = "../khal/crates/khal-derive" }
# khal from GitHub: the `cuda-oxide` feature (and the cubin/PTX build
# fixes) are not on crates.io yet.
khal-builder = { git = "https://github.com/dimforge/khal", branch = "main" }
khal = { git = "https://github.com/dimforge/khal", branch = "main" }
khal-std = { git = "https://github.com/dimforge/khal", branch = "main" }
khal-derive = { git = "https://github.com/dimforge/khal", branch = "main" }
#glamx = { git = "https://github.com/dimforge/glamx", branch = "bytemuck" }
3 changes: 3 additions & 0 deletions vortx-shaders/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ subgroup_ops = []
cpu = ["khal-std/cpu", "khal/cpu"]
cpu-parallel = ["cpu", "khal-std/cpu-parallel"]
cuda = ["khal-std/cuda", "khal/cuda"]
# Compile the CUDA kernels with the cuda-oxide backend (host-target unified
# interception) instead of rust-cuda.
cuda-oxide = ["cuda", "khal-std/cuda-oxide"]
# Enables machine-learning (llm inference, reinforcement learning, etc.) operators.
ml = []

Expand Down
Loading