Fixed path errors when building windows wheel.

Author: Fantasy201

maintenance_scripts/repair_windows_wheel.py

@@ -5,7 +5,7 @@
 Responsibilities:
 1. Locate the MSVC LLVM OpenMP DLL (libomp140.x86_64.dll) via vswhere or
    well-known fallback paths on GitHub-hosted runners.
-2. Run `delvewheel repair --add-path <dir>` to bundle it into the wheel.
+2. Run `python -m delvewheel repair --add-path <dir>` to bundle it into the wheel.
 3. If delvewheel does not produce a repaired wheel (DLL not found, or the
    wheel has no external dependencies), copy the built wheel as-is so that
    cibuildwheel always finds something in dest_dir.
@@ -21,6 +21,30 @@
 import sys
 from pathlib import Path
 
+_MSVC_OMP_DLL_NAMES = (
+    "libomp140.x86_64.dll",
+    "libomp140.dll",
+)
+
+
+# ---------------------------------------------------------------------------
+# delvewheel invocation
+# ---------------------------------------------------------------------------
+
+def _delvewheel_cmd(*args: str) -> list[str]:
+    """Invoke delvewheel via the active Python (Scripts/ may be off PATH)."""
+    return [sys.executable, "-m", "delvewheel", *args]
+
+
+def _run_delvewheel(args: list[str]) -> subprocess.CompletedProcess | None:
+    cmd = _delvewheel_cmd(*args)
+    print(f"[repair] Running: {' '.join(cmd)}")
+    try:
+        return subprocess.run(cmd, check=False)
+    except FileNotFoundError as exc:
+        print(f"[repair] delvewheel launch failed: {exc}", file=sys.stderr)
+        return None
+
 
 # ---------------------------------------------------------------------------
 # DLL discovery
@@ -30,18 +54,14 @@ def _find_vswhere() -> Path | None:
     """Return the path to vswhere.exe, or None if not found."""
     candidates = []
 
-    # The canonical env var on Windows is "ProgramFiles(x86)"; os.environ gives
-    # it under that exact key (parentheses and all).
     pf86 = os.environ.get("ProgramFiles(x86)") or os.environ.get("PROGRAMFILES(X86)")
     if pf86:
         candidates.append(Path(pf86) / "Microsoft Visual Studio" / "Installer" / "vswhere.exe")
 
-    # Some shells expose a sanitised name instead.
     pf86b = os.environ.get("PROGRAMFILES_X86")
     if pf86b:
         candidates.append(Path(pf86b) / "Microsoft Visual Studio" / "Installer" / "vswhere.exe")
 
-    # Hard-coded last resort (GitHub-hosted Windows runners, VS2022 Enterprise).
     candidates.append(Path("C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe"))
 
     for p in candidates:
@@ -51,40 +71,68 @@ def _find_vswhere() -> Path | None:
 
 
 def _find_omp_dll_via_vswhere(vswhere: Path) -> Path | None:
-    """Ask vswhere for the LLVM OpenMP DLL bundled with MSVC tools."""
+    """Locate MSVC libomp140*.dll under the active Visual Studio install."""
+    for pattern in (
+        r"VC\Tools\Llvm\x64\bin\libomp140.x86_64.dll",
+        r"VC\Tools\Llvm\x64\bin\libomp140.dll",
+    ):
+        try:
+            result = subprocess.run(
+                [
+                    str(vswhere),
+                    "-latest",
+                    "-products",
+                    "*",
+                    "-requires",
+                    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+                    "-find",
+                    pattern,
+                ],
+                capture_output=True,
+                text=True,
+                timeout=30,
+            )
+        except Exception as exc:
+            print(f"[repair] vswhere failed for {pattern}: {exc}", file=sys.stderr)
+            continue
+
+        for line in result.stdout.splitlines():
+            p = Path(line.strip())
+            if p.is_file() and p.name.lower() in _MSVC_OMP_DLL_NAMES:
+                print(f"[repair] Found DLL via vswhere: {p}")
+                return p
+
     try:
         result = subprocess.run(
-            [
-                str(vswhere),
-                "-latest", "-products", "*",
-                "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-                # vswhere -find uses Windows path separators and glob patterns.
-                "-find", r"VC\Tools\Llvm\x64\bin\libomp140.x86_64.dll",
-            ],
+            [str(vswhere), "-latest", "-products", "*", "-property", "installationPath"],
             capture_output=True,
             text=True,
             timeout=30,
+            check=False,
         )
+        install_root = Path(result.stdout.strip())
     except Exception as exc:
-        print(f"[repair] vswhere failed: {exc}", file=sys.stderr)
+        print(f"[repair] vswhere installationPath lookup failed: {exc}", file=sys.stderr)
         return None
 
-    for line in result.stdout.splitlines():
-        p = Path(line.strip())
-        if p.is_file():
-            print(f"[repair] Found DLL via vswhere: {p}")
-            return p
+    if install_root.is_dir():
+        for name in _MSVC_OMP_DLL_NAMES:
+            matches = sorted(install_root.glob(f"VC/Tools/Llvm/**/bin/{name}"))
+            if matches:
+                print(f"[repair] Found DLL under VS install root: {matches[0]}")
+                return matches[0]
+
     return None
 
 
 def _find_omp_dll_fallback() -> Path | None:
-    """Walk well-known hard-coded paths on GitHub-hosted runners."""
+    """Walk well-known MSVC LLVM OpenMP paths on GitHub-hosted runners."""
     candidates = [
         "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/libomp140.x86_64.dll",
+        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/Llvm/x64/bin/libomp140.dll",
         "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/Llvm/x64/bin/libomp140.x86_64.dll",
         "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Tools/Llvm/x64/bin/libomp140.x86_64.dll",
         "C:/Program Files/LLVM/bin/libomp140.x86_64.dll",
-        "C:/Program Files/LLVM/bin/libomp.dll",
     ]
     for c in candidates:
         p = Path(c)
@@ -101,7 +149,7 @@ def find_omp_dll() -> Path | None:
         dll = _find_omp_dll_via_vswhere(vswhere)
         if dll:
             return dll
-        print("[repair] vswhere did not find the DLL; trying fallback paths...")
+        print("[repair] vswhere did not find libomp140*.dll; trying fallback paths...")
     else:
         print("[repair] vswhere.exe not found; trying fallback paths...")
     return _find_omp_dll_fallback()
@@ -113,14 +161,13 @@ def find_omp_dll() -> Path | None:
 
 def run_delvewheel(dest: Path, wheel: Path, omp_bin: Path | None) -> bool:
     """Run delvewheel; return True if it produced at least one wheel."""
-    cmd = ["delvewheel", "repair", "-w", str(dest)]
+    args = ["repair", "-w", str(dest)]
     if omp_bin:
-        cmd += ["--add-path", str(omp_bin)]
-    cmd.append(str(wheel))
+        args += ["--add-path", str(omp_bin)]
+    args.append(str(wheel))
 
-    print(f"[repair] Running: {' '.join(cmd)}")
-    result = subprocess.run(cmd)
-    if result.returncode != 0:
+    result = _run_delvewheel(args)
+    if result is not None and result.returncode != 0:
         print(f"[repair] delvewheel exited with code {result.returncode} (continuing...)")
 
     return bool(sorted(dest.glob("*.whl")))
@@ -139,21 +186,18 @@ def main() -> int:
         print(f"[repair] Source wheel not found: {wheel}", file=sys.stderr)
         return 1
 
-    # --- Step 1: try to find the OpenMP DLL ---
     omp_dll = find_omp_dll()
     omp_bin = omp_dll.parent if omp_dll else None
     if omp_bin:
         print(f"[repair] Bundling OpenMP from: {omp_bin}")
     else:
-        print("[repair] WARNING: OpenMP DLL not found; wheel will be built without it")
+        print("[repair] WARNING: libomp140*.dll not found; repair may miss OpenMP runtime")
 
-    # --- Step 2: run delvewheel ---
     if run_delvewheel(dest, wheel, omp_bin):
         repaired = sorted(dest.glob("*.whl"))[0]
         print(f"[repair] Repaired wheel (delvewheel): {repaired}")
         return _finalize_repaired_wheel(repaired)
 
-    # --- Step 3: safety net — copy built wheel as-is ---
     print("[repair] delvewheel did not emit a wheel; copying built wheel as-is.")
     target = dest / wheel.name
     shutil.copy2(wheel, target)
@@ -187,7 +231,10 @@ def _verify_bundled_openmp(wheel_path: Path) -> None:
 
 def _finalize_repaired_wheel(wheel_path: Path) -> int:
     print("=== delvewheel show repaired wheel ===")
-    subprocess.run(["delvewheel", "show", str(wheel_path)], check=True)
+    result = _run_delvewheel(["show", str(wheel_path)])
+    if result is None or result.returncode != 0:
+        print("[repair] ERROR: delvewheel show failed", file=sys.stderr)
+        return 1
     _verify_bundled_openmp(wheel_path)
     return 0
 

tests/test_build_release_boundaries.py

@@ -32,6 +32,8 @@ def test_macos_wheel_repair_fails_instead_of_copying_unrepaired_wheel():
     assert 'CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python maintenance_scripts/repair_windows_wheel.py' in source
     repair_script = (repo_root / "maintenance_scripts" / "repair_windows_wheel.py").read_text()
     assert "delvewheel did not emit a wheel; copying built wheel as-is" in repair_script
+    assert '"-m", "delvewheel"' in repair_script or "'-m', 'delvewheel'" in repair_script
+    assert "libomp.dll" not in repair_script or "libomp140" in repair_script
     assert "bundled OpenMP DLLs" in repair_script
     assert (repo_root / "maintenance_scripts" / "repair_windows_wheel.py").is_file()
     assert "exit 1" in source