From 0dd6bdfaf5c42b2a90f60b8ec64db6da05d1c354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= Date: Sun, 3 May 2026 19:18:04 +0200 Subject: [PATCH] feat: switch to the published version of khal + release v0.1.0 --- .github/workflows/ci.yaml | 8 ++++---- Cargo.toml | 8 ++++---- README.md | 13 +++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 50bfd8c..e11b391 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,7 +52,7 @@ jobs: - name: Install cargo-gpu run: | - cargo install --git https://github.com/Rust-GPU/cargo-gpu cargo-gpu + cargo install cargo-gpu --version 0.10.0-alpha.1 cargo gpu install --auto-install-rust-toolchain - name: Run clippy lints @@ -80,12 +80,12 @@ jobs: - name: Install cargo-gpu run: | - cargo install --git https://github.com/Rust-GPU/cargo-gpu cargo-gpu + cargo install cargo-gpu --version 0.10.0-alpha.1 cargo gpu install --auto-install-rust-toolchain - name: Check documentation run: cargo doc --locked --workspace --document-private-items --no-deps - # Testing. + # Testing. test: name: Tests runs-on: ubuntu-latest @@ -111,7 +111,7 @@ jobs: - name: Install cargo-gpu run: | - cargo install --git https://github.com/Rust-GPU/cargo-gpu cargo-gpu + cargo install cargo-gpu --version 0.10.0-alpha.1 cargo gpu install --auto-install-rust-toolchain - name: Run Cargo Tests diff --git a/Cargo.toml b/Cargo.toml index a68810a..3996566 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ push_constants = ["khal/push_constants", "vortx-shaders/push_constants"] subgroup_ops = ["khal/subgroup_ops", "vortx-shaders/subgroup_ops"] [workspace.dependencies] -khal-std = { version = "0.1", git = "https://github.com/dimforge/khal" } -khal = { version = "0.1", git = "https://github.com/dimforge/khal", features = ["derive"]} +khal-std = "0.1" +khal = { version = "0.1", features = ["derive"]} [dependencies] bytemuck = "1" @@ -47,9 +47,9 @@ anyhow = "1" wgpu = "29" [build-dependencies] -khal-builder = { git = "https://github.com/dimforge/khal "} +khal-builder = "0.1" -[patch.crates-io] +#[patch.crates-io] #khal-builder = { path = "../khal/crates/khal-builder" } #khal = { path = "../khal/crates/khal" } #khal-std = { path = "../khal/crates/khal-std" } diff --git a/README.md b/README.md index b7716d6..bcb720f 100644 --- a/README.md +++ b/README.md @@ -33,24 +33,25 @@ linear-algebra operations as GPU compute shaders written in Rust with [rust-gpu] ### cargo-gpu (required for SPIR-V / WebGPU) -The crates.io version of `cargo-gpu` is outdated. Install from Git and let it set up its Rust -toolchain: +Install `cargo-gpu` from crates.io: ```bash -cargo install --git https://github.com/Rust-GPU/cargo-gpu cargo-gpu +cargo install cargo-gpu --version 0.10.0-alpha.1 cargo gpu install ``` ### cargo-cuda (required for CUDA / PTX) -`cargo-cuda` lives in this repository (`crates/cargo-cuda`). Install it from the workspace and -build the `rustc_codegen_nvvm` codegen backend: +Install `cargo-cuda` from crates.io: ```bash -cargo install --path https://github.com/dimforge/khal cargo-cuda +cargo install cargo-cuda --version 0.1.0 cargo cuda install ``` +**Important:** the cuda backend support requires depending on the github version of khal instead of the version +on `crates.io`. + This requires the **CUDA toolkit** to be installed and the `CUDA_PATH` environment variable to point to it (e.g. `/usr/local/cuda`). The install step downloads a pinned Rust nightly, adds the `nvptx64-nvidia-cuda` target, and compiles the codegen backend.