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
8fba733c
Commit
8fba733c
authored
Dec 03, 2022
by
AUTOMATIC1111
Committed by
GitHub
Dec 03, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5286 from brkirch/launch-py-mac
Add macOS (Darwin) installation defaults
parents
60bd4d52
5ec8981d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
2 deletions
+25
-2
launch.py
launch.py
+1
-0
webui-macos-env.sh
webui-macos-env.sh
+13
-0
webui-user.sh
webui-user.sh
+1
-1
webui.sh
webui.sh
+10
-1
No files found.
launch.py
View file @
8fba733c
...
@@ -186,6 +186,7 @@ def prepare_enviroment():
...
@@ -186,6 +186,7 @@ def prepare_enviroment():
parser
.
add_argument
(
"--ui-settings-file"
,
type
=
str
,
help
=
"filename to use for ui settings"
,
default
=
'config.json'
)
parser
.
add_argument
(
"--ui-settings-file"
,
type
=
str
,
help
=
"filename to use for ui settings"
,
default
=
'config.json'
)
args
,
_
=
parser
.
parse_known_args
(
sys
.
argv
)
args
,
_
=
parser
.
parse_known_args
(
sys
.
argv
)
sys
.
argv
,
_
=
extract_arg
(
sys
.
argv
,
'-f'
)
sys
.
argv
,
skip_torch_cuda_test
=
extract_arg
(
sys
.
argv
,
'--skip-torch-cuda-test'
)
sys
.
argv
,
skip_torch_cuda_test
=
extract_arg
(
sys
.
argv
,
'--skip-torch-cuda-test'
)
sys
.
argv
,
reinstall_xformers
=
extract_arg
(
sys
.
argv
,
'--reinstall-xformers'
)
sys
.
argv
,
reinstall_xformers
=
extract_arg
(
sys
.
argv
,
'--reinstall-xformers'
)
sys
.
argv
,
update_check
=
extract_arg
(
sys
.
argv
,
'--update-check'
)
sys
.
argv
,
update_check
=
extract_arg
(
sys
.
argv
,
'--update-check'
)
...
...
webui-macos-env.sh
0 → 100644
View file @
8fba733c
#!/bin/bash
####################################################################
# macOS defaults #
# Please modify webui-user.sh to change these instead of this file #
####################################################################
export
COMMANDLINE_ARGS
=
"--skip-torch-cuda-test --no-half --use-cpu interrogate"
export
TORCH_COMMAND
=
"pip install torch==1.12.1 torchvision==0.13.1"
export
K_DIFFUSION_REPO
=
"https://github.com/brkirch/k-diffusion.git"
export
K_DIFFUSION_COMMIT_HASH
=
"51c9778f269cedb55a4d88c79c0246d35bdadb71"
export
PYTORCH_ENABLE_MPS_FALLBACK
=
1
####################################################################
webui-user.sh
View file @
8fba733c
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
#clone_dir="stable-diffusion-webui"
#clone_dir="stable-diffusion-webui"
# Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS="--medvram --opt-split-attention"
# Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS="--medvram --opt-split-attention"
export
COMMANDLINE_ARGS
=
""
#
export COMMANDLINE_ARGS=""
# python3 executable
# python3 executable
#python_cmd="python3"
#python_cmd="python3"
...
...
webui.sh
View file @
8fba733c
...
@@ -4,6 +4,14 @@
...
@@ -4,6 +4,14 @@
# change the variables in webui-user.sh instead #
# change the variables in webui-user.sh instead #
#################################################
#################################################
# If run from macOS, load defaults from webui-macos-env.sh
if
[[
"
$OSTYPE
"
==
"darwin"
*
]]
;
then
if
[[
-f
webui-macos-env.sh
]]
then
source
./webui-macos-env.sh
fi
fi
# Read variables from webui-user.sh
# Read variables from webui-user.sh
# shellcheck source=/dev/null
# shellcheck source=/dev/null
if
[[
-f
webui-user.sh
]]
if
[[
-f
webui-user.sh
]]
...
@@ -51,10 +59,11 @@ fi
...
@@ -51,10 +59,11 @@ fi
can_run_as_root
=
0
can_run_as_root
=
0
# read any command line flags to the webui.sh script
# read any command line flags to the webui.sh script
while
getopts
"f"
flag
while
getopts
"f"
flag
>
/dev/null 2>&1
do
do
case
${
flag
}
in
case
${
flag
}
in
f
)
can_run_as_root
=
1
;;
f
)
can_run_as_root
=
1
;;
*
)
break
;;
esac
esac
done
done
...
...
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