Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
a99d5708
Commit
a99d5708
authored
Jul 17, 2023
by
AUTOMATIC1111
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skip installing packages with pip if theyare already installed
record time it took to launch
parent
699108bf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
7 deletions
+52
-7
modules/launch_utils.py
modules/launch_utils.py
+45
-1
requirements_versions.txt
requirements_versions.txt
+2
-2
webui.py
webui.py
+5
-4
No files found.
modules/launch_utils.py
View file @
a99d5708
# this scripts installs necessary requirements and launches main program in webui.py
import
re
import
subprocess
import
os
import
sys
...
...
@@ -9,6 +10,9 @@ from functools import lru_cache
from
modules
import
cmd_args
,
errors
from
modules.paths_internal
import
script_path
,
extensions_dir
from
modules
import
timer
timer
.
startup_timer
.
record
(
"start"
)
args
,
_
=
cmd_args
.
parser
.
parse_known_args
()
...
...
@@ -226,6 +230,44 @@ def run_extensions_installers(settings_file):
run_extension_installer
(
os
.
path
.
join
(
extensions_dir
,
dirname_extension
))
re_requirement
=
re
.
compile
(
r"\s*([-_a-zA-Z0-9]+)\s*(?:==\s*([-+_.a-zA-Z0-9]+))?\s*"
)
def
requrements_met
(
requirements_file
):
"""
Does a simple parse of a requirements.txt file to determine if all rerqirements in it
are already installed. Returns True if so, False if not installed or parsing fails.
"""
import
importlib.metadata
import
packaging.version
with
open
(
requirements_file
,
"r"
,
encoding
=
"utf8"
)
as
file
:
for
line
in
file
:
if
line
.
strip
()
==
""
:
continue
m
=
re
.
match
(
re_requirement
,
line
)
if
m
is
None
:
return
False
package
=
m
.
group
(
1
)
.
strip
()
version_required
=
(
m
.
group
(
2
)
or
""
)
.
strip
()
if
version_required
==
""
:
continue
try
:
version_installed
=
importlib
.
metadata
.
version
(
package
)
except
Exception
:
return
False
if
packaging
.
version
.
parse
(
version_required
)
!=
packaging
.
version
.
parse
(
version_installed
):
return
False
return
True
def
prepare_environment
():
torch_index_url
=
os
.
environ
.
get
(
'TORCH_INDEX_URL'
,
"https://download.pytorch.org/whl/cu118"
)
torch_command
=
os
.
environ
.
get
(
'TORCH_COMMAND'
,
f
"pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url {torch_index_url}"
)
...
...
@@ -311,6 +353,8 @@ def prepare_environment():
if
not
os
.
path
.
isfile
(
requirements_file
):
requirements_file
=
os
.
path
.
join
(
script_path
,
requirements_file
)
if
not
requrements_met
(
requirements_file
):
run_pip
(
f
"install -r
\"
{requirements_file}
\"
"
,
"requirements"
)
run_extensions_installers
(
settings_file
=
args
.
ui_settings_file
)
...
...
requirements_versions.txt
View file @
a99d5708
...
...
@@ -8,7 +8,7 @@ einops==0.4.1
fastapi==0.94.0
gfpgan==1.3.8
gradio==3.32.0
httpcore
<
=0.15
httpcore
=
=0.15
inflection==0.5.1
jsonmerge==1.8.0
kornia==0.6.7
...
...
@@ -17,7 +17,7 @@ numpy==1.23.5
omegaconf==2.2.3
open-clip-torch==2.20.0
piexif==1.1.3
psutil
~
=5.9.5
psutil
=
=5.9.5
pytorch_lightning==1.9.4
realesrgan==0.3.0
resize-right==0.0.2
...
...
webui.py
View file @
a99d5708
...
...
@@ -31,21 +31,22 @@ if log_level:
logging
.
getLogger
(
"torch.distributed.nn"
)
.
setLevel
(
logging
.
ERROR
)
# sshh...
logging
.
getLogger
(
"xformers"
)
.
addFilter
(
lambda
record
:
'A matching Triton is not available'
not
in
record
.
getMessage
())
from
modules
import
paths
,
timer
,
import_hook
,
errors
,
devices
# noqa: F401
from
modules
import
timer
startup_timer
=
timer
.
startup_timer
startup_timer
.
record
(
"launcher"
)
import
torch
import
pytorch_lightning
# noqa: F401 # pytorch_lightning should be imported after torch, but it re-enables warnings on import so import once to disable them
warnings
.
filterwarnings
(
action
=
"ignore"
,
category
=
DeprecationWarning
,
module
=
"pytorch_lightning"
)
warnings
.
filterwarnings
(
action
=
"ignore"
,
category
=
UserWarning
,
module
=
"torchvision"
)
startup_timer
.
record
(
"import torch"
)
import
gradio
# noqa: F401
startup_timer
.
record
(
"import gradio"
)
from
modules
import
paths
,
timer
,
import_hook
,
errors
,
devices
# noqa: F401
startup_timer
.
record
(
"setup paths"
)
import
ldm.modules.encoders.modules
# noqa: F401
startup_timer
.
record
(
"import ldm"
)
...
...
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