StableDiffusion/KohyaSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More options, better var handlng.

Browse Source 
Changed runpod detection to a variable to simplify maintenance and provide a mechanism for the user to force a runpod installation. Also, updated help message to acount for the change.
This commit is contained in:
JSTayco 2023-03-29 00:47:03 -07:00
parent 307c433254
commit 0b5a418b39
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
setup.sh
View File

@ -10,22 +10,25 @@ The following options are useful in a runpod environment,
but will not affect a local machine install. but will not affect a local machine install.
Usage: Usage:
setup.sh -b dev -d /workspace/kohya_ss setup.sh -b dev -d /workspace/kohya_ss -g https://mycustom.repo.tld/custom_fork.git
setup.sh --branch=dev --dir=/workspace/kohya_ss setup.sh --branch=dev --dir=/workspace/kohya_ss --git-repo=https://mycustom.repo.tld/custom_fork.git
Options: Options:
-b BRANCH, --branch=BRANCH Select which branch of kohya to checkout on new installs. -b BRANCH, --branch=BRANCH Select which branch of kohya to checkout on new installs.
-d DIR, --dir=DIR The full path you want kohya_ss installed to. -d DIR, --dir=DIR The full path you want kohya_ss installed to.
-h, --help Show this screen. -g, --git_repo You can optionally provide a git repo to checkout for runpod installation. Useful for custom forks.
-r, --runpod Forces a runpod installation. Useful if detection fails for any reason.
-h, --help Show this screen.
EOF EOF
} }
# Variables defined before the getopts loop, so we have sane default values. # Variables defined before the getopts loop, so we have sane default values.
DIR="/workspace/kohya_ss" DIR="/workspace/kohya_ss"
BRANCH="dev" BRANCH="dev"
REPO="https://github.com/bmaltais/kohya_ss.git" GIT_REPO="https://github.com/bmaltais/kohya_ss.git"
RUNPOD=false
while getopts "b:d:-:" opt; do while getopts "b:d:g:r-:" opt; do
# support long options: https://stackoverflow.com/a/28466267/519360 # support long options: https://stackoverflow.com/a/28466267/519360
if [ "$opt" = "-" ]; then # long option: reformulate OPT and OPTARG if [ "$opt" = "-" ]; then # long option: reformulate OPT and OPTARG
opt="${OPTARG%%=*}" # extract long option name opt="${OPTARG%%=*}" # extract long option name
@ -36,7 +39,8 @@ while getopts "b:d:-:" opt; do
# note the leading colon # note the leading colon
b | branch) BRANCH="$OPTARG" ;; b | branch) BRANCH="$OPTARG" ;;
d | dir) DIR="$OPTARG" ;; d | dir) DIR="$OPTARG" ;;
r | repo) REPO="$OPTARG" ;; g | git-repo) GIT_REPO="$OPTARG" ;;
r | runpod) RUNPOD=true ;;
h) display_help && exit 0 ;; h) display_help && exit 0 ;;
*) display_help && exit 0 ;; *) display_help && exit 0 ;;
esac esac
@ -54,6 +58,10 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
root=false root=false
fi fi
if env_var_exists RUNPOD_POD_ID || env_var_exists RUNPOD_API_KEY; then
RUNPOD=true
fi
env_var_exists() { env_var_exists() {
local env_var= local env_var=
env_var=$(declare -p "$1") env_var=$(declare -p "$1")
@ -110,17 +118,17 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
} }
# This is the pre-install work for a kohya installation on a runpod # This is the pre-install work for a kohya installation on a runpod
if env_var_exists RUNPOD_POD_ID || env_var_exists RUNPOD_API_KEY; then if [ "$RUNPOD" = true ]; then
if [ -d "$VENV_DIR" ]; then if [ -d "$VENV_DIR" ]; then
echo "Pre-existing installation on a runpod detected." echo "Pre-existing installation on a runpod detected."
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$VENV_DIR"/lib/python3.10/site-packages/tensorrt/ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$VENV_DIR"/lib/python3.10/site-packages/tensorrt/
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$VENV_DIR"/lib/python3.10/site-packages/nvidia/cuda_runtime/lib/ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$VENV_DIR"/lib/python3.10/site-packages/nvidia/cuda_runtime/lib/
cd "$DIR" || exit 1 cd "$DIR" || exit 1
sed -i "s/interface.launch(\*\*launch_kwargs)/interface.launch(\*\*launch_kwargs,share=True)/g" kohya_gui.py sed -i "s/interface.launch(\*\*launch_kwargs)/interface.launch(\*\*launch_kwargs,share=True)/g" ./kohya_gui.py
else else
echo "Clean installation on a runpod detected." echo "Clean installation on a runpod detected."
cd "$BASE_DIR" || exit 1 cd "$BASE_DIR" || exit 1
git clone "$REPO" git clone "$GIT_REPO"
cd "$DIR" || exit 1 cd "$DIR" || exit 1
git checkout "$BRANCH" git checkout "$BRANCH"
fi fi
@ -185,7 +193,7 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
pip install -U -I --no-deps https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/linux/xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl pip install -U -I --no-deps https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/linux/xformers-0.0.14.dev0-cp310-cp310-linux_x86_64.whl
# We need this extra package and setup if we are running in a runpod # We need this extra package and setup if we are running in a runpod
if env_var_exists RUNPOD_POD_ID || env_var_exists RUNPOD_API_KEY; then if [ "$RUNPOD" = true ]; then
pip install tensorrt pip install tensorrt
ln -s "$VENV_DIR/lib/python3.10/site-packages/tensorrt/libnvinfer_plugin.so.8" \ ln -s "$VENV_DIR/lib/python3.10/site-packages/tensorrt/libnvinfer_plugin.so.8" \
"$VENV_DIR/lib/python3.10/site-packages/tensorrt/libnvinfer_plugin.so.7" "$VENV_DIR/lib/python3.10/site-packages/tensorrt/libnvinfer_plugin.so.7"