From 976b2393ddfcb898dbf492732c4a003e28af3858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= <sebcrozet@dimforge.com>
Date: Sun, 16 Nov 2025 21:34:29 +0100
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20make=20stensor=20compatible=20with?=
 =?UTF-8?q?=20slang-hal=E2=80=99s=20new=20comptime=20feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...{Check.run.xml => Check (runtime).run.xml} |  4 +--
 Cargo.toml                                    | 21 +++++++----
 build.rs                                      | 35 ++++++++++++-------
 examples/gemm_bench.rs                        |  4 +--
 src/lib.rs                                    |  5 ++-
 src/linalg/contiguous.rs                      |  4 +--
 src/linalg/gemm.rs                            |  4 +--
 src/linalg/gemv.rs                            |  4 +--
 src/linalg/op_assign.rs                       |  2 +-
 src/linalg/reduce.rs                          |  3 +-
 src/shapes.rs                                 |  2 +-
 src/tensor.rs                                 |  3 +-
 12 files changed, 54 insertions(+), 37 deletions(-)
 rename .run/{Check.run.xml => Check (runtime).run.xml} (80%)

diff --git a/.run/Check.run.xml b/.run/Check (runtime).run.xml
similarity index 80%
rename from .run/Check.run.xml
rename to .run/Check (runtime).run.xml
index 048d405..0b6d781 100644
--- a/.run/Check.run.xml
+++ b/.run/Check (runtime).run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Check" type="CargoCommandRunConfiguration" factoryName="Cargo Command" nameIsGenerated="true">
+  <configuration default="false" name="Check (runtime)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="buildProfileId" value="dev" />
-    <option name="command" value="check" />
+    <option name="command" value="check --features runtime" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <envs />
     <option name="emulateTerminal" value="true" />
diff --git a/Cargo.toml b/Cargo.toml
index a9ace03..6f0de40 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,18 +8,23 @@ edition = "2024"
 license = "Apache-2.0"
 
 [features]
+comptime = [ "slang-hal/comptime" ]
+runtime = [ "slang-hal/runtime" ]
+
+webgpu = [ "slang-hal/webgpu" ]
+vulkan = [ "slang-hal/vulkan" ]
+metal = [ "slang-hal/metal" ]
+cpu = [ "slang-hal/cpu" ]
 cuda = [ "cudarc", "slang-hal/cuda" ]
 cublas = [ "slang-hal/cublas" ]
 
 [dependencies]
-wgpu = "27"
 encase = "0.12"
 bytemuck = "1"
 nalgebra = { version = "0.34", features = ["encase"] }
 
 cudarc = {  version = "0.16", optional = true }
 
-minislang = "0.2"
 slang-hal = { version = "0.2", features = ["derive"] }
 include_dir = "0.7"
 
@@ -32,12 +37,16 @@ async-std = { version = "1", features = ["attributes"] }
 plotly = "0.12.1"
 indexmap = "2"
 anyhow = "1"
+wgpu = "27"
 
 [build-dependencies]
-minislang = "0.1"
+minislang = "0.2"
+slang-hal-build = "0.2"
+include_dir = "0.7"
 
 [patch.crates-io]
 #shader-slang = { path = "../slang-rs" }
-#minislang = { path = "../slang-hal/crates/minislang" }
-#slang-hal-derive = { path = "../slang-hal/crates/slang-hal-derive" }
-#slang-hal = { path = "../slang-hal/crates/slang-hal" }
+minislang = { path = "../slang-hal/crates/minislang" }
+slang-hal-build = { path = "../slang-hal/crates/slang-hal-build" }
+slang-hal-derive = { path = "../slang-hal/crates/slang-hal-derive" }
+slang-hal = { path = "../slang-hal/crates/slang-hal" }
diff --git a/build.rs b/build.rs
index ac0db9d..f22e0bb 100644
--- a/build.rs
+++ b/build.rs
@@ -1,17 +1,28 @@
-use minislang::{SlangCompiler, shader_slang::CompileTarget};
-use std::path::PathBuf;
-use std::str::FromStr;
+use {
+    minislang::{shader_slang::CompileTarget, SlangCompiler},
+    std::env,
+    std::path::{Path, PathBuf},
+    std::str::FromStr,
+};
 
+#[cfg(not(feature = "comptime"))]
+pub fn main() { }
+
+#[cfg(feature = "comptime")]
 pub fn main() {
-    let slang = SlangCompiler::new(vec![PathBuf::from_str("./shaders").unwrap()]);
+    use slang_hal_build::ShaderCompiler;
+
+    const SLANG_SRC_DIR: include_dir::Dir<'_> =
+        include_dir::include_dir!("$CARGO_MANIFEST_DIR/shaders");
 
-    let targets = [
-        CompileTarget::Wgsl,
-        #[cfg(feature = "cuda")]
-        CompileTarget::CudaSource,
-    ];
+    let out_dir = env::var("OUT_DIR").expect("Couldn't determine output directory.");
+    let mut compiler = ShaderCompiler::new(vec![], &out_dir);
+    compiler.add_dir(SLANG_SRC_DIR);
 
-    for target in targets {
-        slang.compile_all(target, "../shaders", "./src/autogen", &[]);
-    }
+    // Compile all shaders from examples/shaders directory.
+    // Note: slang-hal-build will automatically detect which backends to compile for
+    // based on the cargo features enabled during the build.
+    compiler
+        .compile_shaders_dir("shaders", &[])
+        .expect("Failed to compile shaders");
 }
diff --git a/examples/gemm_bench.rs b/examples/gemm_bench.rs
index b7cbd46..892654d 100644
--- a/examples/gemm_bench.rs
+++ b/examples/gemm_bench.rs
@@ -1,13 +1,13 @@
 use indexmap::IndexMap;
 use minislang::SlangCompiler;
 use nalgebra::DMatrix;
-use slang_hal::Shader;
+use slang_hal::{BufferUsages, Shader};
 use slang_hal::backend::WebGpu;
 use slang_hal::backend::{Backend, Encoder};
 use stensor::linalg::{Gemm, GemmVariant};
 use stensor::shapes::ViewShapeBuffers;
 use stensor::tensor::GpuTensor;
-use wgpu::{BufferUsages, Features, Limits};
+use wgpu::{Features, Limits};
 
 #[async_std::main]
 async fn main() -> anyhow::Result<()> {
diff --git a/src/lib.rs b/src/lib.rs
index 2eed99e..6243a55 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,11 +3,10 @@
 #![allow(clippy::result_large_err)]
 #![warn(missing_docs)]
 
+use slang_hal::SlangCompiler;
 pub use geometry::*;
 pub use linalg::*;
 
-use minislang::SlangCompiler;
-
 pub mod geometry;
 pub mod linalg;
 pub mod shapes;
@@ -15,7 +14,7 @@ pub mod tensor;
 
 // pub mod utils;
 
-const SLANG_SRC_DIR: include_dir::Dir<'_> =
+pub const SLANG_SRC_DIR: include_dir::Dir<'_> =
     include_dir::include_dir!("$CARGO_MANIFEST_DIR/shaders");
 
 /// Register all the shaders from this crate (and its dependencies) as modules accessible to the
diff --git a/src/linalg/contiguous.rs b/src/linalg/contiguous.rs
index 3cd66bc..6322947 100644
--- a/src/linalg/contiguous.rs
+++ b/src/linalg/contiguous.rs
@@ -62,10 +62,10 @@ mod test {
     use crate::tensor::GpuTensor;
     use minislang::SlangCompiler;
     use nalgebra::DMatrix;
-    use slang_hal::Shader;
+    use slang_hal::{BufferUsages, Shader};
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Encoder};
-    use wgpu::{BufferUsages, Features, Limits};
+    use wgpu::{Features, Limits};
 
     #[futures_test::test]
     #[serial_test::serial]
diff --git a/src/linalg/gemm.rs b/src/linalg/gemm.rs
index 4add4e4..41fa646 100644
--- a/src/linalg/gemm.rs
+++ b/src/linalg/gemm.rs
@@ -202,9 +202,9 @@ mod test {
     use approx::relative_eq;
     use minislang::SlangCompiler;
     use nalgebra::DMatrix;
-    use slang_hal::Shader;
+    use slang_hal::{BufferUsages, Shader};
     use slang_hal::backend::{Backend, Encoder, WebGpu};
-    use wgpu::{BufferUsages, Features, Limits};
+    use wgpu::{Features, Limits};
 
     #[futures_test::test]
     #[serial_test::serial]
diff --git a/src/linalg/gemv.rs b/src/linalg/gemv.rs
index 4705782..c239016 100644
--- a/src/linalg/gemv.rs
+++ b/src/linalg/gemv.rs
@@ -313,10 +313,10 @@ mod test {
     use approx::assert_relative_eq;
     use minislang::SlangCompiler;
     use nalgebra::{DMatrix, DVector};
-    use slang_hal::Shader;
+    use slang_hal::{BufferUsages, Shader};
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Encoder};
-    use wgpu::{BufferUsages, Features, Limits};
+    use wgpu::{Features, Limits};
 
     #[futures_test::test]
     #[serial_test::serial]
diff --git a/src/linalg/op_assign.rs b/src/linalg/op_assign.rs
index 55f0db2..1bfba4c 100644
--- a/src/linalg/op_assign.rs
+++ b/src/linalg/op_assign.rs
@@ -161,8 +161,8 @@ mod test {
     use nalgebra::DVector;
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Buffer, Encoder};
+    use slang_hal::BufferUsages;
     use slang_hal::shader::Shader;
-    use wgpu::BufferUsages;
 
     #[futures_test::test]
     #[serial_test::serial]
diff --git a/src/linalg/reduce.rs b/src/linalg/reduce.rs
index ae5b908..0afe96d 100644
--- a/src/linalg/reduce.rs
+++ b/src/linalg/reduce.rs
@@ -57,11 +57,10 @@ mod test {
     use crate::tensor::GpuTensor;
     use minislang::SlangCompiler;
     use nalgebra::DVector;
-    use slang_hal::ShaderArgs;
+    use slang_hal::{BufferUsages, ShaderArgs};
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Encoder};
     use slang_hal::shader::Shader;
-    use wgpu::BufferUsages;
 
     #[derive(ShaderArgs)]
     pub struct ReduceArgs<'a, B: Backend> {
diff --git a/src/shapes.rs b/src/shapes.rs
index 4e56e37..2580c9b 100644
--- a/src/shapes.rs
+++ b/src/shapes.rs
@@ -4,7 +4,7 @@ use slang_hal::backend::Backend;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::sync::Mutex;
-use wgpu::BufferUsages;
+use slang_hal::BufferUsages;
 
 /// GGML dimension index mapping: converts between GGML and stensor dimension ordering.
 pub const GGML_IDS: [usize; 4] = [1, 0, 2, 3];
diff --git a/src/tensor.rs b/src/tensor.rs
index c94262c..ca75dca 100644
--- a/src/tensor.rs
+++ b/src/tensor.rs
@@ -12,11 +12,10 @@ use std::ops::{Bound, RangeBounds};
 use std::sync::Arc;
 
 use slang_hal::backend::WebGpu;
-use wgpu::BufferUsages;
 
 #[cfg(feature = "cuda")]
 use crate::cuda::Cuda;
-use slang_hal::ShaderArgs;
+use slang_hal::{BufferUsages, ShaderArgs};
 use slang_hal::shader::ShaderArgsError;
 
 /// Helper struct for creating gpu storage buffers (scalars, vectors, matrices, tensors).

From 0a8782dd7da923107445169aa25cf146ef606623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= <sebcrozet@dimforge.com>
Date: Tue, 20 Jan 2026 13:38:47 +0100
Subject: [PATCH 2/2] Release v0.3.0

---
 .github/workflows/ci.yaml |  6 +++---
 Cargo.toml                | 17 +++++++++--------
 build.rs                  | 10 +++-------
 examples/gemm_bench.rs    |  2 +-
 src/lib.rs                |  3 ++-
 src/linalg/contiguous.rs  |  2 +-
 src/linalg/gemm.rs        |  2 +-
 src/linalg/gemv.rs        |  2 +-
 src/linalg/op_assign.rs   |  2 +-
 src/linalg/reduce.rs      |  2 +-
 src/shapes.rs             |  2 +-
 src/tensor.rs             |  2 +-
 12 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f377112..94132c3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -96,7 +96,7 @@ jobs:
           sweep-cache: true
 
       - name: Run clippy lints
-        run: SLANG_DIR=$SLANG_DIR cargo clippy --locked --workspace --all-targets -- --deny warnings
+        run: SLANG_DIR=$SLANG_DIR cargo clippy --locked --workspace --all-targets --features runtime -- --deny warnings
 
   # Check documentation.
   doc:
@@ -128,7 +128,7 @@ jobs:
           sweep-cache: true
 
       - name: Check documentation
-        run: SLANG_DIR=$SLANG_DIR cargo doc --locked --workspace --document-private-items --no-deps
+        run: SLANG_DIR=$SLANG_DIR cargo doc --locked --workspace --document-private-items --features runtime --no-deps
     # Testing.
   test:
     needs: setup-slang # Depends on setup-slang
@@ -163,4 +163,4 @@ jobs:
           sweep-cache: true
       - name: Run Cargo Tests
         run: |
-          SLANG_DIR=$SLANG_DIR LIBGL_ALWAYS_SOFTWARE=1 cargo test --verbose
\ No newline at end of file
+          SLANG_DIR=$SLANG_DIR LIBGL_ALWAYS_SOFTWARE=1 cargo test --verbose --features runtime
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 6f0de40..21d5987 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "stensor"
 authors = ["Sébastien Crozet <sebcrozet@dimforge.com>"]
 description = "Cross-platform GPU tensor library with Slang and Rust."
 repository = "https://github.com/dimforge/stensor"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 license = "Apache-2.0"
 
@@ -25,10 +25,11 @@ nalgebra = { version = "0.34", features = ["encase"] }
 
 cudarc = {  version = "0.16", optional = true }
 
-slang-hal = { version = "0.2", features = ["derive"] }
+slang-hal = { version = "0.3", features = ["derive"] }
 include_dir = "0.7"
 
 [dev-dependencies]
+minislang = "0.3"
 nalgebra = { version = "0.34", features = ["rand"] }
 futures-test = "0.3"
 serial_test = "3"
@@ -40,13 +41,13 @@ anyhow = "1"
 wgpu = "27"
 
 [build-dependencies]
-minislang = "0.2"
-slang-hal-build = "0.2"
+minislang = "0.3"
+slang-hal-build = "0.3"
 include_dir = "0.7"
 
 [patch.crates-io]
 #shader-slang = { path = "../slang-rs" }
-minislang = { path = "../slang-hal/crates/minislang" }
-slang-hal-build = { path = "../slang-hal/crates/slang-hal-build" }
-slang-hal-derive = { path = "../slang-hal/crates/slang-hal-derive" }
-slang-hal = { path = "../slang-hal/crates/slang-hal" }
+#minislang = { path = "../slang-hal/crates/minislang" }
+#slang-hal-build = { path = "../slang-hal/crates/slang-hal-build" }
+#slang-hal-derive = { path = "../slang-hal/crates/slang-hal-derive" }
+#slang-hal = { path = "../slang-hal/crates/slang-hal" }
diff --git a/build.rs b/build.rs
index f22e0bb..04038ca 100644
--- a/build.rs
+++ b/build.rs
@@ -1,12 +1,8 @@
-use {
-    minislang::{shader_slang::CompileTarget, SlangCompiler},
-    std::env,
-    std::path::{Path, PathBuf},
-    std::str::FromStr,
-};
+#[cfg(feature = "comptime")]
+use std::env;
 
 #[cfg(not(feature = "comptime"))]
-pub fn main() { }
+pub fn main() {}
 
 #[cfg(feature = "comptime")]
 pub fn main() {
diff --git a/examples/gemm_bench.rs b/examples/gemm_bench.rs
index 892654d..76ec937 100644
--- a/examples/gemm_bench.rs
+++ b/examples/gemm_bench.rs
@@ -1,9 +1,9 @@
 use indexmap::IndexMap;
 use minislang::SlangCompiler;
 use nalgebra::DMatrix;
-use slang_hal::{BufferUsages, Shader};
 use slang_hal::backend::WebGpu;
 use slang_hal::backend::{Backend, Encoder};
+use slang_hal::{BufferUsages, Shader};
 use stensor::linalg::{Gemm, GemmVariant};
 use stensor::shapes::ViewShapeBuffers;
 use stensor::tensor::GpuTensor;
diff --git a/src/lib.rs b/src/lib.rs
index 6243a55..e945af9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,9 +3,9 @@
 #![allow(clippy::result_large_err)]
 #![warn(missing_docs)]
 
-use slang_hal::SlangCompiler;
 pub use geometry::*;
 pub use linalg::*;
+use slang_hal::SlangCompiler;
 
 pub mod geometry;
 pub mod linalg;
@@ -14,6 +14,7 @@ pub mod tensor;
 
 // pub mod utils;
 
+/// Directory of slang shaders from `stensor`.
 pub const SLANG_SRC_DIR: include_dir::Dir<'_> =
     include_dir::include_dir!("$CARGO_MANIFEST_DIR/shaders");
 
diff --git a/src/linalg/contiguous.rs b/src/linalg/contiguous.rs
index 6322947..c9088ea 100644
--- a/src/linalg/contiguous.rs
+++ b/src/linalg/contiguous.rs
@@ -62,9 +62,9 @@ mod test {
     use crate::tensor::GpuTensor;
     use minislang::SlangCompiler;
     use nalgebra::DMatrix;
-    use slang_hal::{BufferUsages, Shader};
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Encoder};
+    use slang_hal::{BufferUsages, Shader};
     use wgpu::{Features, Limits};
 
     #[futures_test::test]
diff --git a/src/linalg/gemm.rs b/src/linalg/gemm.rs
index 41fa646..3496a6f 100644
--- a/src/linalg/gemm.rs
+++ b/src/linalg/gemm.rs
@@ -202,8 +202,8 @@ mod test {
     use approx::relative_eq;
     use minislang::SlangCompiler;
     use nalgebra::DMatrix;
-    use slang_hal::{BufferUsages, Shader};
     use slang_hal::backend::{Backend, Encoder, WebGpu};
+    use slang_hal::{BufferUsages, Shader};
     use wgpu::{Features, Limits};
 
     #[futures_test::test]
diff --git a/src/linalg/gemv.rs b/src/linalg/gemv.rs
index c239016..ff3d9a4 100644
--- a/src/linalg/gemv.rs
+++ b/src/linalg/gemv.rs
@@ -313,9 +313,9 @@ mod test {
     use approx::assert_relative_eq;
     use minislang::SlangCompiler;
     use nalgebra::{DMatrix, DVector};
-    use slang_hal::{BufferUsages, Shader};
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Encoder};
+    use slang_hal::{BufferUsages, Shader};
     use wgpu::{Features, Limits};
 
     #[futures_test::test]
diff --git a/src/linalg/op_assign.rs b/src/linalg/op_assign.rs
index 1bfba4c..6b52aec 100644
--- a/src/linalg/op_assign.rs
+++ b/src/linalg/op_assign.rs
@@ -159,9 +159,9 @@ mod test {
     use crate::tensor::GpuTensor;
     use minislang::SlangCompiler;
     use nalgebra::DVector;
+    use slang_hal::BufferUsages;
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Buffer, Encoder};
-    use slang_hal::BufferUsages;
     use slang_hal::shader::Shader;
 
     #[futures_test::test]
diff --git a/src/linalg/reduce.rs b/src/linalg/reduce.rs
index 0afe96d..90d2d01 100644
--- a/src/linalg/reduce.rs
+++ b/src/linalg/reduce.rs
@@ -57,10 +57,10 @@ mod test {
     use crate::tensor::GpuTensor;
     use minislang::SlangCompiler;
     use nalgebra::DVector;
-    use slang_hal::{BufferUsages, ShaderArgs};
     use slang_hal::backend::WebGpu;
     use slang_hal::backend::{Backend, Encoder};
     use slang_hal::shader::Shader;
+    use slang_hal::{BufferUsages, ShaderArgs};
 
     #[derive(ShaderArgs)]
     pub struct ReduceArgs<'a, B: Backend> {
diff --git a/src/shapes.rs b/src/shapes.rs
index 2580c9b..b4576e3 100644
--- a/src/shapes.rs
+++ b/src/shapes.rs
@@ -1,10 +1,10 @@
 //! Tensor shape definition.
 
+use slang_hal::BufferUsages;
 use slang_hal::backend::Backend;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use std::sync::Mutex;
-use slang_hal::BufferUsages;
 
 /// GGML dimension index mapping: converts between GGML and stensor dimension ordering.
 pub const GGML_IDS: [usize; 4] = [1, 0, 2, 3];
diff --git a/src/tensor.rs b/src/tensor.rs
index ca75dca..fc3a4a8 100644
--- a/src/tensor.rs
+++ b/src/tensor.rs
@@ -15,8 +15,8 @@ use slang_hal::backend::WebGpu;
 
 #[cfg(feature = "cuda")]
 use crate::cuda::Cuda;
-use slang_hal::{BufferUsages, ShaderArgs};
 use slang_hal::shader::ShaderArgsError;
+use slang_hal::{BufferUsages, ShaderArgs};
 
 /// Helper struct for creating gpu storage buffers (scalars, vectors, matrices, tensors).
 pub struct TensorBuilder {