Commit Graph

67 Commits

Author SHA1 Message Date
Victor Hall 8a8a4cf3df make val optional, revert multiply algo 2023-02-08 13:04:12 -05:00
Damian Stewart 19347bcaa8 make fractional multiplier logic apply per-directory 2023-02-08 14:15:54 +01:00
Damian Stewart a7b00e9ef3 fix multiplier logic 2023-02-08 13:46:58 +01:00
Damian Stewart 4e37200dda fix multiplier issues with validation and refactor validation logic 2023-02-08 11:28:45 +01:00
damian bca1e6e594 consistent spelling 2023-02-07 18:21:05 +01:00
damian e2d9600e34 cleaner config handling 2023-02-07 18:18:21 +01:00
damian dad9e347ff log ed batch name on creation 2023-02-07 18:08:19 +01:00
damian f0d7310c12 clarify init function names 2023-02-07 17:54:00 +01:00
damian c3d844a1bc better config handling 2023-02-07 17:52:23 +01:00
damian 29396ec21b update EveryDreamValidator for noprompt's changes 2023-02-07 17:46:30 +01:00
Joel Holdbrooks 41c9f36ed7 GH-36: Add support for validation split (WIP)
Co-authored-by: Damian Stewart <office@damianstewart.com>
2023-02-06 22:10:34 -08:00
Victor Hall 85f19b9a2f doc and bug with undersized 2023-02-06 13:11:24 -05:00
Joel Holdbrooks 56f130c027 Forgot to add train.py earlier 🤦; move write_batch_schedule to train.py 2023-01-29 18:11:34 -08:00
Joel Holdbrooks 12a0cb6286 Update documentation 2023-01-29 17:58:42 -08:00
Joel Holdbrooks 3fe335f328 Update documentation 2023-01-29 17:47:10 -08:00
Joel Holdbrooks c0ec46c030 Don't need to set data loader singleton; formatting tweaks 2023-01-29 17:31:57 -08:00
Joel Holdbrooks 326d861a86 Push DLMA into main, pass config to resolve
This patch

* passes the configuration (`argparse.Namespace`) to the resolver,
* pushes the DLMA code into the main function,
* makes DLMA take a `list[ImageTrainItem]` instead of `data_root`,
* makes `EveryDreamBatch` take `DLMA` instead of `data_root`, etc.
* allows `data_root` to be a list.

By doing these things, both `EveryDreamBatch` and DLMA can be free from
data resolution logic. It also reduces the number of arguments which
need to be passed down to EDB and DLMA.
2023-01-29 17:08:54 -08:00
Victor Hall 9639237762 minor fix to multiply.txt stuff and undersized images txt output new line 2023-01-27 13:58:14 -05:00
Joel Holdbrooks 94e9abf184 Don't bind resolver 2023-01-24 08:36:40 -08:00
Joel Holdbrooks a7505df0a6 Initialize target_wh to None 2023-01-24 08:33:40 -08:00
Joel Holdbrooks e6d1096637 Filter out items with errors 2023-01-24 08:33:20 -08:00
Jan Gerritsen 44fcbb6aa7 Bugfix: Adding same Tag twice to Caption 2023-01-24 16:02:12 +01:00
Victor Hall 2ba83cf0e4 remove unnecessary skip stuff 2023-01-23 20:47:12 -05:00
Joel Holdbrooks 7e2a7ae387 Need to yield from 2023-01-23 17:12:46 -08:00
Joel Holdbrooks c106de827c Fix name typo 2023-01-23 16:58:13 -08:00
Joel Holdbrooks 620b157e6a Fix some name errors 2023-01-23 16:57:02 -08:00
Joel Holdbrooks e99a948d3c Fix property name bug 2023-01-23 12:52:53 -08:00
Joel Holdbrooks 9491ae430c Initialize is_undersized to False, fix bug in directory resolver 2023-01-23 12:44:48 -08:00
Joel Holdbrooks d9081e8198 Use tqdm in JSONResolver, add a docstring 2023-01-23 12:11:42 -08:00
Joel Holdbrooks 1a0b7994f4 Move target_wh calculation to ImageTrainItem 2023-01-23 12:00:42 -08:00
Joel Holdbrooks 1dfda8d6d4 Remove unused OptionalCallable alias 2023-01-23 11:28:11 -08:00
Joel Holdbrooks 646f383188 If there are no tags just return the main prompt 2023-01-23 11:27:12 -08:00
Joel Holdbrooks c1a66317cd Forgot to set prepared_train_data 2023-01-23 11:16:34 -08:00
Joel Holdbrooks b6c7299baf Merge branch 'main' into refactor-data-resolution 2023-01-23 08:43:23 -08:00
Joel Holdbrooks 993eabf99a Add static methods on ImageCaption for deriving captions from various sources 2023-01-23 08:22:44 -08:00
Joel Holdbrooks 316df2db7e Use data_resolver.resolve for data loading in data_loader 2023-01-23 00:15:32 -08:00
Joel Holdbrooks 0cf2cd71de Fix mistake in ImageCaption.parse 2023-01-23 00:14:50 -08:00
Joel Holdbrooks 4e6c5f4d00 Get rid of on_event callback 2023-01-22 23:58:25 -08:00
Joel Holdbrooks 9c6df69e4e Use DirectoryResolver.unzip_all 2023-01-22 23:14:16 -08:00
Joel Holdbrooks 08813eabb5 Use DirectoryResolver.recurse_data_root 2023-01-22 23:13:05 -08:00
Joel Holdbrooks aa0a2a1765 Sync recurse_data_root changes with data loader 2023-01-22 23:09:09 -08:00
Joel Holdbrooks 914a51b057 Add data.resolver module for training data resolution 2023-01-22 22:46:04 -08:00
Joel Holdbrooks 85b6aad6a9 If tags are empty, returne __main_prompt 2023-01-22 22:44:44 -08:00
Joel Holdbrooks a6cabe8d7d Add static methods to ImageCaption for deriving captions from various sources 2023-01-22 16:13:50 -08:00
Victor Hall 18d1da0459 bug fix and multiplytxt fraction stuff 2023-01-22 18:59:59 -05:00
Victor Hall 24b00ab35b add fractional support for multiply.txt 2023-01-22 01:15:50 -05:00
Victor Hall 36ece59660 better undersized log file 2023-01-20 16:23:56 -05:00
Victor Hall 1c2708dc63 few sanity checks and remove keyboard 2023-01-20 09:42:24 -05:00
Jan Gerritsen 711e263e24 Implemented system to train on a subset of the dataset, favouring higher rated images 2023-01-14 16:18:22 +01:00
Jan Gerritsen fb73c16515 Make file name extension check case insensitive, so .JPG or .PNG files will also be detected 2023-01-10 11:54:26 +01:00