Merge pull request #16092 from viking1304/bash-python-version

Prioritize python3.10 over python3 if both are available on Linux and Mac (with fallback)
This commit is contained in:
AUTOMATIC1111 2024-07-06 09:52:14 +03:00 committed by GitHub
commit b9c3f4ec2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions

View File

@ -4,11 +4,6 @@
# Please modify webui-user.sh to change these instead of this file # # 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 install_dir="$HOME" export install_dir="$HOME"
export COMMANDLINE_ARGS="--skip-torch-cuda-test --upcast-sampling --no-half-vae --use-cpu interrogate" export COMMANDLINE_ARGS="--skip-torch-cuda-test --upcast-sampling --no-half-vae --use-cpu interrogate"
export PYTORCH_ENABLE_MPS_FALLBACK=1 export PYTORCH_ENABLE_MPS_FALLBACK=1

View File

@ -44,7 +44,11 @@ fi
# python3 executable # python3 executable
if [[ -z "${python_cmd}" ]] if [[ -z "${python_cmd}" ]]
then then
python_cmd="python3" python_cmd="python3.10"
fi
if [[ ! -x "$(command -v "${python_cmd}")" ]]
then
python_cmd="python3"
fi fi
# git executable # git executable