use common resolve_compilers utility

Author: ndgrigorian

scripts/_build_helper.py

@@ -20,13 +20,64 @@
 import sys
 
 
-def run(cmd, env=None, cwd=None):
+def resolve_compilers(
+    oneapi: bool,
+    c_compiler: str,
+    cxx_compiler: str,
+    compiler_root: str,
+):
+    is_linux = "linux" in sys.platform
+
+    if oneapi or (
+        c_compiler is None and cxx_compiler is None and compiler_root is None
+    ):
+        return "icx", ("icpx" if is_linux else "icx")
+
+    if (
+        (c_compiler is None or not os.path.isabs(c_compiler))
+        and (cxx_compiler is None or not os.path.isabs(cxx_compiler))
+        and (not compiler_root or not os.path.exists(compiler_root))
+    ):
+        raise RuntimeError(
+            "--compiler-root option must be set when using non-default DPC++ "
+            "layout unless absolute paths are provided for both compilers"
+        )
+
+    # default values
+    if c_compiler is None:
+        c_compiler = "icx"
+    if cxx_compiler is None:
+        cxx_compiler = "icpx" if is_linux else "icx"
+
+    for name, opt_name in (
+        (c_compiler, "--c-compiler"),
+        (cxx_compiler, "--cxx-compiler"),
+    ):
+        if os.path.isabs(name):
+            path = name
+        else:
+            path = os.path.join(compiler_root, name)
+        if not os.path.exists(path):
+            raise RuntimeError(f"{opt_name} value {name} not found")
+    return c_compiler, cxx_compiler
+
+
+def run(cmd: list[str], env: dict[str, str] = None, cwd: str = None):
     print("+", " ".join(cmd))
     subprocess.check_call(
         cmd, env=env or os.environ.copy(), cwd=cwd or os.getcwd()
     )
 
 
+def get_output(cmd: list[str], cwd: str = None):
+    print("+", " ".join(cmd))
+    return (
+        subprocess.check_output(cmd, cwd=cwd or os.getcwd())
+        .decode("utf-8")
+        .strip("\n")
+    )
+
+
 def warn(msg: str, script: str):
     print(f"[{script}][warning] {msg}", file=sys.stderr)
 
@@ -36,12 +87,12 @@ def err(msg: str, script: str):
 
 
 def make_cmake_args(
-    c_compiler=None,
-    cxx_compiler=None,
-    level_zero=True,
-    glog=False,
-    verbose=False,
-    other_opts="",
+    c_compiler: str = None,
+    cxx_compiler: str = None,
+    level_zero: bool = True,
+    glog: bool = False,
+    verbose: bool = False,
+    other_opts: str = None,
 ):
     args = [
         f"-DCMAKE_C_COMPILER:PATH={c_compiler}" if c_compiler else "",
@@ -59,7 +110,11 @@ def make_cmake_args(
 
 
 def build_extension(
-    setup_dir, env, cmake_executable=None, generator=None, build_type=None
+    setup_dir: str,
+    env: dict[str, str],
+    cmake_executable: str = None,
+    generator: str = None,
+    build_type: str = None,
 ):
     cmd = [sys.executable, "setup.py", "build_ext", "--inplace"]
     if cmake_executable:
@@ -75,7 +130,7 @@ def build_extension(
     )
 
 
-def install_editable(setup_dir, env):
+def install_editable(setup_dir: str, env: dict[str, str]):
     run(
         [
             sys.executable,
@@ -91,7 +146,7 @@ def install_editable(setup_dir, env):
     )
 
 
-def clean_build_dir(setup_dir):
+def clean_build_dir(setup_dir: str = None):
     target = os.path.join(setup_dir or os.getcwd(), "_skbuild")
     if os.path.exists(target):
         print(f"Cleaning build directory: {target}")

scripts/build_locally.py

@@ -27,44 +27,11 @@
     err,
     install_editable,
     make_cmake_args,
+    resolve_compilers,
     warn,
 )
 
 
-def resolve_compilers(
-    oneapi: bool, c_compiler: str, cxx_compiler: str, compiler_root: str
-):
-    is_linux = "linux" in sys.platform
-
-    if oneapi or (
-        c_compiler is None and cxx_compiler is None and compiler_root is None
-    ):
-        return "icx", ("icpx" if is_linux else "icx")
-
-    if not compiler_root or not os.path.exists(compiler_root):
-        raise RuntimeError(
-            "--compiler-root option must be set when using non-default DPC++ "
-            "layout"
-        )
-
-    # default values
-    if c_compiler is None:
-        c_compiler = "icx"
-    if cxx_compiler is None:
-        cxx_compiler = "icpx" if is_linux else "icx"
-
-    for name, opt_name in (
-        (c_compiler, "--c-compiler"),
-        (cxx_compiler, "--cxx-compiler"),
-    ):
-        path = (
-            name if os.path.exists(name) else os.path.join(compiler_root, name)
-        )
-        if not os.path.exists(path):
-            raise RuntimeError(f"{opt_name} value {name} not found")
-    return c_compiler, cxx_compiler
-
-
 def parse_args():
     p = argparse.ArgumentParser(description="Local dpctl build driver")
 
@@ -157,7 +124,7 @@ def parse_args():
     p.add_argument(
         "--clean",
         action="store_true",
-        help="Remove build dir before rebuild (default: False)",
+        help="Remove build dir before rebuild",
     )
     p.add_argument(
         "--skip-editable",

scripts/gen_coverage.py

@@ -28,70 +28,34 @@
     build_extension,
     clean_build_dir,
     err,
+    get_output,
     install_editable,
     make_cmake_args,
+    resolve_compilers,
     run,
     warn,
 )
 
 
-def find_bin_llvm(compiler_name):
-    icx_path = subprocess.check_output(["which", compiler_name])
-    bin_dir = os.path.dirname(icx_path)
-    compiler_dir = os.path.join(bin_dir.decode("utf-8"), "compiler")
+def find_bin_llvm(compiler):
+    if os.path.isabs(compiler):
+        bin_dir = os.path.dirname(compiler)
+    else:
+        compiler_path = get_output(["which", compiler])
+        if not compiler_path:
+            raise RuntimeError(f"Compiler {compiler} not found in PATH")
+        bin_dir = os.path.dirname(compiler_path)
+    compiler_dir = os.path.join(bin_dir, "compiler")
     if os.path.exists(compiler_dir):
         bin_llvm = compiler_dir
     else:
         bin_dir = os.path.dirname(bin_dir)
-        bin_llvm = os.path.join(bin_dir.decode("utf-8"), "bin-llvm")
-    assert os.path.exists(bin_llvm)
+        bin_llvm = os.path.join(bin_dir, "bin-llvm")
+    if not os.path.exists(bin_llvm):
+        raise RuntimeError(f"--bin-llvm value {bin_llvm} not found")
     return bin_llvm
 
 
-def resolve_compilers(
-    oneapi: bool,
-    c_compiler: str,
-    cxx_compiler: str,
-    compiler_root: str,
-    bin_llvm: str = None,
-):
-    is_linux = "linux" in sys.platform
-
-    if oneapi or (
-        c_compiler is None
-        and cxx_compiler is None
-        and compiler_root is None
-        and bin_llvm is None
-    ):
-        return "icx", ("icpx" if is_linux else "icx"), find_bin_llvm("icx")
-
-    if not compiler_root or not os.path.exists(compiler_root):
-        raise RuntimeError(
-            "--compiler-root option must be set when using non-default DPC++ "
-            "layout"
-        )
-
-    # default values
-    if c_compiler is None:
-        c_compiler = "icx"
-    if cxx_compiler is None:
-        cxx_compiler = "icpx" if is_linux else "icx"
-    if bin_llvm is None:
-        bin_llvm = find_bin_llvm(c_compiler)
-
-    for name, opt_name in (
-        (c_compiler, "--c-compiler"),
-        (cxx_compiler, "--cxx-compiler"),
-        (bin_llvm, "--bin-llvm"),
-    ):
-        path = (
-            name if os.path.exists(name) else os.path.join(compiler_root, name)
-        )
-        if not os.path.exists(path):
-            raise RuntimeError(f"{opt_name} value {name} not found")
-    return c_compiler, cxx_compiler, bin_llvm
-
-
 def parse_args():
     p = argparse.ArgumentParser(description="Build dpctl and generate coverage")
 
@@ -177,13 +141,13 @@ def main():
     args = parse_args()
     setup_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-    c_compiler, cxx_compiler, bin_llvm = resolve_compilers(
+    c_compiler, cxx_compiler = resolve_compilers(
         args.oneapi,
         args.c_compiler,
         args.cxx_compiler,
         args.compiler_root,
-        args.bin_llvm,
     )
+    bin_llvm = find_bin_llvm(c_compiler)
 
     if args.clean:
         clean_build_dir(setup_dir)
@@ -246,6 +210,12 @@ def main():
         .decode("utf-8")
         .strip("\n")
     )
+
+    cmake_build_dir = get_output(
+        ["find", "_skbuild", "-name", "cmake-build"],
+        cwd=setup_dir,
+    )
+
     print(f"[gen_coverage] Found CMake build dir: {cmake_build_dir}")
 
     run(