xpu: do not use/require DPCPP_VERSION environment variable

Signed-off-by: Wang, Yi A <yi.a.wang@intel.com>

Author: sywangyi

build2cmake/src/templates/xpu/dep-cutlass-sycl.cmake

@@ -1,6 +1,15 @@
 find_package(CutlassSycl)
 
-set(CUTLASS_SYCL_REVISION "v{{ version }}" CACHE STRING "CUTLASS revision to use")
+if(DPCPP_VERSION STREQUAL "2025.2")
+  set(CUTLASS_SYCL_REVISION "v0.5" CACHE STRING "CUTLASS revision to use")
+elseif(DPCPP_VERSION STREQUAL "2025.1")
+  set(CUTLASS_SYCL_REVISION "v3.9-0.3" CACHE STRING "CUTLASS revision to use")
+elseif(DPCPP_VERSION STREQUAL "2025.0")
+  set(CUTLASS_SYCL_REVISION "v3.9-0.2" CACHE STRING "CUTLASS revision to use")
+else()
+  message(FATAL_ERROR "Unknown DPCPP_VERSION: ${DPCPP_VERSION}")
+endif()
+
 if (NOT CutlassSycl_FOUND)
   set(CUTLASS_ENABLE_HEADERS_ONLY ON CACHE BOOL "Enable only the header library")
   set(CUTLASS_ENABLE_BENCHMARKS OFF CACHE BOOL "Disable CUTLASS Benchmarks")

build2cmake/src/templates/xpu/preamble.cmake

@@ -4,9 +4,16 @@ cmake_minimum_required(VERSION 3.26)
 find_program(ICX_COMPILER icx)
 find_program(ICPX_COMPILER icpx)
 if(ICX_COMPILER AND ICPX_COMPILER)
+    execute_process(
+      COMMAND ${ICPX_COMPILER} --version
+      OUTPUT_VARIABLE ICPX_VERSION_OUTPUT
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    string(REGEX MATCH "[0-9]+\\.[0-9]+" DPCPP_VERSION "${ICPX_VERSION_OUTPUT}")
+    set(DPCPP_VERSION "${DPCPP_VERSION}" CACHE STRING "DPCPP major.minor version")
     set(CMAKE_C_COMPILER ${ICX_COMPILER})
     set(CMAKE_CXX_COMPILER ${ICPX_COMPILER})
-    message(STATUS "Using Intel SYCL C++ compiler: ${ICPX_COMPILER} and C compiler: ${ICX_COMPILER}")
+    message(STATUS "Using Intel SYCL C++ compiler: ${ICPX_COMPILER} and C compiler: ${ICX_COMPILER} Version: ${DPCPP_VERSION}")
 else()
     message(FATAL_ERROR "Intel SYCL C++ compiler (icpx) and/or C compiler (icx) not found. Please install Intel oneAPI toolkit.")
 endif()

build2cmake/src/torch/xpu.rs

@@ -1,5 +1,4 @@
 use std::collections::HashSet;
-use std::env;
 use std::io::Write;
 use std::path::PathBuf;
 
@@ -198,18 +197,8 @@ fn render_deps(env: &Environment, build: &Build, write: &mut impl Write) -> Resu
     for dep in deps {
         match dep {
             Dependencies::CutlassSycl => {
-                let dpcpp_version = env::var("DPCPP_VERSION").unwrap_or("2025.1".to_string());
-                let version = match dpcpp_version.as_str() {
-                    "2025.0" => "3.9-0.2",
-                    "2025.1" => "3.9-0.3",
-                    "2025.2" => "0.5",
-                    _ => bail!(
-                        "No cutlass_sycl version mapped for DPCPP_VERSION {}",
-                        dpcpp_version
-                    ),
-                };
                 env.get_template("xpu/dep-cutlass-sycl.cmake")?
-                    .render_to_write(context! { version => version }, &mut *write)?;
+                    .render_to_write(context! {}, &mut *write)?;
             }
             Dependencies::Torch => (),
             _ => {

lib/torch-extension/default.nix

@@ -164,7 +164,6 @@ stdenv.mkDerivation (prevAttrs: {
     // lib.optionalAttrs xpuSupport {
       MKLROOT = oneapi-torch-dev;
       SYCL_ROOT = oneapi-torch-dev;
-      DPCPP_VERSION = (lib.versions.majorMinor xpuPackages.intel-oneapi-dpcpp-cpp.version);
     };
 
   # If we use the default setup, CMAKE_CUDA_HOST_COMPILER gets set to nixpkgs g++.