comfy-env 0.1.7__tar.gz → 0.1.8__tar.gz

{comfy_env-0.1.7 → comfy_env-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.1.7
+Version: 0.1.8
 Summary: Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation
 Project-URL: Homepage, https://github.com/PozzettiAndrea/comfy-env
 Project-URL: Repository, https://github.com/PozzettiAndrea/comfy-env

{comfy_env-0.1.7 → comfy_env-0.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfy-env"
-version = "0.1.7"
+version = "0.1.8"
 description = "Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation"
 readme = "README.md"
 license = {text = "MIT"}

{comfy_env-0.1.7 → comfy_env-0.1.8}/src/comfy_env/prestartup.py

@@ -39,6 +39,56 @@ def _load_env_vars(config_path: str) -> Dict[str, str]:
         return {}
 
 
+def _dedupe_libomp_macos():
+    """
+    macOS: Dedupe libomp.dylib to prevent OpenMP runtime conflicts.
+
+    Torch and other packages (PyMeshLab, etc.) bundle their own libomp.
+    Two OpenMP runtimes in same process = crash.
+    Fix: symlink all libomp copies to torch's (canonical source).
+    """
+    if sys.platform != "darwin":
+        return
+
+    # Find torch's libomp (canonical source) via introspection
+    try:
+        import torch
+        torch_libomp = os.path.join(os.path.dirname(torch.__file__), 'lib', 'libomp.dylib')
+        if not os.path.exists(torch_libomp):
+            return
+    except ImportError:
+        return  # No torch, skip
+
+    # Find site-packages for scanning
+    site_packages = os.path.dirname(os.path.dirname(torch.__file__))
+
+    # Find other libomp files and symlink to torch's
+    patterns = [
+        os.path.join(site_packages, '*', 'Frameworks', 'libomp.dylib'),
+        os.path.join(site_packages, '*', '.dylibs', 'libomp.dylib'),
+        os.path.join(site_packages, '*', 'lib', 'libomp.dylib'),
+    ]
+
+    for pattern in patterns:
+        for libomp in glob.glob(pattern):
+            # Skip torch's own copy
+            if 'torch' in libomp:
+                continue
+            # Skip if already a symlink pointing to torch
+            if os.path.islink(libomp):
+                if os.path.realpath(libomp) == os.path.realpath(torch_libomp):
+                    continue
+            # Replace with symlink to torch's
+            try:
+                if os.path.islink(libomp):
+                    os.unlink(libomp)
+                else:
+                    os.rename(libomp, libomp + '.bak')
+                os.symlink(torch_libomp, libomp)
+            except OSError:
+                pass  # Permission denied, etc.
+
+
 def setup_env(node_dir: Optional[str] = None) -> None:
     """
     Set up environment for pixi conda libraries.
@@ -56,6 +106,9 @@ def setup_env(node_dir: Optional[str] = None) -> None:
         from comfy_env import setup_env
         setup_env()
     """
+    # macOS: Dedupe libomp to prevent OpenMP conflicts (torch vs pymeshlab, etc.)
+    _dedupe_libomp_macos()
+
     # Auto-detect node_dir from caller
     if node_dir is None:
         import inspect
@@ -78,8 +131,13 @@ def setup_env(node_dir: Optional[str] = None) -> None:
         lib_dir = os.path.join(pixi_env, "Library", "bin")
         if os.path.exists(lib_dir):
             os.environ["PATH"] = lib_dir + ";" + os.environ.get("PATH", "")
+    elif sys.platform == "darwin":
+        # macOS: DYLD_LIBRARY_PATH
+        lib_dir = os.path.join(pixi_env, "lib")
+        if os.path.exists(lib_dir):
+            os.environ["DYLD_LIBRARY_PATH"] = lib_dir + ":" + os.environ.get("DYLD_LIBRARY_PATH", "")
     else:
-        # Linux/Mac: LD_LIBRARY_PATH
+        # Linux: LD_LIBRARY_PATH
         lib_dir = os.path.join(pixi_env, "lib")
         if os.path.exists(lib_dir):
             os.environ["LD_LIBRARY_PATH"] = lib_dir + ":" + os.environ.get("LD_LIBRARY_PATH", "")

{comfy_env-0.1.7 → comfy_env-0.1.8}/src/comfy_env/workers/mp.py

@@ -144,15 +144,11 @@ def _worker_loop(queue_in, queue_out, sys_path_additions=None, lib_path=None, en
             clean_parts.insert(0, lib_path)
         os.environ["PATH"] = path_sep.join(clean_parts)
     elif sys.platform == "darwin":
-        # macOS: Use DYLD_LIBRARY_PATH
-        current = os.environ.get("DYLD_LIBRARY_PATH", "")
-        clean_parts = [
-            p for p in current.split(path_sep) if p
-            and not any(x in p.lower() for x in (".ct-envs", "conda", "mamba", "miniforge", "miniconda", "anaconda"))
-        ]
+        # macOS: ONLY use the isolated lib_path, don't inherit
         if lib_path:
-            clean_parts.insert(0, lib_path)
-        os.environ["DYLD_LIBRARY_PATH"] = path_sep.join(clean_parts)
+            os.environ["DYLD_LIBRARY_PATH"] = lib_path
+        else:
+            os.environ.pop("DYLD_LIBRARY_PATH", None)
     else:
         # Linux: Use LD_LIBRARY_PATH
         current = os.environ.get("LD_LIBRARY_PATH", "")