Commit Graph
100 Commits
Author SHA1 Message Date
2martens 5fff341e53 Ensure the np.save function only gets a NumpyArray
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-30 18:19:46 +02:00
2martens a7a269ab73 Fixed calculation of number of digits
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:56:08 +02:00
2martens 83bd83e3d1 Added debug print for number of digits
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:54:02 +02:00
2martens 3ee6f3c780 Added missing argument
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:49:58 +02:00
2martens 55481402a8 Fixed variable name
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:47:33 +02:00
2martens 2735c1c5a9 Fixed formatting
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:47:04 +02:00
2martens 2d4bd54d07 Create output path if it does not exist
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:42:32 +02:00
2martens 7f84fafbb2 Improved formatting of numpy results
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:36:33 +02:00
2martens 64a0253834 Improved output path
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:25:21 +02:00
2martens 3d56d69122 Formatted saved ssd predictions to make sorting easier
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:23:22 +02:00
2martens 198325883c Removed debug print
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:06:29 +02:00
2martens c71fb889da Added conversion to numpy arrays
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:04:17 +02:00
2martens d79fd1f1df Updated debug print
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 11:01:28 +02:00
2martens d8f57f7301 Debug print decoded predictions
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 10:57:05 +02:00
2martens b4bb4ed0a5 Updated reference to ssd_keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 10:53:05 +02:00
2martens f46326d9c5 Updated reference to ssd_keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 10:41:58 +02:00
2martens 30da60619c Updated reference to ssd_keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 10:37:31 +02:00
2martens d624f06c2a Change image size for SSD to 300
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-29 10:33:27 +02:00
2martens 3c2eabde2d Fixed name of weights file
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 21:10:34 +02:00
2martens 5a80315bf9 Updated reference to ssd keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 20:32:58 +02:00
2martens 45d122df91 Updated referenced ssd keras version
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 20:11:43 +02:00
2martens 4950c22a3f Removed unsupported v2 tensorshape behaviour
It is only added in Tensorflow v1.13 but the CV computers only have
v1.12

Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:51:44 +02:00
2martens 258ab4b464 Updated referenced version of ssd keras
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:51:06 +02:00
2martens 6c3b9ee2b1 Enable tensorflow v2 tensor shape
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:44:40 +02:00
2martens d9eb4c334f Provided missing scales
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:18:14 +02:00
2martens 36b11aaa5e Fixed dtype specification
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:12:46 +02:00
2martens dbab9e36b5 Fixed function call
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:11:19 +02:00
2martens d60979e866 Fixed function name for resizing images
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:10:09 +02:00
2martens 9b508477f3 Simplified data set creation by removing not required labels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 19:06:44 +02:00
2martens 7a89a3cf7b Fixed creation of final labels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:50:38 +02:00
2martens d12e7ec30d Changed code to get shape of labels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:47:51 +02:00
2martens 65013a843b Fixed numpy array creation
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:46:21 +02:00
2martens f5db36bf9f Attempt conversion to Numpy array before converting to Tensor
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:44:25 +02:00
2martens 497e8c911e Converted tuple to list for list of labels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:40:25 +02:00
2martens ee74480dd7 Optimized check for empty labels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:38:27 +02:00
2martens 2276d359d6 Added check to prevent frames without labels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:34:28 +02:00
2martens 5fd8ba1ae8 Fixed background being saved as instance
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:25:29 +02:00
2martens d7ef9513a7 Fixed comparison of coordinates
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 18:19:28 +02:00
2martens ad11a5f6c6 Fixed weights path given to SSD predict
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 17:55:41 +02:00
2martens aa42d831ed Added SSD validation command
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 17:53:44 +02:00
2martens 9d611496d9 Implemented data retrieval for SceneNet validation data
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-28 17:13:19 +02:00
2martens c7c948295e Updated referenced ssd_keras version
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-27 10:01:57 +02:00
2martens 93c2d88dd4 Remove data that cannot be pickled
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-20 11:19:37 +02:00
2martens 4ab5ba7745 Cleaned up imports
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-20 11:18:57 +02:00
2martens e98196ec0d Fixed data preparation
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 15:55:48 +02:00
2martens 70ff4b2591 Fixed instance file name
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 15:20:44 +02:00
2martens 517bc51118 Attempted to fix image loading
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 15:18:10 +02:00
2martens 5f9e8d52f3 Fixed wrong attribute usage
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 15:09:46 +02:00
2martens 37e355e820 Implemented ground truth preparation for SceneNet RGB-D
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 15:02:07 +02:00
2martens 3704f6a2ce Fixed COCO to WNID and WNID to COCO mappings
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 13:56:13 +02:00
2martens 5ab0a28bfa Removed person class from COCO to WNID mapping
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 11:20:30 +02:00
2martens ae87f08d6c Added WNID to COCO mapping
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-19 10:58:39 +02:00
2martens b3743fb18b Added scenenet protobuf file
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-18 17:56:50 +02:00
2martens 2140b13857 Fixed dimensions of input transform
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-18 12:17:01 +02:00
2martens 71623db905 Added dense layer as latent space
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-18 12:13:21 +02:00
2martens 532f4ac567 Make bottleneck even harder
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 14:26:30 +02:00
2martens 7249d569f7 Fixed zsize for val
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 14:23:51 +02:00
2martens f4f9d31a7d Reduced latent space to 32 channels
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 14:14:48 +02:00
2martens 600cb55e2e Removed visualization of latent space
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 14:14:27 +02:00
2martens bc07fda615 Simplified use of debug
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 14:04:23 +02:00
2martens be40a52dde Fixed nested arguments
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 13:51:48 +02:00
2martens 49115ccc1d Added missing argument in function call
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 13:49:20 +02:00
2martens 2e388c0f82 Fixed source of validation images (again)
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 13:48:12 +02:00
2martens 0091027e1d Fixed source of validation images
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 13:46:56 +02:00
2martens 851bbb1f43 Fixed typo
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 13:27:51 +02:00
2martens 9db610f6a0 Renamed use to val
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 13:00:09 +02:00
2martens e22de150b0 Corrected default values for train and run functions
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 12:57:26 +02:00
2martens d3e212ab32 Added debug flag
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 12:55:51 +02:00
2martens 80d4861a4b Added code to load COCO validation data
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 12:46:23 +02:00
2martens 97b1b8963f Added latent space visualization to run situation as well
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 12:08:59 +02:00
2martens 710c8359b3 Reduced kernel size further
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 12:06:24 +02:00
2martens eae908c617 Added visualization for latent space
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-17 11:10:59 +02:00
2martens e7e8e15d7f Reduce kernel size for encoder/decoder to 5
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-16 22:08:27 +02:00
2martens 18fc46b70c Fix model to actually introduce a bottleneck
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-16 14:20:23 +02:00
2martens 7edf5879e8 Added run functionality
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-16 11:09:27 +02:00
2martens 109fda6292 Added CLI functionality to use a trained auto-encoder
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-16 11:06:27 +02:00
2martens 823cfdbfcf Removed cython from requirements.txt
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-16 10:26:40 +02:00
2martens d86c53c18e Save reconstruction image summaries only with verbose on
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-15 17:10:48 +02:00
2martens 2e076597ef Fixed wrong reference
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-15 12:16:38 +02:00
2martens 031a1f9ef0 Removed experimental AUTOTUNE
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-15 12:14:06 +02:00
2martens d6e3cba225 Piped verbose option through to train
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-15 12:13:37 +02:00
2martens 1243cc0a4b Removed duplicate loss log
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-15 10:24:16 +02:00
2martens 3afb74587b Updated image paths to work with cvpc7 installation
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-15 10:21:36 +02:00
2martens c8e49bd0da Removed first deconv layer to achieve symmetry in convolutions
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-14 09:36:10 +02:00
2martens 1764e10da4 Removed unnecessary layers and fixed the names of the remaining ones
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 14:26:43 +02:00
2martens 32aecaea36 Deactivated pooling and upsampling layers
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 14:21:47 +02:00
2martens 1ea9ff98d4 Increased zsize to 64
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 14:17:17 +02:00
2martens 24e8d0e009 Deactivated dropout
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 14:17:05 +02:00
2martens d749678d20 Removed unnecessary layers
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 14:16:48 +02:00
2martens 568adeab08 Implemented auto-encoder model from OliverEdholm
Source: https://github.com/OliverEdholm/Convolutional-Autoencoder/
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 13:45:27 +02:00
2martens 7ea63a9a49 Reverted to default AdamOptimizer beta values
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 13:44:05 +02:00
2martens 25e2110a5b Changed size of images to 256, 256
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 13:43:29 +02:00
2martens 37b0b702a3 Changed batch size to 16
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 13:42:48 +02:00
2martens 1733fc8c99 Added data directory to git ignore
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-12 13:39:20 +02:00
2martens 30d2e156fe Reduced zsize and increases learning rate
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-11 15:20:48 +02:00
2martens e7be92550d Resized images to 64x64 to alleviate memory problems
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-11 15:20:28 +02:00
2martens 41fe940d5b Modified model as per instructions from Keras blog
https://blog.keras.io/building-autoencoders-in-keras.html
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-11 15:19:50 +02:00
2martens 0d0ea882dd Made filter sizes in encoder/decoder models dependent on variable
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-11 13:31:06 +02:00
2martens 28ac1a2027 Fixed mapping from image to bounding box
There are multiple bounding boxes per image. Previously bounding boxes
were wrongly matched.

Signed-off-by: Jim Martens <github@2martens.de>
2019-04-10 17:42:59 +02:00
2martens a0f659cea2 Cleaned up data set to prevent awkward cases
Signed-off-by: Jim Martens <github@2martens.de>
2019-04-10 17:00:32 +02:00