fix unit test

Author: xadupre

tests/test_cudnn_compatible_gru.py

@@ -16,9 +16,7 @@
 # pylint: disable=missing-docstring,invalid-name,unused-argument,using-constant-test,cell-var-from-loop
 
 if is_tf2():
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
-    dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
-    bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
+    pass
 else:
     GRUBlockCell = tf.contrib.rnn.GRUBlockCell
     MultiRNNCell = tf.contrib.rnn.MultiRNNCell

tests/test_custom_rnncell.py

@@ -16,13 +16,7 @@
 # pylint: disable=abstract-method,arguments-differ
 
 if is_tf2():
-    BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
-    LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
-    GRUCell = getattr(tf.compat.v1.nn.rnn_cell, "GRUCell", None)
-    RNNCell = getattr(tf.compat.v1.nn.rnn_cell, "RNNCell", None)
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
-    dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
-    bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
+    pass
 else:
     LSTMBlockCell = tf.contrib.rnn.LSTMBlockCell
     LSTMCell = tf.nn.rnn_cell.LSTMCell

tests/test_gru.py

@@ -34,10 +34,13 @@
 
 if is_tf2():
     # There is no LSTMBlockCell in tf-2.x
-    BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
-    LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
-    GRUCell = getattr(tf.compat.v1.nn.rnn_cell, "GRUCell", None)
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    try:
+        BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
+        LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
+        GRUCell = getattr(tf.compat.v1.nn.rnn_cell, "GRUCell", None)
+        MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    except ImportError:
+        pass
     dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
     bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
 else:

tests/test_grublock.py

@@ -17,7 +17,10 @@
 # pylint: disable=invalid-name
 
 if is_tf2():
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    try:
+        MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    except ImportError:
+        pass
     dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
     bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
 else:

tests/test_lstm.py

@@ -21,9 +21,12 @@
 
 if is_tf2():
     # There is no LSTMBlockCell in tf-2.x
-    BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
-    LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    try:
+        BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
+        LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
+        MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    except ImportError:
+        pass
     dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
     bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
 else:

tests/test_lstmblock.py

@@ -16,9 +16,7 @@
 
 if is_tf2():
     # There is no LSTMBlockCell in tf-2.x
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
-    dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
-    bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
+    pass
 else:
     LSTMBlockCell = tf.contrib.rnn.LSTMBlockCell
     MultiRNNCell = tf.contrib.rnn.MultiRNNCell

tests/test_seq2seq.py

@@ -13,13 +13,7 @@
 # pylint: disable=invalid-name
 
 if is_tf2():
-    BasicLSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "BasicLSTMCell", None)
-    LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
-    RNNCell = getattr(tf.compat.v1.nn.rnn_cell, "RNNCell", None)
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
-    dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
-    bidirectional_dynamic_rnn = tf.compat.v1.nn.bidirectional_dynamic_rnn
-    LSTMStateTuple = getattr(tf.compat.v1.nn.rnn_cell, "LSTMStateTuple", None)
+    pass
 else:
     LSTMCell = tf.contrib.rnn.LSTMCell
     LSTMBlockCell = tf.contrib.rnn.LSTMBlockCell

tests/test_stacked_lstm.py

@@ -16,8 +16,11 @@
 # pylint: disable=invalid-name
 
 if is_tf2():
-    LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
-    MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    try:
+        LSTMCell = getattr(tf.compat.v1.nn.rnn_cell, "LSTMCell", None)
+        MultiRNNCell = getattr(tf.compat.v1.nn.rnn_cell, "MultiRNNCell", None)
+    except ImportError:
+        pass
     dynamic_rnn = tf.compat.v1.nn.dynamic_rnn
 else:
     LSTMCell = tf.contrib.rnn.LSTMCell

tests/utils/setup_test_env.sh

@@ -23,10 +23,10 @@ if [[ $TF_VERSION == 1.* ]]; then
     pip install numpy==1.19.0
 else 
     if [[ "$TF_VERSION" != "2.13.0" && "$TF_VERSION" != "2.9.0" ]]; then 
-        echo "-- install-3 TF-KERAS ${{ inputs.tf_version }}"
+        echo "-- install-3 TF-KERAS $TF_VERSION"
         pip install tf_keras==$TF_VERSION
     else
-        echo "-- install-3 TF ${{ inputs.tf_version }}"
+        echo "-- install-3 TF $TF_VERSION"
     fi
 fi