Dont import "tf.X"

felker · felker · commit 97da50fc653f · 2020-06-18T15:03:26.000-05:00
diff --git a/plasma/models/builder.py b/plasma/models/builder.py
@@ -6,16 +6,16 @@
 # KGF: see below synchronization--- output is launched here
 #
 # KGF: (was used only in hyper_build_model())
-from tf.keras.layers import (
+from tensorflow.keras.layers import (
     Input,
     Dense, Activation, Dropout, Lambda,
     Reshape, Flatten, Permute,  # RepeatVector
     LSTM, CuDNNLSTM, SimpleRNN, BatchNormalization,
     Convolution1D, MaxPooling1D, TimeDistributed,
     Concatenate
     )
-from tf.keras.callbacks import Callback
-from tf.keras.regularizers import l2  # l1, l1_l2
+from tensorflow.keras.callbacks import Callback
+from tensorflow.keras.regularizers import l2  # l1, l1_l2
 
 import re
 import os
diff --git a/plasma/models/custom_loss.py b/plasma/models/custom_loss.py
@@ -1,8 +1,8 @@
 import numpy as np
 
 import tensorflow as tf
-import tf.keras.backend as K
-from tf.keras.losses import squared_hinge
+import tensorflow.keras.backend as K
+from tensorflow.keras.losses import squared_hinge
 
 _EPSILON = tf.keras.backend.epsilon()
 
diff --git a/plasma/models/mpi_runner.py b/plasma/models/mpi_runner.py
@@ -76,7 +76,7 @@
     # TODO(KGF): above, builder.py (bug workaround), mpi_launch_tensorflow.py,
     # and runner.py are the only files that import tensorflow directly
 
-    from tf.keras.backend import set_session
+    from tensorflow.keras.backend import set_session
     # KGF: next 3 lines dump many TensorFlow diagnostics to stderr.
     # All MPI ranks first "Successfully opened dynamic library libcuda"
     # then, one by one: ID GPU, libcudart, libcublas, libcufft, ...
@@ -92,9 +92,9 @@
     g.comm.Barrier()
     if i == g.task_index:
         print('[{}] importing Keras'.format(g.task_index))
-        import tf.keras.backend as K
-        from tf.keras.utils import Progbar
-        import tf.keras.callbacks as cbks
+        import tensorflow.keras.backend as K
+        from tensorflow.keras.utils import Progbar
+        import tensorflow.keras.callbacks as cbks
 
 g.flush_all_inorder()
 g.pprint_unique(conf)
@@ -254,7 +254,9 @@ def set_lr(self, lr):
     def compile(self, optimizer, clipnorm, loss='mse'):
         # TODO(KGF): check the following import taken from runner.py
         # Was not in this file, originally.
-        from tf.keras.optimizers import SGD, Adam, RMSprop, Nadam, TFOptimizer
+        from tensorflow.keras.optimizers import (
+            SGD, Adam, RMSprop, Nadam, TFOptimizer
+            )
         if optimizer == 'sgd':
             optimizer_class = SGD(lr=self.DUMMY_LR, clipnorm=clipnorm)
         elif optimizer == 'momentum_sgd':
diff --git a/plasma/models/targets.py b/plasma/models/targets.py
@@ -8,8 +8,8 @@
     # mae_np, squared_hinge_np,
     )
 import tensorflow as tf  # noqa
-import tf.keras.backend as K
-from tf.keras.losses import hinge
+import tensorflow.keras.backend as K
+from tensorflow.keras.losses import hinge
 
 # synchronize output from TensorFlow initialization via Keras backend
 if g.comm is not None:
diff --git a/plasma/models/tcn.py b/plasma/models/tcn.py
@@ -1,7 +1,7 @@
 from typing import List, Tuple
 import tensorflow as tf
-from tf.keras import optimizers
-from tf.keras.layers import (
+from tensorflow.keras import optimizers
+from tensorflow.keras.layers import (
     Activation, Lambda, Conv1D, SpatialDropout1D, Dense, BatchNormalization,
     Input, Model, Layer
     )
