2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
457 Commits 1 Branch 0 Tags
bd499425edf0f84e3cadc32264ff8ddbf3d90f2a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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