comfy-env 0.0.66__tar.gz → 0.0.68__tar.gz

{comfy_env-0.0.66 → comfy_env-0.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-env
-Version: 0.0.66
+Version: 0.0.68
 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
@@ -17,7 +17,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
-Requires-Dist: pyyaml>=6.0
 Requires-Dist: tomli-w>=1.0.0
 Requires-Dist: tomli>=2.0.0; python_version < '3.11'
 Requires-Dist: uv>=0.4.0
@@ -69,8 +68,7 @@ Create a `comfy-env.toml` in your node directory:
 
 ```toml
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
+packages = ["nvdiffrast", "pytorch3d"]
 
 [packages]
 requirements = ["transformers>=4.56", "pillow"]
@@ -153,12 +151,6 @@ comfy-env install
 # Dry run (show what would be installed)
 comfy-env install --dry-run
 
-# Resolve wheel URLs without installing
-comfy-env resolve nvdiffrast==0.4.0
-
-# List all packages in the built-in registry
-comfy-env list-packages
-
 # Verify installation
 comfy-env doctor
 ```
@@ -168,11 +160,9 @@ comfy-env doctor
 ### Simple Format (comfy-env.toml)
 
 ```toml
-# CUDA packages (uses built-in registry)
+# CUDA packages from https://pozzettiandrea.github.io/cuda-wheels/
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
-torch-scatter = "2.1.2"
+packages = ["nvdiffrast", "pytorch3d", "torch-scatter"]
 
 # Regular pip packages
 [packages]
@@ -186,7 +176,7 @@ requirements = ["transformers>=4.56", "pillow"]
 linux = ["libgl1", "libopengl0"]  # apt packages
 
 [local.cuda]
-nvdiffrast = "0.4.0"
+packages = ["nvdiffrast"]
 
 [local.packages]
 requirements = ["pillow", "numpy"]
@@ -197,82 +187,32 @@ python = "3.10"
 cuda = "12.8"
 
 [myenv.cuda]
-torch-scatter = "2.1.2"
+packages = ["torch-scatter"]
 
 [myenv.packages]
 requirements = ["transformers>=4.56"]
-
-# Custom wheel templates (override built-in registry)
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
-
-## Writing Wheel Templates
-
-### Template Variables
-
-| Variable | Example | Description |
-|----------|---------|-------------|
-| `{version}` | `0.4.0` | Package version |
-| `{cuda_version}` | `12.8` | Full CUDA version |
-| `{cuda_short}` | `128` | CUDA without dot |
-| `{cuda_major}` | `12` | CUDA major only |
-| `{torch_version}` | `2.8.0` | Full PyTorch version |
-| `{torch_mm}` | `28` | PyTorch major.minor no dot |
-| `{torch_dotted_mm}` | `2.8` | PyTorch major.minor with dot |
-| `{py_version}` | `3.10` | Python version |
-| `{py_short}` | `310` | Python without dot |
-| `{py_tag}` | `cp310` | Python wheel tag |
-| `{platform}` | `linux_x86_64` | Platform tag |
-
-### Common Wheel URL Patterns
-
-**Pattern 1: Simple CUDA + Python**
-```
-https://example.com/{package}-{version}+cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 2: CUDA + PyTorch**
-```
-https://example.com/{package}-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 3: GitHub Releases**
-```
-https://github.com/org/repo/releases/download/v{version}/{package}-{version}+cu{cuda_short}-{py_tag}-{platform}.whl
-```
-
-### How to Find the Right Template
-
-1. Download a wheel manually from the source
-2. Look at the filename pattern: `nvdiffrast-0.4.0+cu128torch28-cp310-cp310-linux_x86_64.whl`
-3. Replace values with variables: `nvdiffrast-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl`
-4. Prepend the base URL
-
-### Testing Your Template
-
-```bash
-comfy-env resolve my-package==1.0.0
 ```
 
-This shows the resolved URL without installing.
+## CUDA Wheels Index
 
-### Adding Custom Wheel Sources
+CUDA packages are installed from the [cuda-wheels](https://pozzettiandrea.github.io/cuda-wheels/) index, which provides pre-built wheels for:
 
-If a package isn't in the built-in registry, add it to your `comfy-env.toml`:
+- **PyTorch Geometric**: torch-scatter, torch-cluster, torch-sparse, torch-spline-conv
+- **NVIDIA**: nvdiffrast, pytorch3d, gsplat
+- **Attention**: flash-attn, sageattention
+- **Mesh Processing**: cumesh, cubvh
+- **Others**: spconv, detectron2, lietorch, and more
 
-```toml
-[cuda]
-my-custom-pkg = "1.0.0"
+Wheels are automatically selected based on your GPU, CUDA version, PyTorch version, and Python version.
 
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-custom-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
+### Supported Configurations
 
-Resolution order:
-1. User's `[wheel_sources]` in comfy-env.toml (highest priority)
-2. Built-in `wheel_sources.yml` registry
-3. Error if not found
+| GPU Architecture | CUDA | PyTorch |
+|-----------------|------|---------|
+| Blackwell (sm_100+) | 12.8 | 2.8+ |
+| Ada/Hopper/Ampere (sm_80+) | 12.8 | 2.8 |
+| Turing (sm_75) | 12.8 | 2.8 |
+| Pascal (sm_60) | 12.4 | 2.4 |
 
 ## API Reference
 
@@ -300,7 +240,7 @@ env = RuntimeEnv.detect()
 print(env)
 # Python 3.10, CUDA 12.8, PyTorch 2.8.0, GPU: NVIDIA GeForce RTX 4090
 
-# Get template variables
+# Get environment variables
 vars_dict = env.as_dict()
 # {'cuda_version': '12.8', 'cuda_short': '128', 'torch_mm': '28', ...}
 ```
@@ -345,16 +285,6 @@ print(get_gpu_summary())
 # GPU 0: NVIDIA GeForce RTX 5090 (sm_120) [Blackwell - CUDA 12.8]
 ```
 
-## Built-in Package Registry
-
-Run `comfy-env list-packages` to see all packages in the built-in registry.
-
-The registry includes:
-- PyTorch Geometric packages (torch-scatter, torch-cluster, torch-sparse)
-- NVIDIA packages (nvdiffrast, pytorch3d, gsplat)
-- Flash Attention (flash-attn)
-- And more
-
 ## License
 
 MIT - see LICENSE file.

{comfy_env-0.0.66 → comfy_env-0.0.68}/README.md

@@ -40,8 +40,7 @@ Create a `comfy-env.toml` in your node directory:
 
 ```toml
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
+packages = ["nvdiffrast", "pytorch3d"]
 
 [packages]
 requirements = ["transformers>=4.56", "pillow"]
@@ -124,12 +123,6 @@ comfy-env install
 # Dry run (show what would be installed)
 comfy-env install --dry-run
 
-# Resolve wheel URLs without installing
-comfy-env resolve nvdiffrast==0.4.0
-
-# List all packages in the built-in registry
-comfy-env list-packages
-
 # Verify installation
 comfy-env doctor
 ```
@@ -139,11 +132,9 @@ comfy-env doctor
 ### Simple Format (comfy-env.toml)
 
 ```toml
-# CUDA packages (uses built-in registry)
+# CUDA packages from https://pozzettiandrea.github.io/cuda-wheels/
 [cuda]
-nvdiffrast = "0.4.0"
-pytorch3d = "0.7.9"
-torch-scatter = "2.1.2"
+packages = ["nvdiffrast", "pytorch3d", "torch-scatter"]
 
 # Regular pip packages
 [packages]
@@ -157,7 +148,7 @@ requirements = ["transformers>=4.56", "pillow"]
 linux = ["libgl1", "libopengl0"]  # apt packages
 
 [local.cuda]
-nvdiffrast = "0.4.0"
+packages = ["nvdiffrast"]
 
 [local.packages]
 requirements = ["pillow", "numpy"]
@@ -168,82 +159,32 @@ python = "3.10"
 cuda = "12.8"
 
 [myenv.cuda]
-torch-scatter = "2.1.2"
+packages = ["torch-scatter"]
 
 [myenv.packages]
 requirements = ["transformers>=4.56"]
-
-# Custom wheel templates (override built-in registry)
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
-
-## Writing Wheel Templates
-
-### Template Variables
-
-| Variable | Example | Description |
-|----------|---------|-------------|
-| `{version}` | `0.4.0` | Package version |
-| `{cuda_version}` | `12.8` | Full CUDA version |
-| `{cuda_short}` | `128` | CUDA without dot |
-| `{cuda_major}` | `12` | CUDA major only |
-| `{torch_version}` | `2.8.0` | Full PyTorch version |
-| `{torch_mm}` | `28` | PyTorch major.minor no dot |
-| `{torch_dotted_mm}` | `2.8` | PyTorch major.minor with dot |
-| `{py_version}` | `3.10` | Python version |
-| `{py_short}` | `310` | Python without dot |
-| `{py_tag}` | `cp310` | Python wheel tag |
-| `{platform}` | `linux_x86_64` | Platform tag |
-
-### Common Wheel URL Patterns
-
-**Pattern 1: Simple CUDA + Python**
-```
-https://example.com/{package}-{version}+cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 2: CUDA + PyTorch**
-```
-https://example.com/{package}-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl
-```
-
-**Pattern 3: GitHub Releases**
-```
-https://github.com/org/repo/releases/download/v{version}/{package}-{version}+cu{cuda_short}-{py_tag}-{platform}.whl
-```
-
-### How to Find the Right Template
-
-1. Download a wheel manually from the source
-2. Look at the filename pattern: `nvdiffrast-0.4.0+cu128torch28-cp310-cp310-linux_x86_64.whl`
-3. Replace values with variables: `nvdiffrast-{version}+cu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl`
-4. Prepend the base URL
-
-### Testing Your Template
-
-```bash
-comfy-env resolve my-package==1.0.0
 ```
 
-This shows the resolved URL without installing.
+## CUDA Wheels Index
 
-### Adding Custom Wheel Sources
+CUDA packages are installed from the [cuda-wheels](https://pozzettiandrea.github.io/cuda-wheels/) index, which provides pre-built wheels for:
 
-If a package isn't in the built-in registry, add it to your `comfy-env.toml`:
+- **PyTorch Geometric**: torch-scatter, torch-cluster, torch-sparse, torch-spline-conv
+- **NVIDIA**: nvdiffrast, pytorch3d, gsplat
+- **Attention**: flash-attn, sageattention
+- **Mesh Processing**: cumesh, cubvh
+- **Others**: spconv, detectron2, lietorch, and more
 
-```toml
-[cuda]
-my-custom-pkg = "1.0.0"
+Wheels are automatically selected based on your GPU, CUDA version, PyTorch version, and Python version.
 
-[wheel_sources]
-my-custom-pkg = "https://my-server.com/my-custom-pkg-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"
-```
+### Supported Configurations
 
-Resolution order:
-1. User's `[wheel_sources]` in comfy-env.toml (highest priority)
-2. Built-in `wheel_sources.yml` registry
-3. Error if not found
+| GPU Architecture | CUDA | PyTorch |
+|-----------------|------|---------|
+| Blackwell (sm_100+) | 12.8 | 2.8+ |
+| Ada/Hopper/Ampere (sm_80+) | 12.8 | 2.8 |
+| Turing (sm_75) | 12.8 | 2.8 |
+| Pascal (sm_60) | 12.4 | 2.4 |
 
 ## API Reference
 
@@ -271,7 +212,7 @@ env = RuntimeEnv.detect()
 print(env)
 # Python 3.10, CUDA 12.8, PyTorch 2.8.0, GPU: NVIDIA GeForce RTX 4090
 
-# Get template variables
+# Get environment variables
 vars_dict = env.as_dict()
 # {'cuda_version': '12.8', 'cuda_short': '128', 'torch_mm': '28', ...}
 ```
@@ -316,16 +257,6 @@ print(get_gpu_summary())
 # GPU 0: NVIDIA GeForce RTX 5090 (sm_120) [Blackwell - CUDA 12.8]
 ```
 
-## Built-in Package Registry
-
-Run `comfy-env list-packages` to see all packages in the built-in registry.
-
-The registry includes:
-- PyTorch Geometric packages (torch-scatter, torch-cluster, torch-sparse)
-- NVIDIA packages (nvdiffrast, pytorch3d, gsplat)
-- Flash Attention (flash-attn)
-- And more
-
 ## License
 
 MIT - see LICENSE file.

{comfy_env-0.0.66 → comfy_env-0.0.68}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "comfy-env"
-version = "0.0.66"
+version = "0.0.68"
 description = "Environment management for ComfyUI custom nodes - CUDA wheel resolution and process isolation"
 readme = "README.md"
 license = {text = "MIT"}
@@ -22,7 +22,6 @@ dependencies = [
     "tomli>=2.0.0; python_version < '3.11'",  # TOML parsing (built-in tomllib for 3.11+)
     "tomli-w>=1.0.0",  # TOML writing (no stdlib equivalent)
     "uv>=0.4.0",  # Fast Python package installer and venv creator
-    "pyyaml>=6.0",  # YAML parsing for wheel_sources.yml
 ]
 
 [project.optional-dependencies]
@@ -43,9 +42,6 @@ build-backend = "hatchling.build"
 [tool.hatch.build.targets.wheel]
 packages = ["src/comfy_env"]
 
-[tool.hatch.build.targets.wheel.force-include]
-"src/comfy_env/pixi/wheel_sources.yml" = "comfy_env/pixi/wheel_sources.yml"
-
 [tool.ruff]
 line-length = 100
 target-version = "py310"

{comfy_env-0.0.66 → comfy_env-0.0.68}/src/comfy_env/__init__.py

@@ -32,7 +32,6 @@ from .pixi import (
     pixi_run,
     pixi_install,
     CUDA_WHEELS_INDEX,
-    PACKAGE_REGISTRY,
     detect_cuda_version,
     detect_cuda_environment,
     get_recommended_cuda_version,
@@ -88,7 +87,6 @@ __all__ = [
     "pixi_run",
     "pixi_install",
     "CUDA_WHEELS_INDEX",
-    "PACKAGE_REGISTRY",
     # CUDA detection
     "detect_cuda_version",
     "detect_cuda_environment",

{comfy_env-0.0.66 → comfy_env-0.0.68}/src/comfy_env/cli.py

@@ -6,9 +6,7 @@ Provides the `comfy-env` command with subcommands:
 - generate: Generate pixi.toml from comfy-env.toml
 - install: Install dependencies from config
 - info: Show runtime environment information
-- resolve: Show resolved wheel URLs
 - doctor: Verify installation
-- list-packages: Show all packages in the built-in registry
 
 Usage:
     comfy-env init ---> creates template comfy-env.toml
@@ -18,12 +16,7 @@ Usage:
 
     comfy-env info
 
-    comfy-env resolve nvdiffrast==0.4.0
-    comfy-env resolve --all
-
     comfy-env doctor
-
-    comfy-env list-packages
 """
 
 import argparse
@@ -109,28 +102,6 @@ def main(args: Optional[List[str]] = None) -> int:
         help="Output as JSON",
     )
 
-    # resolve command
-    resolve_parser = subparsers.add_parser(
-        "resolve",
-        help="Resolve wheel URLs for packages",
-        description="Show resolved wheel URLs without installing",
-    )
-    resolve_parser.add_argument(
-        "packages",
-        nargs="*",
-        help="Package specs (e.g., nvdiffrast==0.4.0)",
-    )
-    resolve_parser.add_argument(
-        "--all", "-a",
-        action="store_true",
-        help="Resolve all packages from config",
-    )
-    resolve_parser.add_argument(
-        "--config", "-c",
-        type=str,
-        help="Path to config file",
-    )
-
     # doctor command
     doctor_parser = subparsers.add_parser(
         "doctor",
@@ -148,18 +119,6 @@ def main(args: Optional[List[str]] = None) -> int:
         help="Path to config file",
     )
 
-    # list-packages command
-    list_parser = subparsers.add_parser(
-        "list-packages",
-        help="Show all packages in the built-in registry",
-        description="List CUDA packages that comfy-env knows how to install",
-    )
-    list_parser.add_argument(
-        "--json",
-        action="store_true",
-        help="Output as JSON",
-    )
-
     parsed = parser.parse_args(args)
 
     if parsed.command is None:
@@ -175,12 +134,8 @@ def main(args: Optional[List[str]] = None) -> int:
             return cmd_install(parsed)
         elif parsed.command == "info":
             return cmd_info(parsed)
-        elif parsed.command == "resolve":
-            return cmd_resolve(parsed)
         elif parsed.command == "doctor":
             return cmd_doctor(parsed)
-        elif parsed.command == "list-packages":
-            return cmd_list_packages(parsed)
         else:
             parser.print_help()
             return 1
@@ -206,7 +161,7 @@ cuda_version = "auto"
 pytorch_version = "auto"
 
 [environment.cuda]
-# CUDA packages from comfy-env registry
+# CUDA packages from https://pozzettiandrea.github.io/cuda-wheels/
 # Example: nvdiffrast = "0.4.0"
 
 [environment.packages]
@@ -332,95 +287,6 @@ def cmd_info(args) -> int:
     return 0
 
 
-def cmd_resolve(args) -> int:
-    """Handle resolve command."""
-    from .pixi import RuntimeEnv, parse_wheel_requirement
-    from .pixi import PACKAGE_REGISTRY
-    from .pixi.registry import get_cuda_short2
-    from .config.parser import discover_env_config, load_env_from_file
-
-    env = RuntimeEnv.detect()
-    packages = []
-
-    # Get packages from args or config
-    if args.all or (not args.packages and args.config):
-        if args.config:
-            config = load_env_from_file(Path(args.config))
-        else:
-            config = discover_env_config(Path.cwd())
-
-        if config and config.no_deps_requirements:
-            packages = config.no_deps_requirements
-        else:
-            print("No CUDA packages found in config", file=sys.stderr)
-            return 1
-    elif args.packages:
-        packages = args.packages
-    else:
-        print("Specify packages or use --all with a config file", file=sys.stderr)
-        return 1
-
-    print(f"Resolving wheels for: {env}")
-    print("=" * 60)
-
-    # Build template variables
-    vars_dict = env.as_dict()
-    if env.cuda_version:
-        vars_dict["cuda_short2"] = get_cuda_short2(env.cuda_version)
-
-    all_ok = True
-    for pkg_spec in packages:
-        package, version = parse_wheel_requirement(pkg_spec)
-        pkg_lower = package.lower()
-
-        try:
-            if pkg_lower in PACKAGE_REGISTRY:
-                config = PACKAGE_REGISTRY[pkg_lower]
-
-                if "wheel_template" in config:
-                    # Direct wheel URL template
-                    effective_version = version or config.get("default_version")
-                    if not effective_version:
-                        print(f"  {package}: No version specified (no default in registry)")
-                        all_ok = False
-                        continue
-
-                    vars_dict["version"] = effective_version
-                    url = _substitute_template(config["wheel_template"], vars_dict)
-                    print(f"  {package}=={effective_version}: resolved")
-                    print(f"    {url}")
-
-                elif "package_name" in config:
-                    # PyPI variant (e.g., spconv-cu124)
-                    pkg_name = _substitute_template(config["package_name"], vars_dict)
-                    pkg_spec = f"{pkg_name}=={version}" if version else pkg_name
-                    print(f"  {package}: installs as {pkg_spec} from PyPI")
-
-                else:
-                    print(f"  {package}: no wheel_template or package_name in registry")
-                    all_ok = False
-            else:
-                print(f"  {package}: NOT in registry")
-                print(f"    Add to [wheel_sources] in comfy-env.toml:")
-                print(f'    {package} = "https://example.com/{package}-{{version}}+cu{{cuda_short}}-{{py_tag}}-{{platform}}.whl"')
-                all_ok = False
-
-        except Exception as e:
-            print(f"  {package}: FAILED - {e}")
-            all_ok = False
-
-    return 0 if all_ok else 1
-
-
-def _substitute_template(template: str, vars_dict: dict) -> str:
-    """Substitute {var} placeholders in template."""
-    result = template
-    for key, value in vars_dict.items():
-        if value is not None:
-            result = result.replace(f"{{{key}}}", str(value))
-    return result
-
-
 def cmd_doctor(args) -> int:
     """Handle doctor command."""
     from .install import verify_installation
@@ -466,72 +332,5 @@ def cmd_doctor(args) -> int:
         return 0
 
 
-def cmd_list_packages(args) -> int:
-    """Handle list-packages command."""
-    from .pixi import PACKAGE_REGISTRY
-
-    if args.json:
-        import json
-        result = {}
-        for name, config in PACKAGE_REGISTRY.items():
-            result[name] = {
-                "description": config.get("description", ""),
-            }
-            if "wheel_template" in config:
-                result[name]["wheel_template"] = config["wheel_template"]
-            if "package_name" in config:
-                result[name]["package_name"] = config["package_name"]
-            if "default_version" in config:
-                result[name]["default_version"] = config["default_version"]
-        print(json.dumps(result, indent=2))
-        return 0
-
-    print("Built-in CUDA Package Registry")
-    print("=" * 60)
-    print()
-    print("These packages can be installed by adding them to comfy-env.toml:")
-    print()
-    print("  [cuda]")
-    print('  nvdiffrast = "0.4.0"')
-    print('  torch-scatter = "2.1.2"')
-    print()
-    print("Or override with custom wheel source:")
-    print()
-    print("  [wheel_sources]")
-    print('  nvdiffrast = "https://my-mirror.com/nvdiffrast-{version}+cu{cuda_short}-{py_tag}-{platform}.whl"')
-    print()
-    print("-" * 60)
-
-    # Group by type
-    wheel_template_packages = []
-    package_name_packages = []
-
-    for name, config in PACKAGE_REGISTRY.items():
-        desc = config.get("description", "")
-        default = config.get("default_version", "")
-        if "wheel_template" in config:
-            wheel_template_packages.append((name, desc, default))
-        elif "package_name" in config:
-            package_name_packages.append((name, desc, config["package_name"]))
-
-    if wheel_template_packages:
-        print("\nDirect wheel URL packages:")
-        for name, desc, default in sorted(wheel_template_packages):
-            version_info = f" (default: {default})" if default else ""
-            print(f"  {name:20} - {desc}{version_info}")
-
-    if package_name_packages:
-        print("\nPyPI variant packages:")
-        for name, desc, pkg_template in sorted(package_name_packages):
-            print(f"  {name:20} - {desc}")
-            print(f"                       installs as: {pkg_template}")
-
-    print()
-    print("Template variables: {version}, {cuda_short}, {torch_mm}, {py_tag}, {platform}")
-    print("See README for full documentation on writing wheel templates.")
-    print()
-    return 0
-
-
 if __name__ == "__main__":
     sys.exit(main())

{comfy_env-0.0.66 → comfy_env-0.0.68}/src/comfy_env/pixi/__init__.py

@@ -13,7 +13,6 @@ from .core import (
     clean_pixi_artifacts,
     CUDA_WHEELS_INDEX,
 )
-from .registry import PACKAGE_REGISTRY
 from .cuda_detection import (
     detect_cuda_version,
     detect_cuda_environment,
@@ -24,6 +23,7 @@ from .cuda_detection import (
     GPUInfo,
     CUDAEnvironment,
 )
+from .resolver import RuntimeEnv
 
 __all__ = [
     # Core pixi functions
@@ -34,8 +34,6 @@ __all__ = [
     "pixi_install",
     "clean_pixi_artifacts",
     "CUDA_WHEELS_INDEX",
-    # Registry
-    "PACKAGE_REGISTRY",
     # CUDA detection
     "detect_cuda_version",
     "detect_cuda_environment",
@@ -45,4 +43,6 @@ __all__ = [
     "get_recommended_cuda_version",
     "GPUInfo",
     "CUDAEnvironment",
+    # Resolver
+    "RuntimeEnv",
 ]

{comfy_env-0.0.66 → comfy_env-0.0.68}/src/comfy_env/pixi/core.py

@@ -252,24 +252,10 @@ def pixi_install(
     dependencies.setdefault("pip", "*")  # Always include pip
     pixi_data["dependencies"] = dependencies
 
-    # Add pypi-options for CUDA wheels
+    # Add pypi-options for PyTorch index (CUDA packages installed separately via pip)
     if cfg.has_cuda and cuda_version:
         pypi_options = pixi_data.get("pypi-options", {})
-        # Merge find-links (pixi expects [{url: "..."}, ...] format)
-        find_links = pypi_options.get("find-links", [])
-        existing_urls = {
-            entry.get("url") if isinstance(entry, dict) else entry
-            for entry in find_links
-        }
-        if CUDA_WHEELS_INDEX not in existing_urls:
-            find_links.append({"url": CUDA_WHEELS_INDEX})
-        # Normalize any plain strings to {url: ...} format
-        find_links = [
-            {"url": entry} if isinstance(entry, str) else entry
-            for entry in find_links
-        ]
-        pypi_options["find-links"] = find_links
-        # Merge extra-index-urls
+        # Add PyTorch CUDA index for torch installation
         cuda_short = cuda_version.replace(".", "")[:3]
         pytorch_index = f"https://download.pytorch.org/whl/cu{cuda_short}"
         extra_urls = pypi_options.get("extra-index-urls", [])
@@ -311,23 +297,31 @@ def pixi_install(
         log(f"pixi install failed:\n{result.stderr}")
         raise RuntimeError(f"pixi install failed: {result.stderr}")
 
-    # Install CUDA packages with --no-deps (avoids PyPI version conflicts)
+    # Install CUDA packages with --no-index --find-links (bypasses PyPI completely)
     if cfg.cuda_packages and cuda_version:
-        log(f"Installing CUDA packages with --no-deps: {cfg.cuda_packages}")
+        log(f"Installing CUDA packages: {cfg.cuda_packages}")
         python_path = get_pixi_python(node_dir)
         if not python_path:
             raise RuntimeError("Could not find Python in pixi environment")
 
-        pip_cmd = [
-            str(python_path), "-m", "pip", "install",
-            "--no-deps",
-            "--find-links", CUDA_WHEELS_INDEX,
-        ] + cfg.cuda_packages
+        for package in cfg.cuda_packages:
+            # Each package has its own find-links page at CUDA_WHEELS_INDEX/<package>/
+            find_links_url = f"{CUDA_WHEELS_INDEX}{package}/"
+            log(f"  Installing {package} from {find_links_url}")
+
+            pip_cmd = [
+                str(python_path), "-m", "pip", "install",
+                "--no-index",
+                "--no-deps",
+                "--no-cache-dir",
+                "--find-links", find_links_url,
+                package,
+            ]
+            result = subprocess.run(pip_cmd, capture_output=True, text=True)
+            if result.returncode != 0:
+                log(f"CUDA package install failed for {package}:\n{result.stderr}")
+                raise RuntimeError(f"CUDA package install failed: {result.stderr}")
 
-        result = subprocess.run(pip_cmd, capture_output=True, text=True)
-        if result.returncode != 0:
-            log(f"CUDA package install failed:\n{result.stderr}")
-            raise RuntimeError(f"CUDA package install failed: {result.stderr}")
         log("CUDA packages installed")
 
     # Create symlink/junction to _env_<name> for discovery (only for isolated subdirs)

{comfy_env-0.0.66 → comfy_env-0.0.68}/src/comfy_env/workers/mp.py

@@ -430,20 +430,68 @@ class MPWorker(Worker):
             return
 
         # Import torch here to avoid import at module level
+        import os
+        import sys
+
+        # Clear conda/pixi environment variables FIRST, before importing multiprocessing
+        # These can cause the child process to pick up the wrong Python interpreter
+        # or stdlib, leading to sys.version mismatch errors in platform module
+        conda_env_vars = [
+            'CONDA_PREFIX',
+            'CONDA_DEFAULT_ENV',
+            'CONDA_PYTHON_EXE',
+            'CONDA_EXE',
+            'CONDA_SHLVL',
+            'PYTHONHOME',
+            'PYTHONPATH',  # Also clear PYTHONPATH to prevent pixi paths
+            '_CE_CONDA',
+            '_CE_M',
+        ]
+        saved_env = {}
+        for var in conda_env_vars:
+            if var in os.environ:
+                saved_env[var] = os.environ.pop(var)
+
+        # Also remove pixi paths from LD_LIBRARY_PATH
+        ld_lib = os.environ.get('LD_LIBRARY_PATH', '')
+        if '.pixi' in ld_lib:
+            saved_env['LD_LIBRARY_PATH'] = ld_lib
+            # Filter out pixi paths
+            new_ld_lib = ':'.join(p for p in ld_lib.split(':') if '.pixi' not in p)
+            if new_ld_lib:
+                os.environ['LD_LIBRARY_PATH'] = new_ld_lib
+            else:
+                os.environ.pop('LD_LIBRARY_PATH', None)
+
         import torch.multiprocessing as mp
 
-        # Use spawn to get clean subprocess (no inherited CUDA context)
-        ctx = mp.get_context('spawn')
-
-        self._queue_in = ctx.Queue()
-        self._queue_out = ctx.Queue()
-        self._process = ctx.Process(
-            target=_worker_loop,
-            args=(self._queue_in, self._queue_out, self._sys_path, self._lib_path),
-            daemon=True,
-        )
-        self._process.start()
-        self._started = True
+        try:
+            # Use spawn to get clean subprocess (no inherited CUDA context)
+            ctx = mp.get_context('spawn')
+
+            # Explicitly set the spawn executable to the current Python
+            # This prevents pixi/conda from hijacking the spawn process
+            import multiprocessing.spawn as mp_spawn
+            original_exe = mp_spawn.get_executable()
+            if original_exe != sys.executable.encode() and original_exe != sys.executable:
+                print(f"[comfy-env] Warning: spawn executable was {original_exe}, forcing to {sys.executable}")
+            mp_spawn.set_executable(sys.executable)
+
+            self._queue_in = ctx.Queue()
+            self._queue_out = ctx.Queue()
+            self._process = ctx.Process(
+                target=_worker_loop,
+                args=(self._queue_in, self._queue_out, self._sys_path, self._lib_path),
+                daemon=True,
+            )
+            self._process.start()
+            self._started = True
+
+            # Restore original executable setting
+            mp_spawn.set_executable(original_exe)
+        finally:
+            # Restore env vars in parent process
+            os.environ.update(saved_env)
 
     def call(
         self,

comfy_env-0.0.66/src/comfy_env/pixi/registry.py

@@ -1,130 +0,0 @@
-"""Built-in registry of CUDA packages and their wheel sources.
-
-This module loads package configurations from wheel_sources.yml and provides
-lookup functions for the install module.
-
-Each package has either:
-- wheel_template: Direct URL template for .whl file
-- package_name: PyPI package name template (for packages like spconv-cu124)
-"""
-
-from pathlib import Path
-from typing import Any, Dict, Optional
-
-import yaml
-
-
-def get_cuda_short2(cuda_version: str) -> str:
-    """Convert CUDA version to 2-3 digit format for spconv.
-
-    spconv uses "cu124" not "cu1240" for CUDA 12.4.
-
-    Args:
-        cuda_version: CUDA version string (e.g., "12.4", "12.8")
-
-    Returns:
-        Short format string (e.g., "124", "128")
-
-    Examples:
-        >>> get_cuda_short2("12.4")
-        '124'
-        >>> get_cuda_short2("12.8")
-        '128'
-    """
-    parts = cuda_version.split(".")
-    major = parts[0]
-    minor = parts[1] if len(parts) > 1 else "0"
-    return f"{major}{minor}"
-
-
-def _load_wheel_sources() -> Dict[str, Dict[str, Any]]:
-    """Load package registry from wheel_sources.yml."""
-    yml_path = Path(__file__).parent / "wheel_sources.yml"
-    with open(yml_path, "r") as f:
-        data = yaml.safe_load(f)
-    return data.get("packages", {})
-
-
-# Load registry at module import time
-PACKAGE_REGISTRY: Dict[str, Dict[str, Any]] = _load_wheel_sources()
-
-
-def get_package_info(package: str) -> Optional[Dict[str, Any]]:
-    """Get registry info for a package.
-
-    Args:
-        package: Package name (case-insensitive)
-
-    Returns:
-        Registry entry dict or None if not found
-    """
-    return PACKAGE_REGISTRY.get(package.lower())
-
-
-def list_packages() -> Dict[str, str]:
-    """List all registered packages with their descriptions.
-
-    Returns:
-        Dict mapping package name to description
-    """
-    return {
-        name: info.get("description", "No description")
-        for name, info in PACKAGE_REGISTRY.items()
-    }
-
-
-def is_registered(package: str) -> bool:
-    """Check if a package is in the registry.
-
-    Args:
-        package: Package name (case-insensitive)
-
-    Returns:
-        True if package is registered
-    """
-    return package.lower() in PACKAGE_REGISTRY
-
-
-def get_wheel_template(package: str) -> Optional[str]:
-    """Get wheel_template for a package.
-
-    Args:
-        package: Package name (case-insensitive)
-
-    Returns:
-        wheel_template string or None if not found/not available
-    """
-    info = get_package_info(package)
-    if info:
-        return info.get("wheel_template")
-    return None
-
-
-def get_package_name_template(package: str) -> Optional[str]:
-    """Get package_name template for PyPI variant packages (like spconv).
-
-    Args:
-        package: Package name (case-insensitive)
-
-    Returns:
-        package_name template string or None if not found/not available
-    """
-    info = get_package_info(package)
-    if info:
-        return info.get("package_name")
-    return None
-
-
-def get_default_version(package: str) -> Optional[str]:
-    """Get default_version for a package.
-
-    Args:
-        package: Package name (case-insensitive)
-
-    Returns:
-        default_version string or None if not specified
-    """
-    info = get_package_info(package)
-    if info:
-        return info.get("default_version")
-    return None

comfy_env-0.0.66/src/comfy_env/pixi/wheel_sources.yml

@@ -1,141 +0,0 @@
-# Wheel sources registry for CUDA packages
-#
-# Each package has a single wheel_template that resolves to a direct .whl URL.
-# Users can override these in their comfy-env.toml [wheel_sources] section.
-#
-# Template variables:
-#   {version}        - Package version (e.g., "0.4.0")
-#   {cuda_version}   - Full CUDA version (e.g., "12.8")
-#   {cuda_short}     - CUDA without dot (e.g., "128")
-#   {cuda_major}     - CUDA major version (e.g., "12")
-#   {torch_version}  - Full PyTorch version (e.g., "2.8.0")
-#   {torch_short}    - PyTorch without dots (e.g., "280")
-#   {torch_mm}       - PyTorch major.minor no dot (e.g., "28")
-#   {torch_dotted_mm}- PyTorch major.minor with dot (e.g., "2.8")
-#   {py_version}     - Python version (e.g., "3.10")
-#   {py_short}       - Python without dot (e.g., "310")
-#   {py_minor}       - Python minor version only (e.g., "10")
-#   {py_tag}         - Python tag (e.g., "cp310")
-#   {platform}       - Platform tag (e.g., "linux_x86_64")
-
-packages:
-  # ===========================================================================
-  # PyTorch Geometric (PyG) - official wheels
-  # https://pytorch-geometric.readthedocs.io/en/latest/install/installation.html
-  # ===========================================================================
-  torch-scatter:
-    wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_scatter-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "2.1.2"
-    description: Scatter operations for PyTorch
-
-  torch-cluster:
-    wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_cluster-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "1.6.3"
-    description: Clustering algorithms for PyTorch
-
-  torch-sparse:
-    wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_sparse-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.6.18"
-    description: Sparse tensor operations for PyTorch
-
-  torch-spline-conv:
-    wheel_template: "https://data.pyg.org/whl/torch-{torch_version}%2Bcu{cuda_short}/torch_spline_conv-{version}%2Bpt{torch_mm}cu{cuda_short}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "1.2.2"
-    description: Spline convolutions for PyTorch
-
-  # ===========================================================================
-  # PozzettiAndrea cuda-wheels (GitHub releases)
-  # https://github.com/PozzettiAndrea/cuda-wheels/releases
-  # ===========================================================================
-  pytorch3d:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/pytorch3d-latest/pytorch3d-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.7.9"
-    description: PyTorch3D - 3D deep learning library
-
-  nvdiffrast:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/nvdiffrast-latest/nvdiffrast-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.4.0"
-    description: NVIDIA differentiable rasterizer
-
-  cumesh:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/cumesh-latest/cumesh-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.0.1"
-    description: CUDA-accelerated mesh utilities
-
-  cubvh:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/cubvh-latest/cubvh-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.1.2"
-    description: CUDA BVH acceleration for mesh operations and marching cubes
-
-  o_voxel:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/o_voxel-latest/o_voxel-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.0.1"
-    description: O-Voxel CUDA extension for TRELLIS
-
-  flex_gemm:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/flex_gemm-latest/flex_gemm-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "1.0.0"
-    description: Flexible GEMM operations
-
-  nvdiffrec_render:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/nvdiffrec_render-latest/nvdiffrec_render-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.0.1"
-    description: NVDiffRec rendering utilities
-
-  gsplat:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/gsplat-latest/gsplat-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "1.5.3"
-    description: Gaussian splatting rasterization
-
-  cc_torch:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/cc_torch-latest/cc_torch-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.2"
-    description: GPU-accelerated connected components
-
-  torch_generic_nms:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/torch_generic_nms-latest/torch_generic_nms-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.1"
-    description: GPU-accelerated Non-Maximum Suppression
-
-  lietorch:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/lietorch-latest/lietorch-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.3"
-    description: Lie group operations for PyTorch (DPVO dependency)
-
-  sageattention:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/sageattention-latest/sageattention-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "2.2.0"
-    description: SageAttention - 2-5x faster than FlashAttention with quantized kernels
-
-  dpvo-cuda:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/dpvo_cuda-latest/dpvo_cuda-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "0.0.0"
-    description: DPVO CUDA extensions (cuda_corr, cuda_ba, lietorch_backends) - torch 2.4 only
-
-  # ===========================================================================
-  # detectron2 - Facebook's detection library
-  # https://github.com/facebookresearch/detectron2
-  # Prebuilt wheels from miropsota's torch_packages_builder
-  # ===========================================================================
-  detectron2:
-    find_links: "https://miropsota.github.io/torch_packages_builder/detectron2/"
-    default_version: "0.6"
-    description: Detectron2 - Facebook's detection and segmentation library
-
-  # ===========================================================================
-  # flash-attn - Dao-AILab (Linux x86_64)
-  # For other platforms, users should add custom wheel_source in their config
-  # ===========================================================================
-  flash-attn:
-    wheel_template: "https://github.com/Dao-AILab/flash-attention/releases/download/v{version}/flash_attn-{version}%2Bcu{cuda_major}torch{torch_dotted_mm}cxx11abiTRUE-{py_tag}-{py_tag}-linux_x86_64.whl"
-    description: Flash Attention for fast transformer inference (Linux x86_64)
-
-  # ===========================================================================
-  # spconv - Sparse convolution library
-  # PyPI with CUDA-versioned package names (spconv-cu124, spconv-cu126, etc.)
-  # Note: This uses a special package_name field, not wheel_template
-  # ===========================================================================
-  spconv:
-    wheel_template: "https://github.com/PozzettiAndrea/cuda-wheels/releases/download/spconv_cu{cuda_short}-latest/spconv_cu{cuda_short}-{version}%2Bcu{cuda_short}torch{torch_mm}-{py_tag}-{py_tag}-{platform}.whl"
-    default_version: "2.3.8"
-    description: Sparse convolution library