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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" }
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading