diff --git a/kohya_gui/class_source_model.py b/kohya_gui/class_source_model.py index f9ece65..d2d87dd 100644 --- a/kohya_gui/class_source_model.py +++ b/kohya_gui/class_source_model.py @@ -248,7 +248,7 @@ class SourceModel: interactive=True, ) self.v_parameterization = gr.Checkbox( - label="v_parameterization", + label="v_param", value=False, visible=False, min_width=130, diff --git a/sd-scripts b/sd-scripts index 264328d..123474d 160000 --- a/sd-scripts +++ b/sd-scripts @@ -1 +1 @@ -Subproject commit 264328d117dc5d17772ec0bdbac2b9f0cf4695f5 +Subproject commit 123474d784096a2a3063d1ff91ef1957b41ccc72 diff --git a/setup.sh b/setup.sh index f3a1eee..21574f0 100755 --- a/setup.sh +++ b/setup.sh @@ -23,6 +23,7 @@ Options: -i, --interactive Interactively configure accelerate instead of using default config file. -n, --no-git-update Do not update kohya_ss repo. No git pull or clone operations. -p, --public Expose public URL in runpod mode. Won't have an effect in other modes. + -q, --quiet Suppress all output except errors. -r, --runpod Forces a runpod installation. Useful if detection fails for any reason. -s, --skip-space-check Skip the 10Gb minimum storage space check. -u, --no-gui Skips launching the GUI. @@ -91,6 +92,7 @@ PARENT_DIR="" VENV_DIR="" USE_IPEX=false USE_ROCM=false +QUIET="--show_stdout" # Function to get the distro name get_distro_name() { @@ -206,20 +208,20 @@ install_python_dependencies() { case "$OSTYPE" in "lin"*) if [ "$RUNPOD" = true ]; then - python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_runpod.txt + python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_runpod.txt "$QUIET" elif [ "$USE_IPEX" = true ]; then - python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_linux_ipex.txt + python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_linux_ipex.txt "$QUIET" elif [ "$USE_ROCM" = true ] || [ -x "$(command -v rocminfo)" ] || [ -f "/opt/rocm/bin/rocminfo" ]; then - python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_linux_rocm.txt + python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_linux_rocm.txt "$QUIET" else - python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_linux.txt + python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_linux.txt "$QUIET" fi ;; "darwin"*) if [[ "$(uname -m)" == "arm64" ]]; then - python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_macos_arm64.txt + python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_macos_arm64.txt "$QUIET" else - python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_macos_amd64.txt + python "$SCRIPT_DIR/setup/setup_linux.py" --platform-requirements-file=requirements_macos_amd64.txt "$QUIET" fi ;; esac @@ -322,6 +324,7 @@ while getopts ":vb:d:g:inprus-:" opt; do i | interactive) INTERACTIVE=true ;; n | no-git-update) SKIP_GIT_UPDATE=true ;; p | public) PUBLIC=true ;; + q | quiet) QUIET="" ;; r | runpod) RUNPOD=true ;; s | skip-space-check) SKIP_SPACE_CHECK=true ;; u | no-gui) SKIP_GUI=true ;; diff --git a/setup/setup_linux.py b/setup/setup_linux.py index ba34dcf..22c6bf2 100644 --- a/setup/setup_linux.py +++ b/setup/setup_linux.py @@ -20,7 +20,7 @@ def main_menu(platform_requirements_file, show_stdout: bool = False, no_run_acce # Upgrade pip if needed setup_common.install('pip') setup_common.install_requirements_inbulk( - platform_requirements_file, show_stdout=True, + platform_requirements_file, show_stdout=show_stdout, ) # setup_common.install_requirements(platform_requirements_file, check_no_verify_flag=False, show_stdout=show_stdout) if not no_run_accelerate: