2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
492 Commits 1 Branch 0 Tags
311be36acf35f0bd9ef35d7f84bd91acf11c9914
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
2martens 311be36acf Fixed requesting non-existent property 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 12:21:08 +02:00
2martens b123d676bc Predictor sizes only required for training 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 12:20:37 +02:00
2martens 4bdd069650 Added custom objects to recover saved model 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 12:13:41 +02:00
2martens f5c8e9483a Removed obsolete CLI options 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 12:05:23 +02:00
2martens 1d372aba59 Use one trajectory only for prediction 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 12:03:38 +02:00
2martens 0c7e96ee9d Disabled early stopping 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 11:27:45 +02:00
2martens 320ba40389 Fixed paths 
- some still used no longer existing path arguments
- in most cases the directories were not created when needed

Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-09 11:22:11 +02:00
2martens 94a4c69896 Changed paths to use config provided paths 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-07 13:55:01 +02:00
2martens 3e9c90f201 Added option "ssd_forward_passes_per_image" 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-07 13:50:59 +02:00
2martens 4886fda32e Added missing argument for function call 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-07 13:43:19 +02:00
2martens ecbd7ea00b Fixed weights path 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-07 13:42:12 +02:00
2martens 322f2c51ab Fixed save dir for models 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-07 13:39:45 +02:00
2martens e3a05eb5fc Truly implemented messaging for main module 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 19:39:43 +02:00
2martens 1aa19a27ff Modified config part in CLI module to use messaging 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 19:27:17 +02:00
2martens 83083479f7 Modified main file to conform to messaging principle 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 18:49:44 +02:00
2martens 89adca3ac4 Removed obsolete import 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 17:11:29 +02:00
2martens 77e86f85e4 Added additional hyper parameters to config 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 17:11:13 +02:00
2martens da2b788447 Only save summaries if configured to do so 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 17:08:06 +02:00
2martens 662c5ec7af Extracted debug functionality into separate module 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 17:04:14 +02:00
2martens eda3496f04 Updated the SSD training with new config 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 16:43:44 +02:00
2martens 01f5de6d6c Changed config get function to return correct type 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 16:33:59 +02:00
2martens a2fe3e860a Added parameters for batch size and ssd image size 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 16:30:29 +02:00
2martens b6beebd0c1 Updated CLI arguments for prepare action 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 16:27:43 +02:00
2martens 3354a033fe Updated prepare action to use new config 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 16:25:57 +02:00
2martens f6c66d1d34 Reordered functions in cli module 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 16:15:50 +02:00
2martens 55b0e7d6b5 Added missing printing of retrieved option value 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:56:42 +02:00
2martens 75a5d9458b Config file is now updated after changing config property 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:55:55 +02:00
2martens e805034b58 Improved list action to actually print config values 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:51:31 +02:00
2martens 7819f6fceb Fixed problem with non-str values for config parser 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:48:14 +02:00
2martens 2fe02452ea Removed duplicate matplotlib requirement 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:42:16 +02:00
2martens 5e089c4bfc Improved help text for debug option 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:37:16 +02:00
2martens bf7f36174f Implemented config functionality 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 15:36:29 +02:00
2martens f32ff0b9f0 Added config actions with skeleton implementation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 14:39:14 +02:00
2martens 34a23597b5 Renamed "action" sub parsers on global level to "component" 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 14:28:11 +02:00
2martens 136b52a7f4 Added config to CLI parsers 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 14:25:58 +02:00
2martens bd499425ed Only use one trajectory for training and validation data each 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 13:15:51 +02:00
2martens 7f5a32a441 Added ability limit number of trajectories considered 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 13:15:33 +02:00
2martens d3be3ea5f9 Pickle history property instead of History object 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 13:02:06 +02:00
2martens 2b93480df9 Reversed optimizer to Tensorflow and changed beta1 to 0.9 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 12:59:51 +02:00
2martens 59a1d85af9 Change to Keras optimizer 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-04 12:33:34 +02:00
2martens d9b742f61a Improve argmax usage 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 16:00:58 +02:00
2martens 4595fa85d4 Removed empty line 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 15:56:08 +02:00
2martens 2e609e5725 Removed debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 15:51:01 +02:00
2martens a0a4193dea Remove obsolete if statement 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 15:49:33 +02:00
2martens 76de6e34fc Fixed missing directory 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 15:48:12 +02:00
2martens 22aa463152 Added code to save training images with bounding boxes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 15:45:04 +02:00
2martens 112dc48f36 Disable augmentation of input for now 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 15:10:40 +02:00
2martens e4e94940b8 Implemented task to measure number of instances per COCO class per trajectory 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 14:20:50 +02:00
2martens 6cf8f515d4 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 14:17:02 +02:00
2martens 0d14808ba7 Added progress bar to data preparation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:59:54 +02:00
2martens 15c83940fe Added wordnet id to visualised bboxes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:53:40 +02:00
2martens 92d60ad4e3 Added wordnet class name to visualised ground truth bboxes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:52:17 +02:00
2martens 8bddf320f8 Added wordnet class name to prepared ground truth 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:51:23 +02:00
2martens 3d7d97355c Reverse indices to what it should be 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:44:43 +02:00
2martens 7ad1789e24 Fixed wrong axis in preparation code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:43:56 +02:00
2martens f72ef5218a Attempt to switch axes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:38:43 +02:00
2martens da4e624f41 Close figure after usage 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:29:54 +02:00
2martens 1191761149 Fixed accessing of colour list 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:28:49 +02:00
2martens f2c718540a Fixed label retrieval 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:27:02 +02:00
2martens dd619179c5 Fixed classes variable assignment 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:25:01 +02:00
2martens 58d85a7efc Add debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:21:26 +02:00
2martens eb9f1fb3a2 Fixed typo 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:18:17 +02:00
2martens 360f84f954 Added visualise task 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 11:13:38 +02:00
2martens b79ba0bea4 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-07-02 10:34:17 +02:00
2martens 93c8643373 Entire first batch of train images are saved 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 11:10:25 +02:00
2martens 180556f6ba Correctly access one training image 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 11:04:57 +02:00
2martens 25c4908825 Fixed retrieval of train image 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 11:00:51 +02:00
2martens ce6d67cf4c Added debug print for example train image 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 10:57:57 +02:00
2martens a66db745bf Convert example training image to numpy 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 10:56:28 +02:00
2martens 392927d4c7 Fixed saving of train image 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 10:52:52 +02:00
2martens a0b1c98fb4 Save example train image 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-24 10:41:51 +02:00
2martens 8678f14083 Update correct batch size 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 14:08:20 +02:00
2martens 78ab277ce7 Attempt batch size of 32 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 14:00:32 +02:00
2martens 4bc3cb2a81 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 13:45:55 +02:00
2martens 13f4abad0d Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 13:40:47 +02:00
2martens 76ae44197e Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 13:38:36 +02:00
2martens 5422bcb706 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 13:27:06 +02:00
2martens c22a98c833 Reversed previous commit 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 13:00:40 +02:00
2martens 0c02a94a33 Returned number of val batches to previous value 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 12:51:19 +02:00
2martens 0a2857f31d Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 12:45:07 +02:00
2martens e204ef6617 Added imutils to required packages 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-20 12:44:52 +02:00
2martens f14f0ae200 Set number of validation steps to 20 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-19 14:32:54 +02:00
2martens d1ee766579 Fixed save location for models and the weights 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-19 11:24:42 +02:00
2martens c6123607d9 Prevent remainder batch with fewer elements than rest 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-18 10:36:47 +02:00
2martens 9153828ff5 Remove images from data set that do not have instances 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-18 10:25:59 +02:00
2martens 9a5c96c46c Removed metrics that are unavailable in tensorflow 1.12 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-17 18:30:04 +02:00
2martens 2b64209bda Added missing function argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-17 18:20:02 +02:00
2martens b41b58930d Adapted evaluation code to new file structure of saved labels 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 17:20:50 +02:00
2martens 232e531a9d Changed name of val to test 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 17:03:29 +02:00
2martens f9da5e8236 Improved name of test to evaluate 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 17:01:00 +02:00
2martens b2a1db6485 Updated predict functionality to use Keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 16:56:12 +02:00
2martens d466e8e376 Added predict function that uses Keras functionality 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 16:52:25 +02:00
2martens 77a195a144 Improved data generation to cover evaluation cases as well 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 16:51:59 +02:00
2martens f8bed423e4 Added inverse transforms to output of non-training generators 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 16:06:21 +02:00
2martens cc74a8674e Added missing steps and aspect ratios to the label encoder 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 15:58:44 +02:00
2martens 49a320ca12 Changed mode argument to training argument to better reflect requirements 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 15:12:37 +02:00
2martens c260b7d824 Finished conversion of training functionality to keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 15:07:46 +02:00
2martens 7d287c4432 Added train function which utilises the Keras train functions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 15:00:54 +02:00
2martens 88010c5914 Added type hinting for attributes of SSD wrapper objects 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 14:12:13 +02:00
2martens cc9b3abe9b Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 14:04:42 +02:00