Merge pull request #10975 from AUTOMATIC1111/restart3 (0819383d) · Commits · github_fork / Stable Diffusion Webui

modules/launch_utils.py

+6 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,12 @@ def prepare_environment():
		codeformer_commit_hash = os.environ.get('CODEFORMER_COMMIT_HASH', "c5b4593074ba6214284d6acd5f1719b6c5d739af")
		blip_commit_hash = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9")

		try:
		# the existance of this file is a signal to webui.sh/bat that webui needs to be restarted when it stops execution
		os.remove(os.path.join(script_path, "tmp", "restart"))
		except OSError:
		pass

		if not args.skip_python_version_check:
		check_python_version()

+9 −0

Original line number	Diff line number	Diff line
		@@ -852,3 +852,12 @@ def walk_files(path, allowed_extensions=None):
		continue

		yield os.path.join(root, filename)


		def restart_program():
		"""creates file tmp/restart and immediately stops the process, which webui.bat/webui.sh interpret as a command to start webui again"""

		with open(os.path.join(script_path, "tmp", "restart"), "w"):
		pass

		os._exit(0)

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ def apply_and_restart(disable_list, update_list, disable_all):
		shared.opts.disabled_extensions = disabled
		shared.opts.disable_all_extensions = disable_all
		shared.opts.save(shared.config_filename)
		shared.state.request_restart()
		shared.restart_program()


		def save_config_state(name):

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,12 +51,14 @@ if EXIST %ACCELERATE% goto :accelerate_launch

		:launch
		%PYTHON% launch.py %*
		if EXIST tmp/restart goto :skip_venv
		pause
		exit /b

		:accelerate_launch
		echo Accelerating
		%ACCELERATE% launch --num_cpu_threads_per_process=6 launch.py
		if EXIST tmp/restart goto :skip_venv
		pause
		exit /b

+20 −14

Original line number	Diff line number	Diff line
		@@ -203,17 +203,23 @@ prepare_tcmalloc() {
		fi
		}

		if [[ ! -z "${ACCELERATE}" ]] && [ ${ACCELERATE}="True" ] && [ -x "$(command -v accelerate)" ]
		then
		KEEP_GOING=1
		while [[ "$KEEP_GOING" -eq "1" ]]; do
		if [[ ! -z "${ACCELERATE}" ]] && [ ${ACCELERATE}="True" ] && [ -x "$(command -v accelerate)" ]; then
		printf "\n%s\n" "${delimiter}"
		printf "Accelerating launch.py..."
		printf "\n%s\n" "${delimiter}"
		prepare_tcmalloc
		exec accelerate launch --num_cpu_threads_per_process=6 "${LAUNCH_SCRIPT}" "$@"
		accelerate launch --num_cpu_threads_per_process=6 "${LAUNCH_SCRIPT}" "$@"
		else
		printf "\n%s\n" "${delimiter}"
		printf "Launching launch.py..."
		printf "\n%s\n" "${delimiter}"
		prepare_tcmalloc
		exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
		"${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
		fi

		if [[ ! -f tmp/restart ]]; then
		KEEP_GOING=0
		fi
		done