comfy-env 0.0.59__py3-none-any.whl → 0.0.61__py3-none-any.whl

comfy_env/pixi.py

@@ -188,16 +188,31 @@ def _build_cuda_vars(env_config: IsolatedEnv) -> dict:
     Returns a dict with CUDA, PyTorch, Python, and platform variables
     for template substitution.
     """
-    # Use fixed CUDA 12.8 / PyTorch 2.8 for pixi environments (modern GPU default)
+    # Get CUDA/PyTorch versions from env_config (resolved from "auto" based on GPU arch)
+    # Pascal or below: CUDA 12.4, PyTorch 2.4.0
+    # Turing+: CUDA 12.8, PyTorch 2.8.0
+    cuda_version = env_config.cuda_version or "12.8"
+    torch_version = env_config.pytorch_version or "2.8.0"
+
+    # Parse CUDA version
+    cuda_parts = cuda_version.split(".")
+    cuda_short = "".join(cuda_parts[:2])  # "12.8" -> "128"
+
+    # Parse PyTorch version
+    torch_parts = torch_version.split(".")
+    torch_short = "".join(torch_parts)  # "2.8.0" -> "280"
+    torch_mm = "".join(torch_parts[:2])  # "2.8.0" -> "28"
+    torch_dotted_mm = ".".join(torch_parts[:2])  # "2.8.0" -> "2.8"
+
     vars_dict = {
-        "cuda_version": "12.8",
-        "cuda_short": "128",
-        "cuda_short2": "128",
-        "cuda_major": "12",
-        "torch_version": "2.8.0",
-        "torch_short": "280",
-        "torch_mm": "28",
-        "torch_dotted_mm": "2.8",
+        "cuda_version": cuda_version,
+        "cuda_short": cuda_short,
+        "cuda_short2": cuda_short,
+        "cuda_major": cuda_parts[0],
+        "torch_version": torch_version,
+        "torch_short": torch_short,
+        "torch_mm": torch_mm,
+        "torch_dotted_mm": torch_dotted_mm,
     }
 
     # Platform detection
@@ -314,19 +329,25 @@ def create_pixi_toml(
     lines.append(f'name = "{env_config.name}"')
     lines.append('version = "0.1.0"')
 
-    # Channels
-    channels = conda.channels or ["conda-forge"]
+    # Channels - add pytorch channel, and nvidia if CUDA GPU detected
+    base_channels = conda.channels or ["conda-forge"]
+    if env_config.cuda_version:
+        # GPU detected - add pytorch and nvidia channels for CUDA support
+        channels = ["pytorch", "nvidia"] + [ch for ch in base_channels if ch not in ["pytorch", "nvidia"]]
+    else:
+        # No GPU - just add pytorch channel for CPU-only pytorch
+        channels = ["pytorch"] + [ch for ch in base_channels if ch != "pytorch"]
     channels_str = ", ".join(f'"{ch}"' for ch in channels)
     lines.append(f"channels = [{channels_str}]")
 
     # Platforms
-    # Note: On macOS we always use osx-64 (x86_64) even on ARM64 Macs.
-    # This runs under Rosetta 2 but ensures compatibility with packages
-    # that only have x86_64 wheels (e.g., embreex for trimesh raytracing).
     if sys.platform == "linux":
         lines.append('platforms = ["linux-64"]')
     elif sys.platform == "darwin":
-        lines.append('platforms = ["osx-64"]')
+        if platform.machine() == "arm64":
+            lines.append('platforms = ["osx-arm64"]')
+        else:
+            lines.append('platforms = ["osx-64"]')
     elif sys.platform == "win32":
         lines.append('platforms = ["win-64"]')
 
@@ -344,6 +365,20 @@ def create_pixi_toml(
     lines.append(f'python = "{env_config.python}.*"')
     lines.append('pip = "*"')  # Required for installing CUDA packages with --no-deps
 
+    # Add PyTorch via conda
+    # - With GPU: pytorch + pytorch-cuda for CUDA support
+    # - No GPU: pytorch 2.8.0 CPU-only (default)
+    torch_version = env_config.pytorch_version or "2.8.0"
+    torch_parts = torch_version.split(".")
+    torch_mm = ".".join(torch_parts[:2])  # "2.8.0" -> "2.8"
+    lines.append(f'pytorch = "{torch_mm}.*"')
+
+    if env_config.cuda_version:
+        # GPU detected - add pytorch-cuda for CUDA runtime
+        cuda_parts = env_config.cuda_version.split(".")
+        cuda_mm = ".".join(cuda_parts[:2])  # "12.8" -> "12.8"
+        lines.append(f'pytorch-cuda = "{cuda_mm}"')
+
     # On Windows, use MKL BLAS to avoid OpenBLAS crashes (numpy blas_fpe_check issue)
     if sys.platform == "win32":
         lines.append('libblas = { version = "*", build = "*mkl" }')
@@ -580,6 +615,9 @@ def pixi_install(
     install_env = os.environ.copy()
     if env_config.env_vars:
         install_env.update(env_config.env_vars)
+        # Disable build isolation so CMAKE_ARGS propagates to builds
+        if 'CMAKE_ARGS' in env_config.env_vars:
+            install_env['UV_NO_BUILD_ISOLATION'] = '1'
         log(f"  Using custom env vars: {list(env_config.env_vars.keys())}")
 
     result = subprocess.run(

{comfy_env-0.0.59.dist-info → comfy_env-0.0.61.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ comfy_env/errors.py,sha256=q-C3vyrPa_kk_Ao8l17mIGfJiG2IR0hCFV0GFcNLmcI,9924
 comfy_env/install.py,sha256=nfzGifXVd87a6dnwY3GtktrXpS7fjWuWF-QV9hh2e94,15657
 comfy_env/isolation.py,sha256=a-q6mA9tzD27kZSZCTioSKlK-3kpRFKYA23V_75OmaI,9286
 comfy_env/nodes.py,sha256=CWUe35jU5SKk4ur-SddZePdqWgxJDlxGhpcJiu5pAK4,4354
-comfy_env/pixi.py,sha256=47l0UjEPd-VfFgagu7iH1LsMcWrCXtZSXYW0Mfm8-4I,25688
+comfy_env/pixi.py,sha256=lI3S0g_md6WMR1NizXBbXtOr1gtQNhsv90ocWYNIbGk,27472
 comfy_env/registry.py,sha256=w-QwvAPFlCrBYRAv4cXkp2zujQPZn8Fk5DUxKCtox8o,3430
 comfy_env/resolver.py,sha256=WoNIo2IfTR2RlEf_HQl66eAeMa2R2pmLof_UdK-0RNE,6714
 comfy_env/stub_imports.py,sha256=qOYxCJ8BbIfMHGBfqC5KGZSK6AK-iqmSjWi8ZCP8SAM,8425
@@ -41,8 +41,8 @@ comfy_env/workers/tensor_utils.py,sha256=TCuOAjJymrSbkgfyvcKtQ_KbVWTqSwP9VH_bCaF
 comfy_env/workers/torch_mp.py,sha256=TnsCoBHEJBXEoBkx7WiCd9tBAlzFtMOw1dk_7_zGJZY,22288
 comfy_env/workers/venv.py,sha256=RIW1EzWHnC4EBvfQCduYf2BVp3fND3SUZC1yJVfscxI,59325
 comfy_env/wheel_sources.yml,sha256=uU0YJmWaiLAicQNN9VYS8PZevlP2NOH6mBUE294dvAo,8156
-comfy_env-0.0.59.dist-info/METADATA,sha256=xjGBgAtpS7ybnE5cgUy2MpNv6BwmQmhiEd42MF7Bquo,8735
-comfy_env-0.0.59.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-comfy_env-0.0.59.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
-comfy_env-0.0.59.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
-comfy_env-0.0.59.dist-info/RECORD,,
+comfy_env-0.0.61.dist-info/METADATA,sha256=6fj4BJzmMfpfbfJK3MUrJ6I6OFNQJAMiLurGcT3slD0,8735
+comfy_env-0.0.61.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.61.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.61.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.61.dist-info/RECORD,,