Commit Graph

445 Commits

Author SHA1 Message Date
bmaltais
369341d69f
Revert "macOS GUI functionality, sub-processed GUI components" 2023-04-01 21:28:47 -04:00
bmaltais
a4e34b79df Merge branch 'jstayco-macos_gui' into dev 2023-04-01 21:27:32 -04:00
bmaltais
c21962fa82 Merge branch 'macos_gui' of https://github.com/jstayco/kohya_ss into jstayco-macos_gui 2023-04-01 21:27:17 -04:00
JSTayco
8dd96e35ef Merge branch 'macos_gui' of https://github.com/jstayco/kohya_ss into macos_gui 2023-04-01 17:33:46 -07:00
JSTayco
b6d3f10da7 WIP File Dialog Behavior 2023-04-01 17:33:41 -07:00
bmaltais
e5bdc55f77
Merge pull request #513 from adrianlungu/fix_path_spaces
fix resize_lora not working with paths that contain spaces
2023-04-01 19:05:23 -04:00
DESKTOP-877QDKA\nokya
e6614083d4 add quotes to resize_lora_gui.py --save-to and --model to allow spaces in file paths 2023-04-02 01:43:37 +03:00
bmaltais
cd8f85d1fb Fix issue with Library 2023-04-01 16:52:04 -04:00
bmaltais
aae3263343 Update requirements 2023-04-01 16:35:50 -04:00
bmaltais
109907c6f3 Update setup file 2023-04-01 16:28:05 -04:00
bmaltais
0baaf6dc57 Remove unnecessary files 2023-04-01 16:25:53 -04:00
bmaltais
7150179155 Update missing setup files 2023-04-01 16:22:30 -04:00
bmaltais
7e9459bae7 Merge branch 'dev' of https://github.com/bmaltais/kohya_ss into dev 2023-04-01 16:09:45 -04:00
bmaltais
f57a72c050 Fix VAE Batch size steps 2023-04-01 16:09:40 -04:00
bmaltais
79b99f1085
Merge pull request #509 from jstayco/fixed_git_clone
Small fix to default to pre-existing git branch if detected in install script
2023-04-01 16:01:41 -04:00
bmaltais
ea003eba45
Merge branch 'dev' into macos_gui 2023-04-01 15:14:28 -04:00
JSTayco
4fbd74ace8 Missed two 2023-04-01 10:39:47 -07:00
JSTayco
2c470c6659 Typo fixes 2023-04-01 10:37:20 -07:00
JSTayco
14dc16ccd4 Minor fix to branch name 2023-04-01 10:18:44 -07:00
JSTayco
69deea0979 Fix auto branch switch 2023-04-01 10:17:36 -07:00
JSTayco
0dbbaf5891 Keep current branch unless specified otherwise 2023-04-01 10:15:15 -07:00
bmaltais
7c232c090c Merge branch 'jstayco-consolidated_install_scripts' into dev 2023-04-01 13:09:24 -04:00
bmaltais
9a4362fdcd Merge branch 'consolidated_install_scripts' of https://github.com/jstayco/kohya_ss into jstayco-consolidated_install_scripts 2023-04-01 13:09:02 -04:00
JSTayco
ab6c7e2082 Fixed git cloning for new directories. 2023-04-01 09:59:35 -07:00
JSTayco
882e4837b3 Check for valid install directory and upgrade pip in venv 2023-04-01 09:15:07 -07:00
JSTayco
aed9f937da Removed -v test as older versions of bash don't support that option
Made script compatible with very old version of bash, added some guards for library linking, and removed redundant library linking.
2023-04-01 08:52:45 -07:00
bmaltais
2eddd64b90 Merge latest sd-script updates 2023-04-01 07:14:25 -04:00
bmaltais
af0df3419e
Merge pull request #504 from bmaltais/dev
v21.3.9
2023-04-01 07:00:54 -04:00
bmaltais
d37aa6efad v21.3.9 2023-04-01 06:59:59 -04:00
bmaltais
1e24e29631
Merge pull request #503 from bmaltais/revert-466-consolidated_install_scripts
Revert "Consolidated Install/Launch Scripts and Improve README"
2023-04-01 06:35:51 -04:00
bmaltais
9069ee26be
Revert "Consolidated Install/Launch Scripts and Improve README" 2023-04-01 06:34:03 -04:00
bmaltais
97b004e756 Revert "Merge pull request #466 from jstayco/consolidated_install_scripts"
This reverts commit b7a719b51a, reversing
changes made to 538752ccab.
2023-04-01 06:29:45 -04:00
bmaltais
b7a719b51a
Merge pull request #466 from jstayco/consolidated_install_scripts
Consolidated Install/Launch Scripts and Improve README
2023-04-01 05:50:16 -04:00
JSTayco
b2e7d5f419 Minor help text formatting. 2023-03-31 21:38:27 -07:00
JSTayco
c92153e546 Hide pip output better with no verbosity 2023-03-31 21:21:50 -07:00
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