diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml index 201546efe..045996070 100644 --- a/.github/workflows/stale-issues.yml +++ b/.github/workflows/stale-issues.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/stale@v9 with: - stale-issue-message: 'This issue is being marked stale because it has not had any activity for 30 days. Reply below within 7 days if your issue still isn't solved, and it will be left open. Otherwise, the issue will be closed automatically.' + stale-issue-message: "This issue is being marked stale because it has not had any activity for 30 days. Reply below within 7 days if your issue still isn't solved, and it will be left open. Otherwise, the issue will be closed automatically." days-before-stale: 30 days-before-close: 7 stale-issue-label: 'Stale' diff --git a/comfy/model_management.py b/comfy/model_management.py index e94fe81df..01f4ac4d7 100644 --- a/comfy/model_management.py +++ b/comfy/model_management.py @@ -386,8 +386,10 @@ def offloaded_memory(loaded_models, device): offloaded_mem += m.model_offloaded_memory() return offloaded_mem +WINDOWS = any(platform.win32_ver()) + EXTRA_RESERVED_VRAM = 400 * 1024 * 1024 -if any(platform.win32_ver()): +if WINDOWS: EXTRA_RESERVED_VRAM = 600 * 1024 * 1024 #Windows is higher because of the shared vram issue if args.reserve_vram is not None: @@ -1018,7 +1020,10 @@ def should_use_fp16(device=None, model_params=0, prioritize_performance=True, ma nvidia_10_series = ["1080", "1070", "titan x", "p3000", "p3200", "p4000", "p4200", "p5000", "p5200", "p6000", "1060", "1050", "p40", "p100", "p6", "p4"] for x in nvidia_10_series: if x in props.name.lower(): - return True + if WINDOWS or manual_cast: + return True + else: + return False #weird linux behavior where fp32 is faster if manual_cast: free_model_memory = maximum_vram_for_weights(device)