2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
406 Commits 1 Branch 0 Tags
2b64209bda28eb5cbec09a94be6fd34d3b414857
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2martens 87133dd885 Modified data module to work with SSD data generator 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 13:30:02 +02:00
2martens 693594e75c Improved function name for SceneNet data preparation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 12:05:19 +02:00
2martens 58723adfe0 Corrected module doc 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-13 12:02:04 +02:00
2martens a4e6ac2853 Added missing argument of num_epochs 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 12:06:22 +02:00
2martens 057bffcae3 Corrected summary path for ssd training 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 12:02:04 +02:00
2martens eef6078533 Added print to show epoch number 
This can be used to identify if the data set is in fact repeated.
In that case this print line has to be printed at least twice.

Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 12:00:08 +02:00
2martens fe516f6429 Added additional values to print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 11:34:18 +02:00
2martens 83b9e670f8 Moved loss metric assignment into begin of epoch 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 11:34:04 +02:00
2martens f6f6a88c50 Improve verbose printing for training 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 11:31:04 +02:00
2martens e908248f89 Removed unnecessary empty lines 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-11 11:10:41 +02:00
2martens 6cebcb8177 Optimised verbose and debug console options 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 16:58:48 +02:00
2martens 4ccaad2ff0 Prevented division by zero errors 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 16:55:23 +02:00
2martens ca90ea9f17 Fixed guardian if to work with numpy arrays 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 16:55:07 +02:00
2martens 488703bb26 Made f1 score calculation robust against classes with zero predictions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 16:49:17 +02:00
2martens 15498549b7 Fixed mode of native SSD for val 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 14:17:50 +02:00
2martens 9dbfa5c640 Added train iteration argument to CLI 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 11:27:10 +02:00
2martens e602e7339d Provided checkpoint path in validation case 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 11:21:35 +02:00
2martens 4b85dd8376 Adjusted predict function to new checkpoint design 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-10 11:17:17 +02:00
2martens 110e098d78 Removed double-iteration over epochs 
1. Dataset was repeated nr_epochs times
2. loop over dataset was repeated nr_epoch times
Consequence: each checkpointed epoch was in fact nr_epochs long

Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-06 11:06:59 +02:00
2martens c893954120 Added aspect_ratios_per_layer to arguments for SSDInputEncoder 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:56:07 +02:00
2martens 1b52f4c9dc Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:48:28 +02:00
2martens 9f02297a52 Added steps to arguments for SSDInputEncoder 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:48:19 +02:00
2martens efda35adb7 Fixed encoding of labels 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:35:08 +02:00
2martens eadd4a9273 Added missing keyword argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:22:22 +02:00
2martens fa2edbcede Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:19:30 +02:00
2martens 5397233b6e Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:09:55 +02:00
2martens a586dd8297 Fix issue with non-checkpointable custom class object 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:06:05 +02:00
2martens 2ce6687efc Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 12:00:17 +02:00
2martens 3290bed0cb Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 11:57:08 +02:00
2martens 292e5e3c95 Implemented mising encoding for labels 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 11:49:44 +02:00
2martens 28abe6ae47 Ensure training only affects classifier layers 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 11:31:22 +02:00
2martens 5e7b16402b Implemented SSD train action 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 11:09:46 +02:00
2martens db9ab462ef Extracted cli actions into separate module 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-05 10:57:46 +02:00
2martens f1fe8ddfc5 Fixed if clause to catch empty list as well 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 11:00:25 +02:00
2martens d370604279 Added another debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:59:06 +02:00
2martens 810a390b4e Added debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:51:56 +02:00
2martens 9a32a170cf Removed obsolete file 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:46:41 +02:00
2martens 80da94fcab Improves wording of prepare functionality documentation 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:46:32 +02:00
2martens 13cecd2254 Improved formatting of main 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:36:18 +02:00
2martens 9851cef758 Improved formatting of train protobuf file 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:35:44 +02:00
2martens 2d5e3ff2e6 Added scenenet protobuf file for train data 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-04 10:27:41 +02:00
2martens 68b7377238 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:45:20 +02:00
2martens 9e0edb5d79 Fix not created directory 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:45:09 +02:00
2martens 5ea412a2d0 Ensure consistent arrays in match_predictions 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:43:22 +02:00
2martens 1c37dc8fb1 Added debug prints for get_precision_recall 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:39:27 +02:00
2martens fb8a33cd24 Fixed indexing issue wrt the class_id 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:33:59 +02:00
2martens dc6c046da2 Added debug print for class id 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:33:00 +02:00
2martens 2ba17a1540 Fixed cleaning of labels 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:32:01 +02:00
2martens 45d1a31129 Further debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:27:39 +02:00
2martens 386ebd388c Added debug print for label shape 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:26:02 +02:00
2martens 28a3111bde Added debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:19:33 +02:00
2martens 32eb98e9ff Removed obsolete code 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:15:52 +02:00
2martens 970ed8d6c0 Convert labels to numpy array 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 11:14:50 +02:00
2martens 8a239128d5 Attempt to fix exclusion of padded label entries 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 10:52:21 +02:00
2martens e097643daf Fixed wrong indexing 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 10:48:58 +02:00
2martens 71c1b1f197 Background boxes are no longer removed before building observations 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 10:38:44 +02:00
2martens c0e5f74bee Reduced forward passes to 10 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 10:37:08 +02:00
2martens 145b929863 Removed debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 10:36:37 +02:00
2martens 9c3e436579 Prints non-zero classes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-06-03 10:32:26 +02:00
2martens 225d0307eb Added code to debug probability of background class 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:59:52 +02:00
2martens bfc4adc93e Added debug print for class ids 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:52:20 +02:00
2martens 91ebf9032c Provided image height and width for decode detections 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:49:53 +02:00
2martens 3d1ba8adbf Removed debug prints during forward passes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:46:55 +02:00
2martens a838dd6a1b Fixed elimination of background boxes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:46:18 +02:00
2martens 9544d5d3df Removed background detections before iou for observations 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:42:16 +02:00
2martens d38a6b7b6b Added further debug prints (2nd) 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:30:20 +02:00
2martens 33635b5c49 Added further debug prints 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:21:13 +02:00
2martens 6eb81c4568 Added debug print 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 14:16:43 +02:00
2martens 098b0c04a6 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-30 12:51:22 +02:00
2martens 1ade87b5ef Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-23 11:38:54 +02:00
2martens e1488161b5 Fixed dtype specification (2nd) 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 15:36:38 +02:00
2martens 62a65bcccb Fixed dtype specification 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 15:34:45 +02:00
2martens 0b6e40878c Guaranteed float dtype for image and label data 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 15:30:37 +02:00
2martens d3d57177a5 Fixed indexing of tuples 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 15:21:11 +02:00
2martens d398ecba04 Fixes dimensions of x and y reverse values 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 15:09:58 +02:00
2martens 693fb4d55c Changed labels to float 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 15:01:50 +02:00
2martens ca33f77ecc Fixed tensor assignment 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 14:58:33 +02:00
2martens 42d360991c Fixed missing argument 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 14:44:02 +02:00
2martens dbf243c731 Fixed stacking of tensors with different dtypes 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 14:39:26 +02:00
2martens 17e9208c21 Added removal of detections after no longer being used 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 14:02:59 +02:00
2martens 11edf3772a Removed extra garbage collection 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 13:59:21 +02:00
2martens 1763fc5917 Implemented partitioning of observations 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-22 13:58:09 +02:00
2martens 5feae7f9a2 Removed obsolete import 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-21 11:32:12 +02:00
2martens bb3613c913 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-21 11:31:56 +02:00
2martens af9cbc60d2 Changed mode to training for DropoutSSD to allow partitioning of observations 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-21 11:31:24 +02:00
2martens 0056f28e79 Updated ssd_keras 
Signed-off-by: Jim Martens <github@2martens.de>
 2019-05-21 11:26:50 +02:00