Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
ComfyUI
Commits
e543ecad
Commit
e543ecad
authored
Apr 28, 2023
by
comfyanonymous
Browse files
Fix the nightly build not being packaged correctly.
parent
27bf9392
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
97 deletions
+3
-97
.ci/nightly/update_windows/update.py
.ci/nightly/update_windows/update.py
+0
-65
.ci/nightly/update_windows/update_comfyui.bat
.ci/nightly/update_windows/update_comfyui.bat
+0
-2
.ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat
...update_windows/update_comfyui_and_python_dependencies.bat
+1
-1
.ci/nightly/windows_base_files/README_VERY_IMPORTANT.txt
.ci/nightly/windows_base_files/README_VERY_IMPORTANT.txt
+0
-27
.ci/nightly/windows_base_files/run_cpu.bat
.ci/nightly/windows_base_files/run_cpu.bat
+0
-2
.github/workflows/windows_release_nightly_pytorch.yml
.github/workflows/windows_release_nightly_pytorch.yml
+2
-0
No files found.
.ci/nightly/update_windows/update.py
deleted
100755 → 0
View file @
27bf9392
import
pygit2
from
datetime
import
datetime
import
sys
def
pull
(
repo
,
remote_name
=
'origin'
,
branch
=
'master'
):
for
remote
in
repo
.
remotes
:
if
remote
.
name
==
remote_name
:
remote
.
fetch
()
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
if
merge_result
&
pygit2
.
GIT_MERGE_ANALYSIS_UP_TO_DATE
:
return
# We can just fastforward
elif
merge_result
&
pygit2
.
GIT_MERGE_ANALYSIS_FASTFORWARD
:
repo
.
checkout_tree
(
repo
.
get
(
remote_master_id
))
try
:
master_ref
=
repo
.
lookup_reference
(
'refs/heads/%s'
%
(
branch
))
master_ref
.
set_target
(
remote_master_id
)
except
KeyError
:
repo
.
create_branch
(
branch
,
repo
.
get
(
remote_master_id
))
repo
.
head
.
set_target
(
remote_master_id
)
elif
merge_result
&
pygit2
.
GIT_MERGE_ANALYSIS_NORMAL
:
repo
.
merge
(
remote_master_id
)
if
repo
.
index
.
conflicts
is
not
None
:
for
conflict
in
repo
.
index
.
conflicts
:
print
(
'Conflicts found in:'
,
conflict
[
0
].
path
)
raise
AssertionError
(
'Conflicts, ahhhhh!!'
)
user
=
repo
.
default_signature
tree
=
repo
.
index
.
write_tree
()
commit
=
repo
.
create_commit
(
'HEAD'
,
user
,
user
,
'Merge!'
,
tree
,
[
repo
.
head
.
target
,
remote_master_id
])
# We need to do this or git CLI will think we are still merging.
repo
.
state_cleanup
()
else
:
raise
AssertionError
(
'Unknown merge analysis result'
)
repo
=
pygit2
.
Repository
(
str
(
sys
.
argv
[
1
]))
ident
=
pygit2
.
Signature
(
'comfyui'
,
'comfy@ui'
)
try
:
print
(
"stashing current changes"
)
repo
.
stash
(
ident
)
except
KeyError
:
print
(
"nothing to stash"
)
backup_branch_name
=
'backup_branch_{}'
.
format
(
datetime
.
today
().
strftime
(
'%Y-%m-%d_%H_%M_%S'
))
print
(
"creating backup branch: {}"
.
format
(
backup_branch_name
))
repo
.
branches
.
local
.
create
(
backup_branch_name
,
repo
.
head
.
peel
())
print
(
"checking out master branch"
)
branch
=
repo
.
lookup_branch
(
'master'
)
ref
=
repo
.
lookup_reference
(
branch
.
name
)
repo
.
checkout
(
ref
)
print
(
"pulling latest changes"
)
pull
(
repo
)
print
(
"Done!"
)
.ci/nightly/update_windows/update_comfyui.bat
deleted
100755 → 0
View file @
27bf9392
..\python_embeded\python.exe .\update.py ..\ComfyUI\
pause
.ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat
View file @
e543ecad
..\python_embeded\python.exe .\update.py ..\ComfyUI\
..\python_embeded\python.exe
-s -m
pip
install
--upgrade --pre
torch
torchvision
torchaudio
--extra-index-url
https
://download.pytorch.org/whl/cu11
8
-r
../ComfyUI/requirements.txt
pygit2
..\python_embeded\python.exe
-s -m
pip
install
--upgrade --pre
torch
torchvision
torchaudio
--extra-index-url
https
://download.pytorch.org/whl/cu1
2
1
-r
../ComfyUI/requirements.txt
pygit2
pause
.ci/nightly/windows_base_files/README_VERY_IMPORTANT.txt
deleted
100755 → 0
View file @
27bf9392
HOW TO RUN:
if you have a NVIDIA gpu:
run_nvidia_gpu.bat
To run it in slow CPU mode:
run_cpu.bat
IF YOU GET A RED ERROR IN THE UI MAKE SURE YOU HAVE A MODEL/CHECKPOINT IN: ComfyUI\models\checkpoints
You can download the stable diffusion 1.5 one from: https://huggingface.co/runwayml/stable-diffusion-v1-5/blob/main/v1-5-pruned-emaonly.ckpt
RECOMMENDED WAY TO UPDATE:
To update the ComfyUI code: update\update_comfyui.bat
To update ComfyUI with the python dependencies:
update\update_comfyui_and_python_dependencies.bat
.ci/nightly/windows_base_files/run_cpu.bat
deleted
100755 → 0
View file @
27bf9392
.\python_embeded\python.exe
-s
ComfyUI
\main.py
--cpu --windows-standalone-build
pause
.github/workflows/windows_release_nightly_pytorch.yml
View file @
e543ecad
...
...
@@ -46,6 +46,8 @@ jobs:
mkdir update
cp -r ComfyUI/.ci/update_windows/* ./update/
cp -r ComfyUI/.ci/windows_base_files/* ./
cp -r ComfyUI/.ci/nightly/update_windows/* ./update/
cp -r ComfyUI/.ci/nightly/windows_base_files/* ./
cd ..
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment