Merge branch 'dev' into master

This commit is contained in:
AUTOMATIC1111
2023-05-18 10:26:35 +03:00
committed by GitHub
137 changed files with 3580 additions and 2755 deletions

View File

@@ -94,6 +94,14 @@ else
printf "\n%s\n" "${delimiter}"
fi
if [[ $(getconf LONG_BIT) = 32 ]]
then
printf "\n%s\n" "${delimiter}"
printf "\e[1m\e[31mERROR: Unsupported Running on a 32bit OS\e[0m"
printf "\n%s\n" "${delimiter}"
exit 1
fi
if [[ -d .git ]]
then
printf "\n%s\n" "${delimiter}"
@@ -118,9 +126,8 @@ case "$gpu_info" in
esac
if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
then
# Apparently now this works
export TORCH_COMMAND="pip install torch==2.0.1+rocm5.4.2 torchvision==0.15.2+rocm5.4.2 --index-url https://download.pytorch.org/whl/rocm5.4.2"
fi
fi
for preq in "${GIT}" "${python_cmd}"
do