Commit Graph

460 Commits

Author SHA1 Message Date
JSTayco 2a24a8b6fc Update setup.sh 2023-03-31 21:11:24 -07:00
JSTayco a740fdb006 Update setup.sh 2023-03-31 21:09:43 -07:00
JSTayco fbf6709946 More safeties around git
And more error messages in verbose mode
2023-03-31 21:03:25 -07:00
JSTayco 4559528d33 git is now location indpendent
removed all cd commands in process
2023-03-31 20:54:21 -07:00
JSTayco 035dad220a git is now location independent
Removed the cd commands in the process
2023-03-31 20:51:49 -07:00
jstayco d8285a7040
Merge branch 'dev' into consolidated_install_scripts 2023-03-31 20:03:32 -07:00
JSTayco febd553864 Python is now more dynamic
Made python and the requirements.txt location independent.
2023-03-31 20:00:56 -07:00
JSTayco b02fb86765 Small README update
Updates README to cover new location change and adds one small comment to clarify a variable
2023-03-31 19:30:43 -07:00
bmaltais 538752ccab
Merge pull request #496 from missionfloyd/setup-batch
Add setup/upgrade batch files
2023-03-31 22:24:34 -04:00
JSTayco 1ff4a609a1 Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into consolidated_install_scripts 2023-03-31 17:24:12 -07:00
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 fcffc131e1
Typo fix in README 2023-03-31 16:59:04 -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
missionfloyd e6da2d135b Add setup/upgrade batch files 2023-03-31 16:45:04 -06:00
JSTayco eef5becab8 All sorts of broken, but I need to commit this for now so I don't lose it. WIP: Using some OOP to reduce imports and centralize some code. No need to remake Tk Windows everywhere for example. Renamed common_gui to common_gui_functions.py to make some of the new code separation more obvious. 2023-03-31 14:39:10 -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 e5b83df675 Removed one warning dealing with get_file_path()
Using lambdas now to pass in variable amount of arguments from components. This works right now with a few open windows, but saving and possibly loading will be broken right now. They need the lambda treatment next.

I also split the JSON validation placeholder to library/common_utilities.py.
2023-03-30 13:13:25 -07:00
bmaltais c001c80e02
Merge pull request #484 from bmaltais/dev
Fix issue with LyCORIS version
2023-03-30 07:23:55 -04:00
bmaltais 9f6e0c1c8f Fix issue with LyCORIS version 2023-03-30 07:23:37 -04:00
jstayco 160e371be3
Merge branch 'dev' into macos_gui 2023-03-30 01:53:32 -07:00
JSTayco 7b5639cff5 Huge WIP
This is a massive WIP and should not be trusted or used right now. However, major milestones have been crossed. Both message boxes and file dialogs are now properly subprocessed and work on macOS. I think by extension, it may work on runpod environments as well, but that remains to be tested.
2023-03-30 01:40:00 -07:00
jstayco a062dabe86
Merge branch 'dev' into consolidated_install_scripts 2023-03-29 16:48:05 -07:00
bmaltais f580520556
Merge pull request #480 from bmaltais/dev
v21.3.7
2023-03-29 19:44:09 -04: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 79bffae5ef
Merge pull request #474 from bmaltais/dev
v21.3.6
2023-03-28 11:55:22 -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