Merge pull request #5286 from brkirch/launch-py-mac (8fba733c) · Commits · github_fork / Stable Diffusion Webui

launch.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -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')
		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, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')
		sys.argv, update_check = extract_arg(sys.argv, '--update-check')

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		#!/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

		####################################################################

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		#clone_dir="stable-diffusion-webui"

		# Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS="--medvram --opt-split-attention"
		export COMMANDLINE_ARGS=""
		#export COMMANDLINE_ARGS=""

		# python3 executable
		#python_cmd="python3"

+10 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,14 @@
		# 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
		# shellcheck source=/dev/null
		if [[ -f webui-user.sh ]]
		@@ -51,10 +59,11 @@ fi
		can_run_as_root=0

		# read any command line flags to the webui.sh script
		while getopts "f" flag
		while getopts "f" flag > /dev/null 2>&1
		do
		case ${flag} in
		f) can_run_as_root=1;;
		*) break;;
		esac
		done