Update attribute and import for tf.keras compatibility

felker · felker · commit f9d4fa7a9899 · 2020-06-19T12:02:27.000-04:00
Still need to find out counterpart of "uses_learning_phase" attribute
diff --git a/plasma/models/mpi_runner.py b/plasma/models/mpi_runner.py
@@ -19,11 +19,6 @@
 This file trains a deep learning model to predict
 disruptions on time series data from plasma discharges.
 
-Dependencies:
-conf.py: configuration of model,training,paths, and data
-model_builder.py: logic to construct the ML architecture
-data_processing.py: classes to handle data processing
-
 Author: Julian Kates-Harbeck, jkatesharbeck@g.harvard.edu
 
 This work was supported by the DOE CSGF program.
@@ -94,7 +89,9 @@
         print('[{}] importing Keras'.format(g.task_index))
         import tensorflow.keras.backend as K
         from tensorflow.keras.utils import Progbar
-        import tensorflow.keras.callbacks as cbks
+        # TODO(KGF): instead of tensorflow.keras.callbacks.CallbackList()
+        # until API added in tf-nightly in v2.2.0
+        import tensorflow.python.keras.callbacks as cbks
 
 g.flush_all_inorder()
 g.pprint_unique(conf)
@@ -1092,7 +1089,10 @@ def on_epoch_end(self, val_generator, val_steps, epoch, logs=None):
             self.writer.add_summary(summary, epoch)
             self.writer.flush()
 
-        tensors = (self.model.inputs + self.model.targets
+        # print(type(self.model))
+        # print(dir(self.model))
+        # KGF: targets attribute of Model class moved to private in tf.keras
+        tensors = (self.model.inputs + self.model._targets
                    + self.model.sample_weights)
 
         if self.model.uses_learning_phase:
