Skip to content

Commit c5462f1

Browse files
authored
[Fix] Rename remaining CUTLASS references to sycl-tla in XPU templates and nix (#492)
1 parent 3ee0b27 commit c5462f1

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

kernel-builder/src/pyproject/templates/xpu/dep-sycl-tla.cmake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ if(GPU_LANG STREQUAL "SYCL")
33
find_package(SyclTla)
44

55
if(DPCPP_VERSION STREQUAL "2025.3")
6-
set(SYCL_TLA_REVISION "v0.8" CACHE STRING "CUTLASS revision to use")
6+
set(SYCL_TLA_REVISION "v0.8" CACHE STRING "sycl-tla revision to use")
77
else()
88
message(FATAL_ERROR "Unknown DPCPP_VERSION: ${DPCPP_VERSION}")
99
endif()
1010

1111
if (NOT SyclTla_FOUND)
1212
set(CUTLASS_ENABLE_HEADERS_ONLY ON CACHE BOOL "Enable only the header library")
13-
set(CUTLASS_ENABLE_BENCHMARKS OFF CACHE BOOL "Disable CUTLASS Benchmarks")
14-
# Use the specified CUTLASS source directory for compilation if SYCL_TLA_SRC_DIR is provided
13+
set(CUTLASS_ENABLE_BENCHMARKS OFF CACHE BOOL "Disable sycl-tla Benchmarks")
14+
# Use the specified sycl-tla source directory for compilation if SYCL_TLA_SRC_DIR is provided
1515
if (DEFINED ENV{SYCL_TLA_SRC_DIR})
1616
set(SYCL_TLA_SRC_DIR $ENV{SYCL_TLA_SRC_DIR})
1717
endif()
@@ -23,26 +23,26 @@ if (NOT SyclTla_FOUND)
2323
message(STATUS "The SYCL_TLA_SRC_DIR is set, using ${SYCL_TLA_SRC_DIR} for compilation")
2424
FetchContent_Declare(cutlass SOURCE_DIR ${SYCL_TLA_SRC_DIR})
2525
else()
26-
# Speed up CUTLASS download by retrieving only the specified GIT_TAG instead of the history.
26+
# Speed up sycl-tla download by retrieving only the specified GIT_TAG instead of the history.
2727
# Important: If GIT_SHALLOW is enabled then GIT_TAG works only with branch names and tags.
2828
# So if the GIT_TAG above is updated to a commit hash, GIT_SHALLOW must be set to FALSE
2929
if(SYCL_TLA_REVISION MATCHES "^v")
30-
set(CUTLASS_GIT_SHALLOW TRUE)
30+
set(SYCL_TLA_GIT_SHALLOW TRUE)
3131
else()
32-
set(CUTLASS_GIT_SHALLOW FALSE)
32+
set(SYCL_TLA_GIT_SHALLOW FALSE)
3333
endif()
3434
FetchContent_Declare(
3535
cutlass
3636
GIT_REPOSITORY https://github.com/intel/sycl-tla.git
3737
GIT_TAG ${SYCL_TLA_REVISION}
3838
GIT_PROGRESS TRUE
39-
GIT_SHALLOW ${CUTLASS_GIT_SHALLOW}
39+
GIT_SHALLOW ${SYCL_TLA_GIT_SHALLOW}
4040
)
4141
endif()
4242

4343
# Set Intel backend env
4444
message(STATUS "Setting Intel GPU optimization env vars for sycl-tla")
45-
set(CUTLASS_ENABLE_SYCL ON CACHE BOOL "Enable SYCL for CUTLASS")
45+
set(CUTLASS_ENABLE_SYCL ON CACHE BOOL "Enable SYCL for sycl-tla")
4646
add_compile_definitions(CUTLASS_ENABLE_SYCL=1)
4747
set(DPCPP_SYCL_TARGET "intel_gpu_bmg_g21,intel_gpu_pvc" CACHE STRING "SYCL target for Intel GPU")
4848
add_compile_definitions(DPCPP_SYCL_TARGET=intel_gpu_bmg_g21,intel_gpu_pvc)

nix-builder/pkgs/xpu-packages/sycl-tla.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@
1212

1313
let
1414
dpcppVersion = oneapi-torch-dev.version;
15-
cutlassVersions = {
15+
syclTlaVersions = {
1616
"2025.3" = {
1717
version = "0.8";
1818
hash = "sha256-xXAxIDBesjDDOIa6/YsGznyW+5+NpaO1L96lBuqRzrk=";
1919
};
2020
};
21-
cutlassVersion =
22-
cutlassVersions.${lib.versions.majorMinor dpcppVersion}
21+
syclTlaVersion =
22+
syclTlaVersions.${lib.versions.majorMinor dpcppVersion}
2323
or (throw "Unsupported DPC++ version: ${dpcppVersion}");
2424
in
2525

2626
stdenv.mkDerivation rec {
2727
pname = "sycl-tla";
28-
inherit (cutlassVersion) version;
28+
inherit (syclTlaVersion) version;
2929

3030
src = fetchFromGitHub (
3131
{
3232
owner = "intel";
3333
repo = "sycl-tla";
34-
inherit (cutlassVersion) hash;
34+
inherit (syclTlaVersion) hash;
3535
}
3636
// (
37-
if cutlassVersion ? rev then
38-
{ inherit (cutlassVersion) rev; }
37+
if syclTlaVersion ? rev then
38+
{ inherit (syclTlaVersion) rev; }
3939
else
40-
{ tag = "v${cutlassVersion.version}"; }
40+
{ tag = "v${syclTlaVersion.version}"; }
4141
)
4242
);
4343

0 commit comments

Comments
 (0)