From 970929f105e6fd82ca2c5912fea586381965cdfd Mon Sep 17 00:00:00 2001
From: Hiroshi Shinaoka <h.shinaoka@gmail.com>
Date: Mon, 22 Jun 2026 21:12:18 +0900
Subject: [PATCH] Fix t4a CubeCL xtask package selectors

---
 xtask/src/commands/build.rs | 16 +++++-----------
 xtask/src/commands/check.rs | 20 ++++++--------------
 xtask/src/commands/test.rs  | 10 ++++++----
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/xtask/src/commands/build.rs b/xtask/src/commands/build.rs
index 7b73d7f866..8e0ae39649 100644
--- a/xtask/src/commands/build.rs
+++ b/xtask/src/commands/build.rs
@@ -14,21 +14,15 @@ pub(crate) fn handle_command(
 ) -> anyhow::Result<()> {
     if args.ci {
         // Exclude crates that are not supported on CI
-        args.exclude
-            .extend(vec!["cubecl-cuda".to_string(), "cubecl-hip".to_string()]);
+        args.exclude.extend(vec![
+            "t4a-cubecl-cuda".to_string(),
+            "cubecl-hip".to_string(),
+        ]);
     }
     base_commands::build::handle_command(args.try_into().unwrap(), env, context)?;
     // Specific additional commands to test specific features
-    // burn-wgpu with SPIR-V
     helpers::custom_crates_build(
-        vec!["cubecl-wgpu"],
-        vec!["--features", "spirv"],
-        None,
-        None,
-        "std with SPIR-V compiler",
-    )?;
-    helpers::custom_crates_build(
-        vec!["cubecl-runtime"],
+        vec!["t4a-cubecl-runtime"],
         vec!["--no-default-features"],
         None,
         None,
diff --git a/xtask/src/commands/check.rs b/xtask/src/commands/check.rs
index 89774d7c0a..70171c9e79 100644
--- a/xtask/src/commands/check.rs
+++ b/xtask/src/commands/check.rs
@@ -14,32 +14,24 @@ pub(crate) fn handle_command(
 ) -> anyhow::Result<()> {
     if args.ci {
         // Exclude crates that are not supported on CI
-        args.exclude
-            .extend(vec!["cubecl-cuda".to_string(), "cubecl-hip".to_string()]);
+        args.exclude.extend(vec![
+            "t4a-cubecl-cuda".to_string(),
+            "cubecl-hip".to_string(),
+        ]);
     }
     base_commands::check::handle_command(args.try_into().unwrap(), env, context)?;
     // Specific additional commands to test specific features
-    // cubecl-wgpu with SPIR-V
     // cubecl-wgpu with exclusive-memory-only
     // cubecl-runtime without default features
-    // Disabled on MacOS see:
-    #[cfg(not(target_os = "macos"))]
     helpers::custom_crates_check(
-        vec!["cubecl-wgpu"],
-        vec!["--features", "spirv"],
-        None,
-        None,
-        "std with SPIR-V compiler",
-    )?;
-    helpers::custom_crates_check(
-        vec!["cubecl-wgpu"],
+        vec!["t4a-cubecl-wgpu"],
         vec!["--features", "exclusive-memory-only"],
         None,
         None,
         "std with exclusive_memory_only",
     )?;
     helpers::custom_crates_check(
-        vec!["cubecl-runtime"],
+        vec!["t4a-cubecl-runtime"],
         vec!["--no-default-features"],
         None,
         None,
diff --git a/xtask/src/commands/test.rs b/xtask/src/commands/test.rs
index 539c5ad052..4f0885062b 100644
--- a/xtask/src/commands/test.rs
+++ b/xtask/src/commands/test.rs
@@ -15,20 +15,22 @@ pub(crate) fn handle_command(
     if args.miri.is_some() {
         // miri tests
         args.target = Target::Crates;
-        args.only.extend(vec!["cubecl-common".to_string()]);
+        args.only.extend(vec!["t4a-cubecl-common".to_string()]);
         base_commands::test::handle_command(args.try_into().unwrap(), env, context)?;
     } else {
         // conventional tests
         if args.ci {
             // Exclude crates that are not supported on CI
-            args.exclude
-                .extend(vec!["cubecl-cuda".to_string(), "cubecl-hip".to_string()]);
+            args.exclude.extend(vec![
+                "t4a-cubecl-cuda".to_string(),
+                "cubecl-hip".to_string(),
+            ]);
         }
         base_commands::test::handle_command(args.try_into().unwrap(), env, context)?;
         // Specific additional commands to test specific features
         // cubecl-wgpu with exclusive-memory-only
         helpers::custom_crates_tests(
-            vec!["cubecl-wgpu"],
+            vec!["t4a-cubecl-wgpu"],
             vec!["--features", "exclusive-memory-only", "--lib"],
             None,
             None,