Fix Windows pip mode by using intel-sycl-rt==2025.0.5 (#3424)

Signed-off-by: Anatoly Myachev <[email protected]>

Author: anmyachev

.github/workflows/pip-test-windows.yml

@@ -85,7 +85,7 @@ jobs:
           Invoke-BatchFile "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
           cd ${{ env.NEW_WORKSPACE }}
           cd python
-          pip install -U wheel pybind11 cython cmake 'setuptools>=65.6.1'
+          pip install -U wheel pybind11 cython cmake 'setuptools>=65.6.1' intel-sycl-rt==2025.0.5
           python setup.py -v bdist_wheel
           pip install (Get-Item ${{ env.NEW_WORKSPACE }}\python\dist\*.whl)
 

python/test/unit/tools/test_aot.py

@@ -103,15 +103,16 @@ def gen_kernel_library_xpu(dir, libname):
     cpp_files = glob.glob(os.path.join(dir, "*.cpp"))
     subprocess.run(
         ["g++"] + cpp_files + ["-I" + include_dir for include_dir in COMPILATION_HELPER.include_dir] +
-        ["-L" + COMPILATION_HELPER.libsycl_dir, "-c", "-lsycl", "-fPIC"],
+        ["-L" + dir for dir in COMPILATION_HELPER.libsycl_dir] + ["-c", "-lsycl", "-fPIC"],
         check=True,
         cwd=dir,
     )
     o_files = glob.glob(os.path.join(dir, "*.o"))
 
     subprocess.run(["g++"] + [*o_files, "-shared", "-o", libname] +
                    ["-L" + library_dir for library_dir in COMPILATION_HELPER.library_dir] +
-                   ["-L" + COMPILATION_HELPER.libsycl_dir, "-lsycl", "-lze_loader"], check=True, cwd=dir)
+                   ["-L" + dir
+                    for dir in COMPILATION_HELPER.libsycl_dir] + ["-lsycl", "-lze_loader"], check=True, cwd=dir)
 
 
 def gen_kernel_library(dir, libname):

python/triton/runtime/build.py

@@ -11,7 +11,7 @@ def is_xpu():
 
 def _cc_cmd(cc, src, out, include_dirs, library_dirs, libraries):
     if "cl.EXE" in cc or "clang-cl" in cc:
-        cc_cmd = [cc, "/Zc:__cplusplus", "/std:c++17", src, "/nologo", "/O2", "/LD", "/wd4996"]
+        cc_cmd = [cc, "/Zc:__cplusplus", "/std:c++17", src, "/nologo", "/O2", "/LD", "/wd4996", "/MD", "/EHsc"]
         cc_cmd += [f"/I{dir}" for dir in include_dirs]
         cc_cmd += [f"/Fo{os.path.join(os.path.dirname(out), 'main.obj')}"]
         cc_cmd += ["/link"]

third_party/intel/backend/driver.py

@@ -20,7 +20,7 @@
 __CACHE_VERSION = "1"
 
 
-def find_sycl(include_dir: list[str]) -> tuple[list[str], str]:
+def find_sycl(include_dir: list[str]) -> tuple[list[str], list[str]]:
     """
     Looks for the sycl library in known places.
 
@@ -34,7 +34,6 @@ def find_sycl(include_dir: list[str]) -> tuple[list[str], str]:
       AssertionError: if library was not found.
     """
     include_dir = include_dir.copy()
-    sycl_dir = None
     assertion_message = ("sycl headers not found, please install `icpx` compiler, "
                          "or provide `ONEAPI_ROOT` environment "
                          "or install `intel-sycl-rt>=2025.0.0` wheel")
@@ -44,7 +43,7 @@ def find_sycl(include_dir: list[str]) -> tuple[list[str], str]:
         compiler_root = os.path.abspath(f"{icpx_path}/../..")
         include_dir += [os.path.join(compiler_root, "include"), os.path.join(compiler_root, "include/sycl")]
         sycl_dir = os.path.join(compiler_root, "lib")
-        return include_dir, sycl_dir
+        return include_dir, [sycl_dir]
 
     oneapi_root = os.getenv("ONEAPI_ROOT")
     if oneapi_root:
@@ -53,7 +52,7 @@ def find_sycl(include_dir: list[str]) -> tuple[list[str], str]:
             os.path.join(oneapi_root, "compiler/latest/include/sycl")
         ]
         sycl_dir = os.path.join(oneapi_root, "compiler/latest/lib")
-        return include_dir, sycl_dir
+        return include_dir, [sycl_dir]
 
     try:
         sycl_rt = importlib.metadata.metadata("intel-sycl-rt")
@@ -63,18 +62,21 @@ def find_sycl(include_dir: list[str]) -> tuple[list[str], str]:
     if sycl_rt.get("version", "0.0.0").startswith("2024"):
         raise AssertionError(assertion_message)
 
+    sycl_dirs = []
     for f in importlib.metadata.files("intel-sycl-rt"):
         # sycl/sycl.hpp and sycl/CL/sycl.hpp results in both folders
         # being add: include and include/sycl.
         if f.name == "sycl.hpp":
             include_dir += [str(f.locate().parent.parent.resolve())]
-        if f.name in ["libsycl.so", "sycl8.dll"]:
+        if f.name in ["libsycl.so", "sycl8.dll", "sycl8.lib"]:
             sycl_dir = str(f.locate().parent.resolve())
             # should we handle `_` somehow?
             if os.name == "nt":
                 _ = os.add_dll_directory(sycl_dir)
+            sycl_dirs.append(sycl_dir)
 
-    return include_dir, sycl_dir
+    assert len(sycl_dirs) != 0
+    return include_dir, sycl_dirs
 
 
 class CompilationHelper:
@@ -86,7 +88,11 @@ def __init__(self):
         self._library_dir = None
         self._include_dir = None
         self._libsycl_dir = None
-        self.libraries = ['ze_loader', 'sycl']
+        self.libraries = ['ze_loader']
+        if os.name != "nt":
+            self.libraries += ["sycl"]
+        else:
+            self.libraries += ['sycl8']
 
     @property
     def inject_pytorch_dep(self):
@@ -100,7 +106,7 @@ def _compute_compilation_options_lazy(self):
         library_dir = []
         include_dir, self._libsycl_dir = find_sycl(include_dir)
         if self._libsycl_dir:
-            library_dir += [self._libsycl_dir]
+            library_dir += self._libsycl_dir
         if os.name == "nt":
             library_dir += [os.path.join(ze_root, "lib")]
 
@@ -133,7 +139,7 @@ def include_dir(self) -> list[str]:
         return self._include_dir
 
     @cached_property
-    def libsycl_dir(self) -> str:
+    def libsycl_dir(self) -> list[str]:
         self._compute_compilation_options_lazy
         return self._libsycl_dir
 
@@ -217,9 +223,9 @@ def compile_module_from_src(src, name):
             extra_compiler_args = []
             if COMPILATION_HELPER.libsycl_dir:
                 if os.name == "nt":
-                    extra_compiler_args += ["/LIBPATH:" + COMPILATION_HELPER.libsycl_dir]
+                    extra_compiler_args += ["/LIBPATH:" + dir for dir in COMPILATION_HELPER.libsycl_dir]
                 else:
-                    extra_compiler_args += ["-Wl,-rpath," + COMPILATION_HELPER.libsycl_dir]
+                    extra_compiler_args += ["-Wl,-rpath," + dir for dir in COMPILATION_HELPER.libsycl_dir]
 
             so = _build(name, src_path, tmpdir, COMPILATION_HELPER.library_dir, COMPILATION_HELPER.include_dir,
                         COMPILATION_HELPER.libraries, extra_compile_args=extra_compiler_args)