Merge 29142227e3 into ff838657fa

.ci/update_windows/update.py

@@ -5,10 +5,10 @@ import os
 import shutil
 import filecmp
 
-def pull(repo, remote_name='origin', branch='master'):
+def pull(repo, remote_name='origin', branch='master', proxy=None):
     for remote in repo.remotes:
         if remote.name == remote_name:
-            remote.fetch()
+            remote.fetch(proxy=proxy)
             remote_master_id = repo.lookup_reference('refs/remotes/origin/%s' % (branch)).target
             merge_result, _ = repo.merge_analysis(remote_master_id)
             # Up to date, do nothing
@@ -46,6 +46,14 @@ def pull(repo, remote_name='origin', branch='master'):
 
 pygit2.option(pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0)
 repo_path = str(sys.argv[1])
+proxy = None
+if '--proxy' in sys.argv:
+    proxy_index = sys.argv.index('--proxy')
+    if proxy_index + 1 < len(sys.argv):
+        proxy = sys.argv[proxy_index + 1]
+        if len(proxy)<=0:
+            proxy = None
+
 repo = pygit2.Repository(repo_path)
 ident = pygit2.Signature('comfyui', 'comfy@ui')
 try:
@@ -73,7 +81,7 @@ else:
     repo.checkout(ref)
 
 print("pulling latest changes")  # noqa: T201
-pull(repo)
+pull(repo, proxy=proxy)
 
 if "--stable" in sys.argv:
     def latest_tag(repo):

.ci/update_windows/update_comfyui.bat

@@ -1,8 +1,10 @@
 @echo off
-..\python_embeded\python.exe .\update.py ..\ComfyUI\
+:: Set the http proxy here like `set proxy="http://127.0.0.1:888/"`. No spacebar allowed.
+set proxy=""
+..\python_embeded\python.exe .\update.py ..\ComfyUI\ --proxy %proxy%
 if exist update_new.py (
   move /y update_new.py update.py
   echo Running updater again since it got updated.
-  ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update
+  ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --proxy %proxy%
 )
 if "%~1"=="" pause

.ci/update_windows/update_comfyui_stable.bat

@@ -1,8 +1,10 @@
 @echo off
-..\python_embeded\python.exe .\update.py ..\ComfyUI\ --stable
+:: Set the http proxy here like `set proxy="http://127.0.0.1:888/"`. No spacebar allowed.
+set proxy=""
+..\python_embeded\python.exe .\update.py ..\ComfyUI\ --proxy %proxy% --stable
 if exist update_new.py (
   move /y update_new.py update.py
   echo Running updater again since it got updated.
-  ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --stable
+  ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --proxy %proxy% --stable
 )
 if "%~1"=="" pause

comfy/ldm/lightricks/model.py

@@ -456,9 +456,8 @@ class LTXVModel(torch.nn.Module):
         x = self.patchify_proj(x)
         timestep = timestep * 1000.0
 
-        attention_mask = 1.0 - attention_mask.to(x.dtype).reshape((attention_mask.shape[0], 1, -1, attention_mask.shape[-1]))
-        attention_mask = attention_mask.masked_fill(attention_mask.to(torch.bool), float("-inf"))  # not sure about this
-        # attention_mask = (context != 0).any(dim=2).to(dtype=x.dtype)
+        if attention_mask is not None and not torch.is_floating_point(attention_mask):
+            attention_mask = (attention_mask - 1).to(x.dtype).reshape((attention_mask.shape[0], 1, -1, attention_mask.shape[-1])) * torch.finfo(x.dtype).max
 
         pe = precompute_freqs_cis(indices_grid, dim=self.inner_dim, out_dtype=x.dtype)