Skip to content

Use torch CUDA 12.6 as default #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robinjhuang merged 1 commit into from
Feb 1, 2025
Merged

Use torch CUDA 12.6 as default #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run-on-gpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
env:
PYTHONPATH: ${{ github.workspace }}
TEST_E2E: true
TEST_E2E_COMFY_INSTALL_FLAGS: --nvidia --cuda-version 12.4
TEST_E2E_COMFY_INSTALL_FLAGS: --nvidia --cuda-version 12.6
TEST_E2E_COMFY_LAUNCH_FLAGS_EXTRA: ""
run: |
pytest tests/e2e
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
python -m pip install --upgrade pip
pip install pytest
pip install -e .
comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --nvidia --cuda-version 12.4 --skip-manager
comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --nvidia --cuda-version 12.6 --skip-manager
comfy --workspace ./ComfyUI standalone --platform windows --proc x86_64
ls
comfy standalone --rehydrate --platform windows --proc x86_64
Expand Down
2 changes: 1 addition & 1 deletion comfy_cli/cmdline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def install(
callback=g_gpu_exclusivity.validate,
),
] = None,
cuda_version: Annotated[CUDAVersion, typer.Option(show_default=True)] = CUDAVersion.v12_4,
cuda_version: Annotated[CUDAVersion, typer.Option(show_default=True)] = CUDAVersion.v12_6,
amd: Annotated[
Optional[bool],
typer.Option(
Expand Down
10 changes: 8 additions & 2 deletions comfy_cli/command/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@
"torchvision",
"torchaudio",
]
if plat == constants.OS.WINDOWS and cuda_version == constants.CUDAVersion.v12_4:

if plat == constants.OS.WINDOWS and cuda_version == constants.CUDAVersion.v12_6:
base_command += [

Check warning on line 73 in comfy_cli/command/install.py

View check run for this annotation

Codecov / codecov/patch

comfy_cli/command/install.py#L72-L73 

Added lines #L72 - L73 were not covered by tests
"--extra-index-url",
"https://download.pytorch.org/whl/cu126",
]
elif plat == constants.OS.WINDOWS and cuda_version == constants.CUDAVersion.v12_4:

Check warning on line 77 in comfy_cli/command/install.py

View check run for this annotation

Codecov / codecov/patch

comfy_cli/command/install.py#L77 

Added line #L77 was not covered by tests
base_command += [
"--extra-index-url",
"https://download.pytorch.org/whl/cu124",
Expand Down Expand Up @@ -164,7 +170,7 @@
commit: Optional[str] = None,
manager_commit: Optional[str] = None,
gpu: constants.GPU_OPTION = None,
cuda_version: constants.CUDAVersion = constants.CUDAVersion.v12_4,
cuda_version: constants.CUDAVersion = constants.CUDAVersion.v12_6,
plat: constants.OS = None,
skip_torch_or_directml: bool = False,
skip_requirement: bool = False,
Expand Down
1 change: 1 addition & 0 deletions comfy_cli/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class PROC(str, Enum):


class CUDAVersion(str, Enum):
v12_6 = "12.6"
v12_4 = "12.4"
v12_1 = "12.1"
v11_8 = "11.8"
Expand Down
2 changes: 1 addition & 1 deletion comfy_cli/uv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def parse_req_file(rf: PathLike, skips: Optional[list[str]] = None):

class DependencyCompiler:
rocmPytorchUrl = "https://download.pytorch.org/whl/rocm6.1"
nvidiaPytorchUrl = "https://download.pytorch.org/whl/cu121"
nvidiaPytorchUrl = "https://download.pytorch.org/whl/cu126"

overrideGpu = dedent(
"""
Expand Down
Loading