comfy-env 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

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/workers/mp.py

@@ -80,7 +80,7 @@ def _dump_worker_env(worker_name: str = "unknown", print_to_terminal: bool = Fal
         print(f"[comfy-env] Python: {sys.executable}")
         print(f"[comfy-env] Version: {sys.version.split()[0]}")
         print(f"[comfy-env] PID: {os.getpid()}, CWD: {os.getcwd()}")
-        for var in ['PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'OMP_NUM_THREADS', 'KMP_DUPLICATE_LIB_OK']:
+        for var in ['PATH', 'LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PYTHONPATH', 'OMP_NUM_THREADS', 'KMP_DUPLICATE_LIB_OK']:
             val = os.environ.get(var, '<unset>')
             if len(val) > 100:
                 val = val[:100] + '...'
@@ -143,8 +143,14 @@ def _worker_loop(queue_in, queue_out, sys_path_additions=None, lib_path=None, en
         if lib_path:
             clean_parts.insert(0, lib_path)
         os.environ["PATH"] = path_sep.join(clean_parts)
+    elif sys.platform == "darwin":
+        # macOS: ONLY use the isolated lib_path, don't inherit
+        if lib_path:
+            os.environ["DYLD_LIBRARY_PATH"] = lib_path
+        else:
+            os.environ.pop("DYLD_LIBRARY_PATH", None)
     else:
-        # Linux/Mac: Filter LD_LIBRARY_PATH with same patterns
+        # Linux: Use LD_LIBRARY_PATH
         current = os.environ.get("LD_LIBRARY_PATH", "")
         clean_parts = [
             p for p in current.split(path_sep) if p

{comfy_env-0.1.6.dist-info → comfy_env-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.1.6
+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.6.dist-info → comfy_env-0.1.8.dist-info}/RECORD

@@ -3,7 +3,7 @@ comfy_env/cli.py,sha256=ty4HYlzollCUCS0o6Sha6eczPAsW_gHRVgvck3IfA2w,12723
 comfy_env/errors.py,sha256=q-C3vyrPa_kk_Ao8l17mIGfJiG2IR0hCFV0GFcNLmcI,9924
 comfy_env/install.py,sha256=N7eBj8wB2DrGepVYk-Hks2mSf6UuGzj34pfVLNYJgQ4,10357
 comfy_env/nodes.py,sha256=nBkG2pESeOt5kXSgTDIHAHaVdHK8-rEueR3BxXWn6TE,4354
-comfy_env/prestartup.py,sha256=rP0TtT9lxiU7Py27U79Ew7954VpHsYL6lfx4IpQY1Uc,3152
+comfy_env/prestartup.py,sha256=NML_nzg4h37YdEg7gHxA7ke_uXWZsldz-X3HldHEUsE,5338
 comfy_env/config/__init__.py,sha256=4Guylkb-FV8QxhFwschzpzbr2eu8y-KNgNT3_JOm9jc,403
 comfy_env/config/parser.py,sha256=dA1lX5ExBEfCqUJwe4V5i_jn2NJ69bMq3c3ji3lMSV8,4295
 comfy_env/config/types.py,sha256=Sb8HO34xsSZu5YAc2K4M7Gb3QNevJlngf12hHiwuU0w,2140
@@ -22,11 +22,11 @@ comfy_env/templates/comfy-env-instructions.txt,sha256=ve1RAthW7ouumU9h6DM7mIRX1M
 comfy_env/templates/comfy-env.toml,sha256=ROIqi4BlPL1MEdL1VgebfTHpdwPNYGHwWeigI9Kw-1I,4831
 comfy_env/workers/__init__.py,sha256=TMVG55d2XLP1mJ3x1d16H0SBDJZtk2kMC5P4HLk9TrA,1073
 comfy_env/workers/base.py,sha256=4ZYTaQ4J0kBHCoO_OfZnsowm4rJCoqinZUaOtgkOPbw,2307
-comfy_env/workers/mp.py,sha256=xqSLnpR5zSVdZKt10nM6LmNyJ2SmlSr1yQ5I9HX5OJ4,29514
+comfy_env/workers/mp.py,sha256=8Xqcr4R4KlHtP1P_UDAtSTPHA_5i-ySTlxxLpqyOk-w,29757
 comfy_env/workers/subprocess.py,sha256=UMhKhaJoSjv2-FWnwQq9TeMWtaDLIs3ajAFTq1ngdJw,57844
 comfy_env/workers/tensor_utils.py,sha256=TCuOAjJymrSbkgfyvcKtQ_KbVWTqSwP9VH_bCaFLLq8,6409
-comfy_env-0.1.6.dist-info/METADATA,sha256=IT7HN3q_Q7hdsZqcGRbgtoeKBTN6z_1Gzr8KhVtPpg0,6945
-comfy_env-0.1.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.1.6.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.1.6.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.1.6.dist-info/RECORD,,
+comfy_env-0.1.8.dist-info/METADATA,sha256=8WOllc7KtZ1wb3pkCam0qZd5YW1CEd33WwQIzBqENJI,6945
+comfy_env-0.1.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.1.8.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.1.8.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.1.8.dist-info/RECORD,,