Commit Graph
100 Commits
Author SHA1 Message Date
2martens 21cef4a09e Made ssd_train function compatible with clean code standards
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 15:25:18 +02:00
2martens ed3fec54af Added function to retrieve SSD model
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 15:24:49 +02:00
2martens b01cda512a Added some config values
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 15:23:30 +02:00
2martens d8d7b51655 Made load_scenenet_data more compatible with clean code principles
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 14:52:55 +02:00
2martens 91b7febabb Changed train function to be an integration
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 12:15:17 +02:00
2martens a90c6c7c92 Modified debug module to conform to clean code standards
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 12:12:13 +02:00
2martens 4cf6723c28 Added ability to use custom string for debug save of train images
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 12:02:10 +02:00
2martens b926d11b84 Fixed path for train images
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-10 11:59:34 +02:00
2martens db53c35929 Skip background boxes when saving training images
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 15:34:05 +02:00
2martens 90fe1be4a6 Updated ssd_keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 14:21:57 +02:00
2martens a0a976f9d7 Fixed saving debug images
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 14:21:38 +02:00
2martens bdd0862d68 Added guardian function to catch case with zero ground truth
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:45:01 +02:00
2martens c6e7dd3c50 Accounted for entropy in evaluation code
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:41:11 +02:00
2martens 4cf782f7ab Fixed formatting
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:35:47 +02:00
2martens b73cffb8c4 Removed empty line
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:35:18 +02:00
2martens 7b3367739a Added evaluation path option to config
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:33:10 +02:00
2martens 9069abcd57 Updated ssd_keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:30:04 +02:00
2martens e25dfe86ca Updated ssd_keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:27:12 +02:00
2martens 3418cb3861 Removed debug print
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:15:06 +02:00
2martens 3fd7ba7373 Added conversion to numpy array
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:14:24 +02:00
2martens c96783b384 Updated debug print
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:13:01 +02:00
2martens 412f0ac453 Added debug print for predictions
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 13:00:23 +02:00
2martens 38ce65d367 Fixed not-compiled model
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 12:53:15 +02:00
2martens 9b13c5cf52 Fixed function call
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 12:25:11 +02:00
2martens 01a09ba474 Fixed SSD prediction
Signed-off-by: Jim Martens <github@2martens.de>
2019-07-09 12:23:27 +02:00
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