replicate old script behavior when calling setup.py

Author: ndgrigorian

scripts/_build_helper.py

@@ -70,25 +70,20 @@ def resolve_compilers(
 
 
 def make_cmake_args(
-    build_type="Release",
     c_compiler=None,
     cxx_compiler=None,
     level_zero=True,
     glog=False,
-    generator=None,
     verbose=False,
     other_opts="",
 ):
     args = [
-        f"-DCMAKE_BUILD_TYPE={build_type}",
         f"-DCMAKE_C_COMPILER:PATH={c_compiler}" if c_compiler else "",
         f"-DCMAKE_CXX_COMPILER:PATH={cxx_compiler}" if cxx_compiler else "",
         f"-DDPCTL_ENABLE_L0_PROGRAM_CREATION={'ON' if level_zero else 'OFF'}",
         f"-DDPTL_ENABLE_GLOG:BOOL={'ON' if glog else 'OFF'}",
     ]
 
-    if generator:
-        args.append(f"-G{generator}")
     if verbose:
         args.append("-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON")
     if other_opts:
@@ -97,9 +92,18 @@ def make_cmake_args(
     return " ".join(filter(None, args))
 
 
-def build_extension(setup_dir, env):
+def build_extension(
+    setup_dir, env, cmake_executable=None, generator=None, build_type=None
+):
+    cmd = [sys.executable, "setup.py", "build_ext", "--inplace"]
+    if cmake_executable:
+        cmd.append(f"--cmake-executable={cmake_executable}")
+    if generator:
+        cmd.append(f"--generator={generator}")
+    if build_type:
+        cmd.append(f"--build-type={build_type}")
     run(
-        [sys.executable, "setup.py", "build_ext", "--inplace"],
+        cmd,
         env=env,
         cwd=setup_dir,
     )

scripts/build_locally.py

@@ -161,12 +161,10 @@ def main():
         level_zero_enabled = True
 
     cmake_args = make_cmake_args(
-        build_type=args.build_type,
         c_compiler=c_compiler,
         cxx_compiler=cxx_compiler,
         level_zero=level_zero_enabled,
         glog=args.glog,
-        generator=args.generator,
         verbose=args.verbose,
         other_opts=args.cmake_opts,
     )
@@ -198,7 +196,13 @@ def main():
 
     print("[build_locally] Building extensions in-place...")
 
-    build_extension(setup_dir, env)
+    build_extension(
+        setup_dir,
+        env,
+        cmake_executable=args.cmake_executable,
+        generator=args.generator,
+        build_type=args.build_type,
+    )
     if not args.skip_editable:
         install_editable(setup_dir, env)
     else:

scripts/gen_coverage.py

@@ -79,6 +79,16 @@ def parse_args():
         help="Enable Level Zero backend explicitly",
     )
 
+    p.add_argument(
+        "--generator", type=str, default="Ninja", help="CMake generator"
+    )
+    p.add_argument(
+        "--cmake-executable",
+        type=str,
+        default=None,
+        help="Path to CMake executable used by build",
+    )
+
     p.add_argument(
         "--cmake-opts",
         type=str,
@@ -149,7 +159,6 @@ def main():
         level_zero_enabled = True
 
     cmake_args = make_cmake_args(
-        build_type="Coverage",
         c_compiler=c_compiler,
         cxx_compiler=cxx_compiler,
         level_zero=level_zero_enabled,
@@ -169,27 +178,21 @@ def main():
         warn("Ignoring pre-existing CMAKE_ARGS in environment")
         del env["CMAKE_ARGS"]
 
+    env["CMAKE_ARGS"] = cmake_args
+
     if args.bin_llvm:
-        llvm_cov = os.path.join(args.bin_llvm, "llvm-cov")
-        llvm_profdata = os.path.join(args.bin_llvm, "llvm-profdata")
-        env = os.environ.copy()
-        if not (os.path.isfile(llvm_cov) and os.access(llvm_cov, os.X_OK)):
-            err(f"Cannot find executable llvm-cov in {args.bin_llvm}")
-        if not (
-            os.path.isfile(llvm_profdata) and os.access(llvm_profdata, os.X_OK)
-        ):
-            err(f"Cannot find executable llvm-profdata in {args.bin_llvm}")
-        env["PATH"] = f"{args.bin_llvm}:{env.get('PATH', '')}"
+        env["PATH"] = ":".join((env.get("PATH", ""), args.bin_llvm))
         env["LLVM_TOOLS_HOME"] = args.bin_llvm
-        cmake_args += f" -DLLVM_TOOLS_HOME={args.bin_llvm}"
-        cmake_args += f" -DLLVM_PROFDATA={llvm_profdata}"
-        cmake_args += f" -DLLVM_COV={llvm_cov}"
-
-    env["CMAKE_ARGS"] = cmake_args
 
     print(f"[gen_coverage] Using CMake args:\n {env['CMAKE_ARGS']}")
 
-    build_extension(setup_dir, env)
+    build_extension(
+        setup_dir,
+        env,
+        cmake_executable=args.cmake_executable,
+        generator=args.generator,
+        build_type="Coverage",
+    )
     install_editable(setup_dir, env)
 
     cmake_build_dir = (