Commit Graph

390 Commits

Author SHA1 Message Date
JSTayco
bd2e829ae3 More safeties around Python ops
More safeties and more code consolidation. Now we try to exit the python venv after all the python operations. All the python operations were consolidated to facilitate this.
2023-03-31 17:24:09 -07:00
JSTayco
e5b2257d7d Integrated upgrade.sh
Integrated upgrade.sh functionality, consolidated code to install dependencies, added ability to skip git operations, ensured the script can run from anywhere aimed at installation anywhere, ensured all git commnds worked from anywhere aimed at target folder, normalized specified install directory names (always get the absolute path).
2023-03-31 16:39:28 -07:00
JSTayco
85946799f0 Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-30 18:20:46 -07:00
JSTayco
6e7e25cba9 Big update: Verbosity, space check skip,
Huge reorg to account for macOS and other non-Linux OSs. Verbosity levels 1-3 added (used by FDs 3-5). Simplified code by creating more shared functions.
2023-03-30 18:20:42 -07:00
jstayco
90e34cc6f7
Small improvement to an stdout line.
Just a typo fix and added a word in an echo statement.
2023-03-30 16:20:13 -07:00
jstayco
a062dabe86
Merge branch 'dev' into consolidated_install_scripts 2023-03-29 16:48:05 -07:00
bmaltais
13c4b1f73b v21.3.7 2023-03-29 19:43:23 -04:00
JSTayco
dd204ed7be Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-29 16:06:02 -07:00
JSTayco
bff107878b Default install location is now environment-based
Better default install locations and updated the README to reflect.
2023-03-29 16:05:57 -07:00
jstayco
38aab1c30a
Added forgotten getopt letter 2023-03-29 15:30:41 -07:00
JSTayco
dfe96a581d Remove hard-coded config file path 2023-03-29 15:09:42 -07:00
JSTayco
c490764c7e Simplify environment variable check 2023-03-29 15:07:04 -07:00
JSTayco
1f67aaa43b More robust df check 2023-03-29 14:47:10 -07:00
JSTayco
a58b3b616a Add -p switch to expose public URL
This adds the ability for an extra switch to expose a public URL. We default to private.
2023-03-29 14:41:17 -07:00
JSTayco
094528c7cd Inform user of config copy
Better inform the user what is happening. Upon successful configuration file copy operation, we notify the user where that config is located. Also added small sleep step before calling accelerate config to give the user a chance to read the message.
2023-03-29 13:35:10 -07:00
JSTayco
71c9459db2 Non-interactive mode, new warning, new default config for accel
We now warn the user with a nicely formatted message if they have less than 10Gb space free and offer a 10s window to cancel operations. We now try to configure accelerate with no user input by default, but allow an override.
2023-03-29 13:26:16 -07:00
JSTayco
ee1ac64034 Added setup.sh -h to the README
Some environments can't run setup.sh interactively. This will be convenient for those users.
2023-03-29 12:23:43 -07:00
JSTayco
a99ae6cff7 Fixed root detection and made more robust 2023-03-29 12:07:00 -07:00
JSTayco
403c2b051c More output and fixed package detection on Ubuntu
Ubuntu dpkg detection fixed and more output for detected distros.
2023-03-29 11:42:36 -07:00
JSTayco
9a9976bb1c Move env_var_exist first usage after the function is defined 2023-03-29 11:11:10 -07:00
JSTayco
9257f1dd05 Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-29 10:53:21 -07:00
JSTayco
20c525bd59 Enable more arbitrary install locations
Default to master branch (user can override with an argument), update the repo if we find a git folder but no venv folder (indicating blank env), rename BASE_DIR to PARENT_DIR to be more obvious, enable PARENT_DIR to account for an arbitrary amount of folders.
2023-03-29 10:53:15 -07:00
jstayco
981f634c31
Removed superfluous comment 2023-03-29 09:55:04 -07:00
JSTayco
0b5a418b39 More options, better var handlng.
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.
2023-03-29 00:47:03 -07:00
JSTayco
307c433254 The runpod update!
Script now accepts long and short arguments. Script should now help with a runpod environment and ensure apt cache is updated before package install attempt.
2023-03-28 18:07:18 -07:00
JSTayco
51e843fe2e Update setup.sh
Fixed install commands to not require user input.
2023-03-28 16:02:20 -07:00
JSTayco
8bf3ecfd1f Update setup.sh
Linux distribution detection is much more robust. We also now include the Linux distribution family. That should help downstream Linux distributions as well. For example, Manjaro will now be detected as arch and Mint Linux will be detected as Ubuntu.
2023-03-28 15:52:16 -07:00
bmaltais
ea90c05841
Merge pull request #471 from srndpty/feature/decimal-network-alpha
Change step of network_alpha from 1 to 0.1
2023-03-28 11:57:59 -04:00
bmaltais
8822eab5a6 Merge new sd-scripts updates 2023-03-28 11:54:42 -04:00
Masaki Takano
2e6ebec8b2 same change for conv_alpha 2023-03-28 21:28:41 +09:00
Masaki Takano
5c4c1d6f17 Change step of network_alpha from 1 to 0.1 2023-03-28 21:11:17 +09:00
jstayco
c79181b7ea
Update gui.sh
Removed an unnecessary debug line.
2023-03-27 18:58:30 -07:00
jstayco
8168e36326
Update setup.sh
Small comment added to clarify the purpose of the script for casual viewers.
2023-03-27 18:58:03 -07:00
Vertana
4277645b2a Consolidated Install Scripts and Improve README
Install scripts have been consolidated for every non-Windows OS. Python Requirements were consolidated. README improved to work locally and provide more information.
2023-03-27 12:37:00 -07:00
bmaltais
7b228b7f51 Merge branch 'dev' into min-sr 2023-03-27 13:25:29 -04:00
bmaltais
43f2f286ee Update README 2023-03-27 13:24:48 -04:00
bmaltais
ad018dd56d
Merge pull request #454 from kvzn/master
Fixed the bug that it did not support capital image extensions like .JPG, .JPEG
2023-03-26 11:06:58 -04:00
bmaltais
14bd126391
Merge pull request #455 from bmaltais/dev
v21.3.5
2023-03-26 06:48:41 -04:00
bmaltais
b6332ceb0f Fix missing macos requirements file 2023-03-26 06:47:26 -04:00
KVZN
3f86e8f7df Fixed the bug that it did not support capital image extensions like .JPG, .JPEG 2023-03-26 17:59:42 +08:00
bmaltais
c38c018197 Prevent the file selection GUI from running 2023-03-25 20:29:04 -04:00
bmaltais
0e25977a09
Merge pull request #446 from ykk648/master
add LAN support
2023-03-25 12:45:45 -04:00
bmaltais
070c7eb728
Merge pull request #450 from bmaltais/dev
v21.3.4
2023-03-25 12:43:35 -04:00
bmaltais
7e7a8b6aab Fix issue with msgbox 2023-03-25 12:39:02 -04:00
bmaltais
d0ffba6650 Remove bad save_model_as choices for LoRA and TI 2023-03-25 09:08:02 -04:00
bmaltais
a9aafff259 Fix issue 433 2023-03-25 07:03:31 -04:00
luanjintai
959ab91484 add LAN support 2023-03-25 15:59:57 +08:00
Bernard Maltais
ac5eccbaca Add MacOS support 2023-03-24 22:39:45 -04:00
bmaltais
13d82d3593
Merge pull request #444 from bmaltais/dev
v21.3.3
2023-03-24 13:36:27 -04:00
bmaltais
5bee4bda3f Update README 2023-03-24 13:35:55 -04:00