[ci] Switch Windows build script to build.py

.github/workflows/scripts/build.py

@@ -11,17 +11,18 @@
 # -- third party --
 # -- own --
 from ci_common.dep import download_dep
-from ci_common.misc import banner, get_cache_home, is_manylinux2014
+from ci_common.misc import (banner, concat_paths, get_cache_home,
+                            is_manylinux2014)
 from ci_common.python import setup_python
 from ci_common.sccache import setup_sccache
 from ci_common.tinysh import Command, environ, git, sh
 
 
 # -- code --
-@banner('Setup LLVM')
-def setup_llvm(env_out: dict) -> None:
+@banner('Setup Clang')
+def setup_clang(env_out: dict) -> None:
     '''
-    Download and install LLVM.
+    Setup Clang.
     '''
     u = platform.uname()
     if u.system == 'Linux':
@@ -32,6 +33,30 @@ def setup_llvm(env_out: dict) -> None:
             lnsf('/usr/bin/clang++-10', '/usr/bin/clang++')
             lnsf('/usr/bin/clang-10', '/usr/bin/clang')
             lnsf('/usr/bin/ld.lld-10', '/usr/bin/ld.lld')
+    elif (u.system, u.machine) == ('Windows', 'AMD64'):
+        out = get_cache_home() / 'clang-15'
+        url = 'https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2022_clang/clang-15.0.0-win.zip'
+        download_dep(url, out)
+        env_out['PATH'] = concat_paths(out / 'bin', env_out.get('PATH'))
+        env_out[
+            'TAICHI_CMAKE_ARGS'] += ' -DCLANG_EXECUTABLE=clang++.exe'  # TODO: Can this be omitted?
+        env_out[
+            'TAICHI_CMAKE_ARGS'] += ' -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang'
+    else:
+        # TODO: unify all
+        pass
+
+
+@banner('Setup LLVM')
+def setup_llvm(env_out: dict) -> None:
+    '''
+    Download and install LLVM.
+    '''
+    u = platform.uname()
+    if u.system == 'Linux':
+        if 'AMDGPU_TEST' in os.environ:
+            # FIXME: AMDGPU bots are currently maintained separately,
+            #        we should unify them with the rest of the bots.
             env_out['LLVM_DIR'] = '/taichi-llvm-15'
             return
         elif is_manylinux2014():
@@ -47,10 +72,15 @@ def setup_llvm(env_out: dict) -> None:
     elif (u.system, u.machine) == ('Darwin', 'x86_64'):
         out = get_cache_home() / 'llvm15-mac'
         url = 'https://github.com/taichi-dev/taichi_assets/releases/download/llvm15/llvm-15-mac10.15.zip'
+    elif (u.system, u.machine) == ('Windows', 'AMD64'):
+        out = get_cache_home() / 'llvm15-win'
+        url = 'https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2019_clang/taichi-llvm-15.0.0-msvc2019.zip'
+        env_out['TAICHI_CMAKE_ARGS'] += " -DLLVM_AS_EXECUTABLE=llvm-as.exe"
     else:
         raise RuntimeError(f'Unsupported platform: {u.system} {u.machine}')
 
     download_dep(url, out, strip=1)
+    env_out['PATH'] = concat_paths(out / 'bin', env_out.get('PATH'))
     env_out['LLVM_DIR'] = str(out)
 
 
@@ -110,6 +140,7 @@ def main() -> None:
         'TAICHI_CMAKE_ARGS': os.environ.get('TAICHI_CMAKE_ARGS', ''),
         'PROJECT_NAME': os.environ.get('PROJECT_NAME', 'taichi'),
     }
+    setup_clang(env)
     setup_llvm(env)
     setup_vulkan(env)
     sccache = setup_sccache(env)

.github/workflows/scripts/ci_common/bootstrap.py

@@ -51,7 +51,7 @@ def chdir_to_root():
     root = Path('/')
     p = Path(__file__).resolve()
     while p != root:
-        if (p / '.git').exists():
+        if (p / 'setup.py').exists():
             os.chdir(p)
             break
         p = p.parent

.github/workflows/scripts/ci_common/dep.py

@@ -11,7 +11,7 @@
 
 # -- own --
 from .misc import get_cache_home
-from .tinysh import bash, sh, tar
+from .tinysh import bash, sh, start, tar
 
 
 # -- code --
@@ -55,7 +55,7 @@ def escape_url(url):
     return url.replace('/', '_').replace(':', '_')
 
 
-def download_dep(url, outdir, *, strip=0, force=False, args=[]):
+def download_dep(url, outdir, *, strip=0, force=False, args=None):
     '''
     Download a dependency archive from `url` and expand it to `outdir`,
     optionally stripping `strip` components.
@@ -73,22 +73,24 @@ def download_dep(url, outdir, *, strip=0, force=False, args=[]):
     depcache.mkdir(parents=True, exist_ok=True)
     local_cached = depcache / escaped
 
-    near_caches = [
-        f'http://botmaster.tgr:9000/misc/depcache/{escaped}/{name}'
-        f'https://taichi-bots.oss-cn-beijing.aliyuncs.com/depcache/{escaped}/{name}'
+    urls = [
+        f'http://botmaster.tgr:9000/misc/depcache/{escaped}/{name}',
+        f'https://taichi-bots.oss-cn-beijing.aliyuncs.com/depcache/{escaped}/{name}',
+        url,
     ]
 
-    if not local_cached.exists():
-        for u in near_caches:
-            try:
-                resp = requests.head(u, timeout=1)
-                if resp.ok:
-                    print('Using near cache: ', u)
-                    url = u
-                    break
-            except Exception:
-                pass
-
+    size = -1
+    for u in urls:
+        try:
+            resp = requests.head(u, timeout=1)
+            if resp.ok:
+                url = u
+                size = int(resp.headers['Content-Length'])
+                break
+        except Exception:
+            pass
+
+    if not local_cached.exists() or local_cached.stat().st_size != size:
         import tqdm
 
         with requests.get(url, stream=True) as r:
@@ -112,8 +114,12 @@ def download_dep(url, outdir, *, strip=0, force=False, args=[]):
         tar('-xzf', local_cached, '-C', outdir, f'--strip-components={strip}')
     elif name.endswith('.sh'):
         bash(local_cached, *args)
-    elif name.endswith('.exe') or '.' not in name:
+    elif '.' not in name and args is not None:
+        local_cached.chmod(0o755)
+        sh.bake(local_cached)(*args)
+    elif name.endswith('.exe') and args is not None:
         local_cached.chmod(0o755)
         sh.bake(local_cached)(*args)
+        # start(local_cached, *args)
     else:
         raise RuntimeError(f'Unknown file type: {name}')

.github/workflows/scripts/ci_common/misc.py

@@ -6,7 +6,7 @@
 import platform
 import sys
 from pathlib import Path
-from typing import Callable
+from typing import Any, Callable
 
 # -- third party --
 # -- own --
@@ -65,3 +65,10 @@ def wrapper(*args, **kwargs):
         return wrapper
 
     return decorate
+
+
+def concat_paths(*paths: Any) -> str:
+    '''
+    Concatenate paths together.
+    '''
+    return os.pathsep.join(str(p) for p in paths if p)

.github/workflows/scripts/ci_common/python.py

@@ -1,30 +1,44 @@
 # -*- coding: utf-8 -*-
 
-import os
 import platform
 import shutil
 from typing import Optional, Tuple
 
 from .dep import download_dep
-from .misc import banner, get_cache_home
+from .misc import banner, concat_paths, get_cache_home
 from .tinysh import Command, sh
 
 
 def setup_miniforge3(prefix):
     u = platform.uname()
     if u.system == "Linux":
         url = 'https://github.com/conda-forge/miniforge/releases/download/22.9.0-2/Miniforge3-22.9.0-2-Linux-x86_64.sh'
+        download_dep(url, prefix, args=['-bfp', str(prefix)])
     elif (u.system, u.machine) == ("Darwin", "arm64"):
         url = 'https://github.com/conda-forge/miniforge/releases/download/22.9.0-2/Miniforge3-22.9.0-2-MacOSX-arm64.sh'
+        download_dep(url, prefix, args=['-bfp', str(prefix)])
     elif (u.system, u.machine) == ("Darwin", "x86_64"):
         url = 'https://github.com/conda-forge/miniforge/releases/download/22.9.0-2/Miniforge3-22.9.0-2-MacOSX-x86_64.sh'
+        download_dep(url, prefix, args=['-bfp', str(prefix)])
     elif u.system == "Windows":
         url = 'https://github.com/conda-forge/miniforge/releases/download/22.9.0-2/Miniforge3-22.9.0-2-Windows-x86_64.exe'
+        download_dep(url,
+                     prefix,
+                     args=[
+                         '/S',
+                         '/InstallationType=JustMe',
+                         '/RegisterPython=0',
+                         '/KeepPkgCache=0',
+                         '/AddToPath=0',
+                         '/NoRegistry=1',
+                         '/NoShortcut=1',
+                         '/NoScripts=1',
+                         '/CheckPathLength=1',
+                         f'/D={prefix}',
+                     ])
     else:
         raise RuntimeError(f"Unsupported platform: {u.system} {u.machine}")
 
-    download_dep(url, prefix, args=['-bfp', str(prefix)])
-
 
 @banner('Setup Python {version}')
 def setup_python(env_out: dict,
@@ -34,9 +48,16 @@ def setup_python(env_out: dict,
     '''
     assert version
 
+    windows = platform.system() == "Windows"
+
     prefix = get_cache_home() / 'miniforge3'
     setup_miniforge3(prefix)
-    conda_path = prefix / 'bin' / 'conda'
+
+    if windows:
+        conda_path = prefix / 'Scripts' / 'conda.exe'
+    else:
+        conda_path = prefix / 'bin' / 'conda'
+
     if not conda_path.exists():
         shutil.rmtree(prefix, ignore_errors=True)
         setup_miniforge3(prefix)
@@ -46,12 +67,17 @@ def setup_python(env_out: dict,
     conda = sh.bake(str(conda_path))
 
     env = prefix / 'envs' / version
-    exe = env / 'bin' / 'python'
+    if windows:
+        exe = env / 'python.exe'
+        env_out['PATH'] = concat_paths(env, env / 'Scripts',
+                                       env_out.get('PATH'))
+    else:
+        exe = env / 'bin' / 'python'
+        env_out['PATH'] = concat_paths(env / 'bin', env_out.get('PATH'))
 
     if not exe.exists():
         conda.create('-y', '-n', version, f'python={version}')
 
-    env_out['PATH'] = f'{env / "bin"}:{env_out["PATH"]}'
     python = sh.bake(str(exe))
     pip = python.bake('-m', 'pip')
 

.github/workflows/scripts/ci_common/tinysh.py

@@ -2,6 +2,8 @@
 
 import os
 import platform
+import shutil
+import subprocess
 import sys
 from contextlib import contextmanager
 from typing import Any, Mapping, Sequence
@@ -78,7 +80,9 @@ def __call__(self, *moreargs: Sequence[str]) -> None:
         env = os.environ.copy()
         env.update(overlay)
 
-        code = os.spawnvpe(os.P_WAIT, args[0], args, env)
+        exe = shutil.which(args[0])
+        proc = subprocess.Popen(args, executable=exe, env=env)
+        code = proc.wait()
         if code:
             cmd = ' '.join([quote(v) for v in args])
             raise CommandFailed(cmd, code)
@@ -146,3 +150,4 @@ def sudo():
 sccache = sh.sccache
 tar = sh.tar
 bash = sh.bash
+start = sh.start.bake('/wait')

.github/workflows/scripts/win_build.ps1

@@ -5,8 +5,7 @@ param (
     [switch]$installVulkan = $false,
     [switch]$develop = $false,
     [switch]$install = $false,
-    [string]$libsDir = ".",
-    [string]$llvmVer = "10"
+    [string]$libsDir = "."
 )
 
 $ErrorActionPreference = "Stop"
@@ -49,26 +48,13 @@ function DownloadDep {
     }
 }
 
-if ($llvmVer -eq "10") {
-    DownloadDep LLVM llvm.zip taichi_llvm `
-        https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/taichi-llvm-10.0.0-msvc2019.zip
-    DownloadDep Clang clang.zip taichi_clang `
-        https://github.com/taichi-dev/taichi_assets/releases/download/llvm10/clang-10.0.0-win.zip
-    $env:LLVM_DIR = "$libsDir\taichi_llvm"
-	$env:TAICHI_CMAKE_ARGS += " -DCLANG_EXECUTABLE=$($libsDir -replace "\\", "\\")\\taichi_clang\\bin\\clang++.exe"
-	$env:TAICHI_CMAKE_ARGS += " -DLLVM_AS_EXECUTABLE=$($libsDir -replace "\\", "\\")\\taichi_llvm\\bin\\llvm-as.exe"
-} elseif ($llvmVer -eq "15") {
-    DownloadDep LLVM-15 llvm-15.zip taichi_llvm_15 `
-        https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2019_clang/taichi-llvm-15.0.0-msvc2019.zip
-    DownloadDep Clang-15 clang-15.zip taichi_clang_15 `
-		https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2022_clang/clang-15.0.0-win.zip
-    $env:LLVM_DIR = "$libsDir\taichi_llvm_15"
-	$env:TAICHI_CMAKE_ARGS += " -DCLANG_EXECUTABLE=$($libsDir -replace "\\", "\\")\\taichi_clang_15\\bin\\clang++.exe"
-	$env:TAICHI_CMAKE_ARGS += " -DLLVM_AS_EXECUTABLE=$($libsDir -replace "\\", "\\")\\taichi_llvm_15\\bin\\llvm-as.exe"
-} else {
-    throw "Unsupported LLVM version"
-}
-
+DownloadDep LLVM-15 llvm-15.zip taichi_llvm_15 `
+    https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2019_clang/taichi-llvm-15.0.0-msvc2019.zip
+DownloadDep Clang-15 clang-15.zip taichi_clang_15 `
+    https://github.com/python3kgae/taichi_assets/releases/download/llvm15_vs2022_clang/clang-15.0.0-win.zip
+$env:LLVM_DIR = "$libsDir\taichi_llvm_15"
+$env:TAICHI_CMAKE_ARGS += " -DCLANG_EXECUTABLE=$($libsDir -replace "\\", "\\")\\taichi_clang_15\\bin\\clang++.exe"
+$env:TAICHI_CMAKE_ARGS += " -DLLVM_AS_EXECUTABLE=$($libsDir -replace "\\", "\\")\\taichi_llvm_15\\bin\\llvm-as.exe"
 $env:TAICHI_CMAKE_ARGS += " -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang"
 
 if ($installVulkan) {