remove --build-dir option

Author: ndgrigorian

scripts/_build_helper.py

@@ -27,12 +27,12 @@ def run(cmd, env=None, cwd=None):
     )
 
 
-def warn(msg: str):
-    print(f"[build_locally][error] {msg}", file=sys.stderr)
+def warn(msg: str, script: str):
+    print(f"[{script}][error] {msg}", file=sys.stderr)
 
 
-def err(msg: str):
-    print(f"[build_locally][error] {msg}", file=sys.stderr)
+def err(msg: str, script: str):
+    print(f"[{script}][error] {msg}", file=sys.stderr)
 
 
 def resolve_compilers(
@@ -121,7 +121,8 @@ def install_editable(setup_dir, env):
     )
 
 
-def clean_build_dir(build_dir):
-    if os.path.exists(build_dir):
-        print(f"Cleaning build directory: {build_dir}")
-        shutil.rmtree(build_dir)
+def clean_build_dir(setup_dir):
+    target = os.path.join(setup_dir or os.getcwd(), "_skbuild")
+    if os.path.exists(target):
+        print(f"Cleaning build directory: {target}")
+        shutil.rmtree(target)

scripts/build_locally.py

@@ -121,11 +121,6 @@ def parse_args():
         help="Enable HIP backend. Architecture required to be specified.",
     )
 
-    p.add_argument(
-        "--build-dir",
-        default="build",
-        help="CMake build directory (default: build)",
-    )
     p.add_argument(
         "--clean",
         action="store_false",
@@ -141,22 +136,22 @@ def parse_args():
 
 
 def main():
+    name = "build_locally"
     if sys.platform not in ["cygwin", "win32", "linux"]:
-        err(f"{sys.platform} not supported")
+        err(f"{sys.platform} not supported", name)
     args = parse_args()
     setup_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    build_dir = os.path.join(setup_dir, args.build_dir)
 
     c_compiler, cxx_compiler, compiler_root = resolve_compilers(
         args.oneapi, args.c_compiler, args.cxx_compiler, args.compiler_root
     )
 
     # clean build dir if --clean set
     if args.clean:
-        clean_build_dir(build_dir)
+        clean_build_dir(setup_dir)
 
     if args.no_level_zero and args.target_level_zero:
-        err("Cannot combine --no-level-zero and --target-level-zero")
+        err("Cannot combine --no-level-zero and --target-level-zero", name)
 
     # Level Zero state (on unless explicitly disabled)
     if args.no_level_zero:
@@ -179,7 +174,7 @@ def main():
 
     # handle architecture conflicts
     if args.target_hip is not None and not args.target_hip.strip():
-        err("--target-hip requires an explicit architecture")
+        err("--target-hip requires an explicit architecture", name)
 
     # CUDA/HIP targets
     if args.target_cuda:
@@ -196,7 +191,7 @@ def main():
 
     # ignore pre-existing CMAKE_ARGS for determinism in build driver
     if "CMAKE_ARGS" in env and env["CMAKE_ARGS"].strip():
-        warn("Ignoring pre-existing CMAKE_ARGS in environment")
+        warn("Ignoring pre-existing CMAKE_ARGS in environment", name)
         del env["CMAKE_ARGS"]
 
     env["CMAKE_ARGS"] = cmake_args