updates to tensorflow code and processing additionsHEADmaster

1 files changed, 306 insertions, 0 deletions

diff --git a/report.txt b/report.txt
new file mode 100644
index 0000000..ef6775f
--- /dev/null
+++ b/report.txt
@@ -0,0 +1,306 @@
+================================================================================
+Input tree: 'Code'
+================================================================================
+--------------------------------------------------------------------------------
+Processing file 'Code/tfutils_test.py'
+ outputting to 'Code2/tfutils_test.py'
+--------------------------------------------------------------------------------
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/d_scale_model.py'
+ outputting to 'Code2/d_scale_model.py'
+--------------------------------------------------------------------------------
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/constants.py'
+ outputting to 'Code2/constants.py'
+--------------------------------------------------------------------------------
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/loss_functions.py'
+ outputting to 'Code2/loss_functions.py'
+--------------------------------------------------------------------------------
+
+'Code/loss_functions.py' Line 64
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:     return tf.reduce_mean(tf.pack(scale_losses))
+                                   ~~~~~~~                
+    New:     return tf.reduce_mean(tf.stack(scale_losses))
+                                   ~~~~~~~~                
+
+'Code/loss_functions.py' Line 99
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:     return tf.reduce_mean(tf.pack(scale_losses))
+                                   ~~~~~~~                
+    New:     return tf.reduce_mean(tf.stack(scale_losses))
+                                   ~~~~~~~~                
+
+'Code/loss_functions.py' Line 83
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:         filter_x = tf.expand_dims(tf.pack([neg, pos]), 0)  # [-1, 1]
+                                           ~~~~~~~                            
+    New:         filter_x = tf.expand_dims(tf.stack([neg, pos]), 0)  # [-1, 1]
+                                           ~~~~~~~~                            
+
+'Code/loss_functions.py' Line 84
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:         filter_y = tf.pack([tf.expand_dims(pos, 0), tf.expand_dims(neg, 0)])  # [[1],[-1]]
+                            ~~~~~~~                                                                 
+    New:         filter_y = tf.stack([tf.expand_dims(pos, 0), tf.expand_dims(neg, 0)])  # [[1],[-1]]
+                            ~~~~~~~~                                                                 
+
+'Code/loss_functions.py' Line 118
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:     return tf.reduce_mean(tf.pack(scale_losses))
+                                   ~~~~~~~                
+    New:     return tf.reduce_mean(tf.stack(scale_losses))
+                                   ~~~~~~~~                
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/avg_runner.py'
+ outputting to 'Code2/avg_runner.py'
+--------------------------------------------------------------------------------
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/process_data.py'
+ outputting to 'Code2/process_data.py'
+--------------------------------------------------------------------------------
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/tfutils.py'
+ outputting to 'Code2/tfutils.py'
+--------------------------------------------------------------------------------
+
+'Code/tfutils.py' Line 96
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:     elif num_tpad > 0: padded = tf.concat(1, [tpad, padded])
+                                                                      
+    New:     elif num_tpad > 0: padded = tf.concat(axis=1, values=[tpad, padded])
+                                                   ~~~~~   ~~~~~~~                
+
+'Code/tfutils.py' Line 97
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:     elif num_bpad > 0: padded = tf.concat(1, [padded, bpad])
+                                                                      
+    New:     elif num_bpad > 0: padded = tf.concat(axis=1, values=[padded, bpad])
+                                                   ~~~~~   ~~~~~~~                
+
+'Code/tfutils.py' Line 98
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:     if num_lpad > 0 and num_rpad > 0: padded = tf.concat(2, [lpad, padded, rpad])
+                                                                                           
+    New:     if num_lpad > 0 and num_rpad > 0: padded = tf.concat(axis=2, values=[lpad, padded, rpad])
+                                                                  ~~~~~   ~~~~~~~                      
+
+'Code/tfutils.py' Line 99
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:     elif num_lpad > 0: padded = tf.concat(2, [lpad, padded])
+                                                                      
+    New:     elif num_lpad > 0: padded = tf.concat(axis=2, values=[lpad, padded])
+                                                   ~~~~~   ~~~~~~~                
+
+'Code/tfutils.py' Line 100
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:     elif num_rpad > 0: padded = tf.concat(2, [padded, rpad])
+                                                                      
+    New:     elif num_rpad > 0: padded = tf.concat(axis=2, values=[padded, rpad])
+                                                   ~~~~~   ~~~~~~~                
+
+'Code/tfutils.py' Line 95
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:     if num_tpad > 0 and num_bpad > 0: padded = tf.concat(1, [tpad, padded, bpad])
+                                                                                           
+    New:     if num_tpad > 0 and num_bpad > 0: padded = tf.concat(axis=1, values=[tpad, padded, bpad])
+                                                                  ~~~~~   ~~~~~~~                      
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/loss_functions_test.py'
+ outputting to 'Code2/loss_functions_test.py'
+--------------------------------------------------------------------------------
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/g_model.py'
+ outputting to 'Code2/g_model.py'
+--------------------------------------------------------------------------------
+
+'Code/g_model.py' Line 225
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.scalar_summary' to 'tf.summary.scalar'
+
+    Old:                 summary_psnr_test = tf.scalar_summary('test_PSNR',
+                                             ~~~~~~~~~~~~~~~~~              
+    New:                 summary_psnr_test = tf.summary.scalar('test_PSNR',
+                                             ~~~~~~~~~~~~~~~~~              
+
+'Code/g_model.py' Line 227
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.scalar_summary' to 'tf.summary.scalar'
+
+    Old:                 summary_sharpdiff_test = tf.scalar_summary('test_SharpDiff',
+                                                  ~~~~~~~~~~~~~~~~~                   
+    New:                 summary_sharpdiff_test = tf.summary.scalar('test_SharpDiff',
+                                                  ~~~~~~~~~~~~~~~~~                   
+
+'Code/g_model.py' Line 199
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.scalar_summary' to 'tf.summary.scalar'
+
+    Old:                 loss_summary = tf.scalar_summary('train_loss_G', self.global_loss)
+                                        ~~~~~~~~~~~~~~~~~                                   
+    New:                 loss_summary = tf.summary.scalar('train_loss_G', self.global_loss)
+                                        ~~~~~~~~~~~~~~~~~                                   
+
+'Code/g_model.py' Line 232
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.merge_summary' to 'tf.summary.merge'
+
+    Old:             self.summaries_train = tf.merge_summary(self.summaries_train)
+                                            ~~~~~~~~~~~~~~~~                       
+    New:             self.summaries_train = tf.summary.merge(self.summaries_train)
+                                            ~~~~~~~~~~~~~~~~                       
+
+'Code/g_model.py' Line 233
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.merge_summary' to 'tf.summary.merge'
+
+    Old:             self.summaries_test = tf.merge_summary(self.summaries_test)
+                                           ~~~~~~~~~~~~~~~~                      
+    New:             self.summaries_test = tf.summary.merge(self.summaries_test)
+                                           ~~~~~~~~~~~~~~~~                      
+
+'Code/g_model.py' Line 117
+--------------------------------------------------------------------------------
+
+Added keyword 'concat_dim' to reordered function 'tf.concat'
+Added keyword 'values' to reordered function 'tf.concat'
+
+    Old:                                 inputs = tf.concat(3, [inputs, last_gen_frames])
+                                                                                          
+    New:                                 inputs = tf.concat(axis=3, values=[inputs, last_gen_frames])
+                                                            ~~~~~   ~~~~~~~                           
+
+'Code/g_model.py' Line 218
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.scalar_summary' to 'tf.summary.scalar'
+
+    Old:                 summary_psnr_train = tf.scalar_summary('train_PSNR',
+                                              ~~~~~~~~~~~~~~~~~               
+    New:                 summary_psnr_train = tf.summary.scalar('train_PSNR',
+                                              ~~~~~~~~~~~~~~~~~               
+
+'Code/g_model.py' Line 220
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.scalar_summary' to 'tf.summary.scalar'
+
+    Old:                 summary_sharpdiff_train = tf.scalar_summary('train_SharpDiff',
+                                                   ~~~~~~~~~~~~~~~~~                    
+    New:                 summary_sharpdiff_train = tf.summary.scalar('train_SharpDiff',
+                                                   ~~~~~~~~~~~~~~~~~                    
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/utils.py'
+ outputting to 'Code2/utils.py'
+--------------------------------------------------------------------------------
+
+'Code/utils.py' Line 196
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:     filter_x = tf.expand_dims(tf.pack([neg, pos]), 0)  # [-1, 1]
+                                       ~~~~~~~                            
+    New:     filter_x = tf.expand_dims(tf.stack([neg, pos]), 0)  # [-1, 1]
+                                       ~~~~~~~~                            
+
+'Code/utils.py' Line 197
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.pack' to 'tf.stack'
+
+    Old:     filter_y = tf.pack([tf.expand_dims(pos, 0), tf.expand_dims(neg, 0)])  # [[1],[-1]]
+                        ~~~~~~~                                                                 
+    New:     filter_y = tf.stack([tf.expand_dims(pos, 0), tf.expand_dims(neg, 0)])  # [[1],[-1]]
+                        ~~~~~~~~                                                                 
+
+
+--------------------------------------------------------------------------------
+Processing file 'Code/d_model.py'
+ outputting to 'Code2/d_model.py'
+--------------------------------------------------------------------------------
+
+'Code/d_model.py' Line 92
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.scalar_summary' to 'tf.summary.scalar'
+
+    Old:                 loss_summary = tf.scalar_summary('loss_D', self.global_loss)
+                                        ~~~~~~~~~~~~~~~~~                             
+    New:                 loss_summary = tf.summary.scalar('loss_D', self.global_loss)
+                                        ~~~~~~~~~~~~~~~~~                             
+
+'Code/d_model.py' Line 93
+--------------------------------------------------------------------------------
+
+Renamed function 'tf.merge_summary' to 'tf.summary.merge'
+
+    Old:                 self.summaries = tf.merge_summary([loss_summary])
+                                          ~~~~~~~~~~~~~~~~                 
+    New:                 self.summaries = tf.summary.merge([loss_summary])
+                                          ~~~~~~~~~~~~~~~~                 
+
+