More ways to find MSVC and Python

Author: woct0rdho

.gitignore

@@ -73,3 +73,4 @@ docs/sg_execution_times.rst
 .tmp
 /main.*
 /*.mlir
+/wheelhouse

python/triton/runtime/build.py

@@ -43,6 +43,12 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
     # try to avoid setuptools if possible
     cc = os.environ.get("CC")
     if cc is None:
+        # Users may not know how to add cl to PATH. Let's do it for them
+        if os.name == "nt":
+            msvc_winsdk_inc_dirs, _ = find_msvc_winsdk()
+            if msvc_winsdk_inc_dirs:
+                cl_path = msvc_winsdk_inc_dirs[0].replace(r"\include", r"\bin\Hostx64\x64")
+            os.environ["PATH"] = cl_path + os.pathsep + os.environ["PATH"]
         # TODO: support more things here.
         cl = shutil.which("cl")
         gcc = shutil.which("gcc")
@@ -63,6 +69,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
     include_dirs = include_dirs + [srcdir, py_include_dir]
     if os.name == "nt":
         library_dirs += [os.path.join(sysconfig.get_paths()["data"], "libs")]
+        library_dirs += [os.path.join(os.path.dirname(sys.executable), "libs")]
+        python_version = sysconfig.get_python_version().replace(".", "")
+        library_dirs += [fr"C:\Python{python_version}\libs"]
         msvc_winsdk_inc_dirs, msvc_winsdk_lib_dirs = find_msvc_winsdk()
         include_dirs += msvc_winsdk_inc_dirs
         library_dirs += msvc_winsdk_lib_dirs

python/triton/runtime/windows.py

@@ -33,6 +33,8 @@ def find_msvc_base_vswhere():
         "*",
         "-requires",
         "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+        "-requires",
+        "Microsoft.VisualStudio.Component.Windows10SDK",
         "-latest",
         "-property",
         "installationPath",
@@ -49,7 +51,7 @@ def find_msvc_base_vswhere():
 
 
 def find_msvc_base_envpath():
-    paths = os.environ.get("PATH", "").split(";")
+    paths = os.environ.get("PATH", "").split(os.pathsep)
     for path in paths:
         path = path.replace("/", "\\")
         match = re.compile(r".*\\VC\\Tools\\MSVC\\").match(path)