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

comfy_env/pixi.py

@@ -191,7 +191,7 @@ def _build_cuda_vars(env_config: IsolatedEnv) -> dict:
     # 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"
+    cuda_version = env_config.cuda or "12.8"
     torch_version = env_config.pytorch_version or "2.8.0"
 
     # Parse CUDA version
@@ -329,15 +329,10 @@ def create_pixi_toml(
     lines.append(f'name = "{env_config.name}"')
     lines.append('version = "0.1.0"')
 
-    # Channels - add pytorch channel, and nvidia if CUDA GPU detected
+    # Channels - use conda-forge only (pytorch channel is deprecated)
+    # PyTorch is installed via PyPI with extra-index-urls for proper CUDA version support
     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)
+    channels_str = ", ".join(f'"{ch}"' for ch in base_channels)
     lines.append(f"channels = [{channels_str}]")
 
     # Platforms
@@ -365,20 +360,6 @@ 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" }')
@@ -455,6 +436,23 @@ def create_pixi_toml(
     elif sys.platform == "win32" and env_config.windows_requirements:
         pypi_deps.extend(env_config.windows_requirements)
 
+    # PyPI options for PyTorch - use CUDA index for GPU, plain PyPI for CPU
+    # The pytorch conda channel is deprecated, so we use PyPI wheels
+    if env_config.cuda:
+        # GPU detected - use CUDA-enabled PyTorch wheels
+        cuda_parts = env_config.cuda.split(".")
+        cuda_short = "".join(cuda_parts[:2])  # "12.8" -> "128"
+        lines.append("[pypi-options]")
+        lines.append(f'extra-index-urls = ["https://download.pytorch.org/whl/cu{cuda_short}"]')
+        lines.append("")
+    # For CPU-only, no extra index needed - plain torch from PyPI works
+
+    # Add torch to pypi dependencies
+    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"
+    pypi_deps.insert(0, f"torch>={torch_mm},<{torch_parts[0]}.{int(torch_parts[1])+1}")
+
     if pypi_deps or special_deps:
         lines.append("[pypi-dependencies]")
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.61
+Version: 0.0.64
 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.61.dist-info → comfy_env-0.0.64.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=lI3S0g_md6WMR1NizXBbXtOr1gtQNhsv90ocWYNIbGk,27472
+comfy_env/pixi.py,sha256=DnDvX3aMtwbo8XPJUt4JYADUyWcXGJ72PqcpN7Fkg_A,27440
 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.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,,
+comfy_env-0.0.64.dist-info/METADATA,sha256=AN186KrdDztWIdx_tLIEbYbSM7pT5mnyHORV_VOAse8,8735
+comfy_env-0.0.64.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+comfy_env-0.0.64.dist-info/entry_points.txt,sha256=J4fXeqgxU_YenuW_Zxn_pEL7J-3R0--b6MS5t0QmAr0,49
+comfy_env-0.0.64.dist-info/licenses/LICENSE,sha256=E68QZMMpW4P2YKstTZ3QU54HRQO8ecew09XZ4_Vn870,1093
+comfy_env-0.0.64.dist-info/RECORD,,