Merge pull request #1149 from onnx/tom/HashtableLookupOnTf2

Enabled test_hashtable_lookup for tf2

Author: TomWildenhain-Microsoft

tests/backend_test_base.py

@@ -30,6 +30,14 @@
 from tf2onnx.graph import ExternalTensorStorage
 
 
+if is_tf2():
+    tf_set_random_seed = tf.compat.v1.set_random_seed
+    tf_tables_initializer = tf.compat.v1.tables_initializer
+else:
+    tf_set_random_seed = tf.set_random_seed
+    tf_tables_initializer = tf.tables_initializer
+
+
 class Tf2OnnxBackendTestBase(unittest.TestCase):
     def setUp(self):
         self.config = get_test_config()
@@ -133,14 +141,13 @@ def run_test_case(self, func, feed_dict, input_names_with_port, output_names_wit
             # use graph to execute the tensorflow func
             #
             with tf_session() as sess:
-                tf.set_random_seed(1)
+                tf_set_random_seed(1)
                 input_list = []
                 for k, v in clean_feed_dict.items():
                     input_list.append(tf_placeholder(name=k, shape=v.shape, dtype=tf.as_dtype(v.dtype)))
                 func(*input_list)
                 variables_lib.global_variables_initializer().run()
-                if not is_tf2():
-                    tf.tables_initializer().run()
+                tf_tables_initializer().run()
                 output_dict = []
                 for out_name in output_names_with_port:
                     output_dict.append(sess.graph.get_tensor_by_name(out_name))

tests/test_backend.py

@@ -3416,7 +3416,6 @@ def func(value, filters, output_shape):
                             rtol=1e-6)
 
     @check_opset_min_version(8, "CategoryMapper")
-    @skip_tf2()
     def test_hashtable_lookup(self):
         filnm = "vocab.tmp"
         words = ["apple", "pear", "banana", "cherry", "grape"]
@@ -3429,7 +3428,7 @@ def func(query_holder):
             lookup_results = hash_table.lookup(query_holder)
             ret = tf.add(lookup_results, 0, name=_TFOUTPUT)
             return ret
-        self._run_test_case(func, [_OUTPUT], {_INPUT: query}, constant_fold=False)
+        self._run_test_case(func, [_OUTPUT], {_INPUT: query}, constant_fold=False, as_session=True)
         os.remove(filnm)
 
     @check_opset_min_version(11)