Merge pull request #9191 from vladmandic/torch (9eb49b04) · Commits · github_fork / Stable Diffusion Webui

.gitignore

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,4 +32,4 @@ notification.mp3
	/extensions		/extensions
	/test/stdout.txt		/test/stdout.txt
	/test/stderr.txt		/test/stderr.txt
	/cache.json		/cache.json*

environment-wsl2.yaml

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4,8 +4,8 @@ channels:
	- defaults		- defaults
	dependencies:		dependencies:
	- python=3.10		- python=3.10
	- pip=22.2.2		- pip=23.0
	- cudatoolkit=11.3		- cudatoolkit=11.8
	- pytorch=1.12.1		- pytorch=2.0
	- torchvision=0.13.1		- torchvision=0.15
	- numpy=1.23.1		- numpy=1.23
	No newline at end of file

launch.py

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -225,10 +225,10 @@ def run_extensions_installers(settings_file):
	def prepare_environment():		def prepare_environment():
	global skip_install		global skip_install

	torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 --extra-index-url https://download.pytorch.org/whl/cu117")		torch_command = os.environ.get('TORCH_COMMAND', "pip install torch torchvision --index-url https://download.pytorch.org/whl/cu118")
	requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")		requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")

	xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.16rc425')		xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')
	gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379")		gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379")
	clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")		clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")
	openclip_package = os.environ.get('OPENCLIP_PACKAGE', "git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b")		openclip_package = os.environ.get('OPENCLIP_PACKAGE', "git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b")
	@@ -296,7 +296,7 @@ def prepare_environment():

	if not os.path.isfile(requirements_file):		if not os.path.isfile(requirements_file):
	requirements_file = os.path.join(script_path, requirements_file)		requirements_file = os.path.join(script_path, requirements_file)
	run_pip(f"install -r \"{requirements_file}\"", "requirements for Web UI")		run_pip(f"install -r \"{requirements_file}\"", "requirements")

	run_extensions_installers(settings_file=args.ui_settings_file)		run_extensions_installers(settings_file=args.ui_settings_file)

requirements.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
			astunparse
	blendmodes		blendmodes
	accelerate		accelerate
	basicsr		basicsr

requirements_versions.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	blendmodes==2022		blendmodes==2022
	transformers==4.25.1		transformers==4.25.1
	accelerate==0.12.0		accelerate==0.18.0
	basicsr==1.4.2		basicsr==1.4.2
	gfpgan==1.3.8		gfpgan==1.3.8
	gradio==3.27		gradio==3.27
	numpy==1.23.3		numpy==1.23.5
	Pillow==9.4.0		Pillow==9.4.0
	realesrgan==0.3.0		realesrgan==0.3.0
	torch		torch

Admin message