Fixed some problems in macos and windows when building wheel.

Author: Fantasy201

.github/workflows/python-app.yml

@@ -565,12 +565,12 @@ jobs:
             fi
             if [ -n "$LLVM_OMP_BIN" ]; then
               echo "Bundling OpenMP from $LLVM_OMP_BIN"
-              delvewheel repair --add-path "$LLVM_OMP_BIN" -w {dest_dir} {wheel} || true
+              delvewheel repair --add-path "$LLVM_OMP_BIN" -w "{dest_dir}" "{wheel}" || true
             else
               echo "WARNING: MSVC LLVM OpenMP not found; running delvewheel without --add-path"
-              delvewheel repair -w {dest_dir} {wheel} || true
+              delvewheel repair -w "{dest_dir}" "{wheel}" || true
             fi
-            python "{project}/maintenance_scripts/repair_windows_wheel.py" {dest_dir} {wheel}
+            python "{project}/maintenance_scripts/repair_windows_wheel.py" "{dest_dir}" "{wheel}"
 
           # 注意：CIBW_BEFORE_BUILD（通用）在所有平台都提供了平台专用版本时
           # 永远不会执行（平台专用变体会覆盖通用变体），已移除死代码。

maintenance_scripts/build_macos_ci_libomp.sh

@@ -47,8 +47,8 @@ _libomp_deploy_ok() {
 }
 
 _libomp_symbol_ok() {
-  # LLVM-built libomp exports kmpc symbols with nm -g; avoid brittle exact names.
-  nm -g "$LIBOMP" 2>/dev/null | grep -q 'kmpc_dispatch_deinit'
+  # LLVM-built libomp may not export dispatch_deinit, but always exports kmpc/omp APIs.
+  nm -g "$LIBOMP" 2>/dev/null | grep -Eq '__kmpc_|omp_get_max_threads'
 }
 
 if [[ -f "$LIBOMP" ]] && _libomp_arch_ok && _libomp_deploy_ok && _libomp_symbol_ok; then
@@ -115,7 +115,7 @@ if ! _libomp_arch_ok || ! _libomp_deploy_ok || ! _libomp_symbol_ok; then
   _libomp_symbol_ok || echo "  - missing OpenMP runtime symbols" >&2
   file "$LIBOMP" >&2 || true
   otool -l "$LIBOMP" | awk '/LC_BUILD_VERSION|LC_VERSION_MIN_MACOSX|minos|version/' >&2 || true
-  nm -g "$LIBOMP" 2>/dev/null | grep kmpc | head -5 >&2 || true
+  nm -g "$LIBOMP" 2>/dev/null | grep -E '__kmpc_|omp_get_max_threads' | head -5 >&2 || true
   exit 1
 fi
 

maintenance_scripts/repair_windows_wheel.py

@@ -15,10 +15,14 @@ def main() -> int:
         )
         return 2
 
-    dest = Path(sys.argv[1])
-    wheel = Path(sys.argv[2])
+    dest = Path(sys.argv[1]).resolve()
+    wheel = Path(sys.argv[2]).resolve()
     dest.mkdir(parents=True, exist_ok=True)
 
+    if not wheel.is_file():
+        print(f"Source wheel not found: {wheel}", file=sys.stderr)
+        return 1
+
     wheels = sorted(dest.glob("*.whl"))
     if not wheels:
         print("delvewheel did not emit a wheel; copying built wheel as-is")
@@ -29,7 +33,11 @@ def main() -> int:
             wheels = [target]
 
     if not wheels:
-        print(f"Failed to place repaired wheel in {dest}", file=sys.stderr)
+        print(
+            f"Failed to place repaired wheel in {dest} "
+            f"(source={wheel}, dest_exists={dest.is_dir()})",
+            file=sys.stderr,
+        )
         return 1
 
     print(f"Repaired wheel: {wheels[0]}")

setup.py

@@ -217,26 +217,45 @@ def _find_libomp_prefix():
         if (
             os.path.isfile(os.path.join(inc, 'omp.h'))
             and os.path.isfile(libomp)
-            and _libomp_has_symbol(libomp, '___kmpc_dispatch_deinit')
+            and _libomp_prefix_is_usable(prefix, libomp)
         ):
             return inc, lib
     return None, None
 
 
-def _libomp_has_symbol(libomp_path, symbol):
+def _libomp_exports_runtime_symbols(libomp_path):
+    """Return True when libomp.dylib exposes usable OpenMP/kmpc entry points."""
     if sys.platform != 'darwin':
         return True
     try:
         result = subprocess.run(
-            ['nm', '-gU', libomp_path],
+            ['nm', '-g', libomp_path],
             stdout=subprocess.PIPE,
             stderr=subprocess.DEVNULL,
             text=True,
             check=False,
         )
-        return symbol in result.stdout
     except Exception:
         return False
+    if result.returncode != 0:
+        return False
+    text = result.stdout
+    markers = (
+        '___kmpc_dispatch_deinit',
+        '___kmpc_barrier',
+        '_omp_get_max_threads',
+        'omp_get_max_threads',
+        '__kmpc_',
+    )
+    return any(marker in text for marker in markers)
+
+
+def _libomp_prefix_is_usable(prefix, libomp_path):
+    """Validate libomp prefix; trust CI-built runtimes from SEQUENZO_LIBOMP_PREFIX."""
+    ci_prefix = os.environ.get('SEQUENZO_LIBOMP_PREFIX', '').strip()
+    if ci_prefix and os.path.abspath(prefix) == os.path.abspath(ci_prefix):
+        return True
+    return _libomp_exports_runtime_symbols(libomp_path)
 
 def install_libomp_on_apple_silicon():
     """..."""
@@ -493,7 +512,7 @@ def _find_libomp_runtime_library():
             unique_candidates.append(candidate)
 
     for candidate in unique_candidates:
-        if candidate.exists() and _lib_exports_symbol(candidate, "___kmpc_dispatch_deinit"):
+        if candidate.exists() and _libomp_exports_runtime_symbols(str(candidate)):
             return str(candidate)
 
     return None