From 760a7836eb1f8645b7c32df82085383e1859c74d Mon Sep 17 00:00:00 2001 From: brkirch Date: Sun, 4 Dec 2022 08:29:10 -0500 Subject: [PATCH 1/3] Use python3.10 for python_cmd if available --- webui-macos-env.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webui-macos-env.sh b/webui-macos-env.sh index 68d1f754..21ca1dfd 100644 --- a/webui-macos-env.sh +++ b/webui-macos-env.sh @@ -4,6 +4,11 @@ # Please modify webui-user.sh to change these instead of this file # #################################################################### +if [[ -x "$(command -v python3.10)" ]] +then + python_cmd="python3.10" +fi + 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" From a7b1ab28d562ef8a020be0129cbc4c521569cd24 Mon Sep 17 00:00:00 2001 From: brkirch Date: Sun, 4 Dec 2022 08:29:45 -0500 Subject: [PATCH 2/3] Set install_dir (per Ephil012's suggestion) Set install_dir to a correct value for macOS. Thanks to @Ephil012 for pointing out this is needed. --- webui-macos-env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/webui-macos-env.sh b/webui-macos-env.sh index 21ca1dfd..95ca9c55 100644 --- a/webui-macos-env.sh +++ b/webui-macos-env.sh @@ -9,6 +9,7 @@ then python_cmd="python3.10" fi +export install_dir="$HOME" 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" From 8bc16b7582406c54fb2aff586ed1f8d28cb3b69d Mon Sep 17 00:00:00 2001 From: brkirch Date: Sun, 4 Dec 2022 08:31:19 -0500 Subject: [PATCH 3/3] Add psutil if using macOS to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 5f3d9623..05818aa6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,3 +30,4 @@ inflection GitPython torchsde safetensors +psutil; sys_platform == 'darwin'