Reenabled placeholderwithdefault tests (#1262)

Signed-off-by: Tom Wildenhain <[email protected]>

Author: TomWildenhain-Microsoft

tests/backend_test_base.py

@@ -99,7 +99,7 @@ def run_backend(self, g, outputs, input_dict, large_model=False):
     def run_test_case(self, func, feed_dict, input_names_with_port, output_names_with_port, rtol=1e-07, atol=1e-5,
                       convert_var_to_const=True, constant_fold=True, check_value=True, check_shape=True,
                       check_dtype=True, process_args=None, onnx_feed_dict=None, graph_validator=None, as_session=False,
-                      large_model=False):
+                      large_model=False, premade_placeholders=False):
         # optional - passed to process_tf_graph
         if process_args is None:
             process_args = {}
@@ -145,8 +145,9 @@ def run_test_case(self, func, feed_dict, input_names_with_port, output_names_wit
             with tf_session() as sess:
                 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)))
+                if not premade_placeholders:
+                    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()
                 tf_tables_initializer().run()

tests/test_backend.py

@@ -23,7 +23,7 @@
 from common import *  # pylint: disable=wildcard-import,unused-wildcard-import
 from tf2onnx import constants, utils
 from tf2onnx.graph_matcher import OpTypePattern, GraphMatcher
-from tf2onnx.tf_loader import is_tf2
+from tf2onnx.tf_loader import is_tf2, tf_placeholder_with_default
 from tf2onnx.onnx_opset.signal import make_dft_constant
 
 # pylint: disable=missing-docstring,invalid-name,unused-argument,function-redefined,cell-var-from-loop
@@ -711,24 +711,22 @@ def func(x):
             return tf.identity(x, name=_TFOUTPUT)
         self._run_test_case(func, [_OUTPUT], {_INPUT: x_val})
 
-    #@unittest.skip("doesn't work with the new ut func interface, fix later")
-    #def test_placeholder_with_default_use_default(self):
-    #    x_val = np.array([1.0, 2.0, -3.0, -4.0], dtype=np.float32).reshape((2, 2))
-    #    def func():
-    #        x = tf.constant(x_val, name="x")
-    #        y = tf_placeholder_with_default(x, x_val.shape, name=_TFINPUT)
-    #    return tf.identity(y, name=_TFOUTPUT)
-    #    self._run_test_case(func, [_OUTPUT], {})
-
-    #@unittest.skip("doesn't work with the new ut func interface, fix later")
-    #def test_placeholder_with_default_use_feed(self):
-    #    x_val = np.array([1.0, 2.0, -3.0, -4.0], dtype=np.float32).reshape((2, 2))
-    #    def func():
-    #        x = tf.constant(x_val, name="x")
-    #        y = tf_placeholder_with_default(x, x_val.shape, name=_TFINPUT)
-    #        return tf.identity(y, name=_TFOUTPUT)
-    #    x_feed_val = np.array([11.0, 22.0, -33.0, -44.0], dtype=np.float32).reshape((2, 2))
-    #    self._run_test_case(func, [_OUTPUT], {_INPUT: x_feed_val})
+    def test_placeholder_with_default_use_default(self):
+        x_val = np.array([1.0, 2.0, -3.0, -4.0], dtype=np.float32).reshape((2, 2))
+        def func():
+            x = tf.constant(x_val, name="x")
+            y = tf_placeholder_with_default(x, x_val.shape, name=_TFINPUT)
+            return tf.identity(y, name=_TFOUTPUT)
+        self._run_test_case(func, [_OUTPUT], {}, as_session=True, premade_placeholders=True)
+
+    def test_placeholder_with_default_use_feed(self):
+        x_val = np.array([1.0, 2.0, -3.0, -4.0], dtype=np.float32).reshape((2, 2))
+        def func():
+            x = tf.constant(x_val, name="x")
+            y = tf_placeholder_with_default(x, x_val.shape, name=_TFINPUT)
+            return tf.identity(y, name=_TFOUTPUT)
+        x_feed_val = np.array([11.0, 22.0, -33.0, -44.0], dtype=np.float32).reshape((2, 2))
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_feed_val}, as_session=True, premade_placeholders=True)
 
     @check_onnxruntime_incompatibility("Add")
     def test_add_bcast(self):

tf2onnx/tf_loader.py

@@ -73,6 +73,7 @@ def not_implemented_tf_placeholder(*args, **kwargs):
     tf_import_meta_graph = tf.compat.v1.train.import_meta_graph
     tf_gfile = tf.io.gfile
     tf_placeholder = tf.compat.v1.placeholder
+    tf_placeholder_with_default = tf.compat.v1.placeholder_with_default
     extract_sub_graph = tf.compat.v1.graph_util.extract_sub_graph
 elif LooseVersion(tf.__version__) >= "1.13":
     # 1.13 introduced the compat namespace
@@ -83,6 +84,7 @@ def not_implemented_tf_placeholder(*args, **kwargs):
     tf_import_meta_graph = tf.compat.v1.train.import_meta_graph
     tf_gfile = tf.gfile
     tf_placeholder = tf.compat.v1.placeholder
+    tf_placeholder_with_default = tf.compat.v1.placeholder_with_default
     extract_sub_graph = tf.compat.v1.graph_util.extract_sub_graph
 else:
     # older than 1.13
@@ -93,6 +95,7 @@ def not_implemented_tf_placeholder(*args, **kwargs):
     tf_import_meta_graph = tf.train.import_meta_graph
     tf_gfile = tf.gfile
     tf_placeholder = tf.placeholder
+    tf_placeholder_with_default = tf.placeholder_with_default
     extract_sub_graph = tf.graph_util.extract_sub_graph
 
 

tf2onnx/tf_utils.py

@@ -220,7 +220,7 @@ def is_huge_shape(x):
                     outputs_to_values[output_names[0]] = np.array(shape[i], dtype=np_dtype)
                     outputs_to_dtypes[node.outputs[0].name] = node.outputs[0].dtype
                     progress = True
-            can_fold = node.type not in ['Enter']
+            can_fold = node.type not in ['Enter', 'Placeholder', 'PlaceholderWithDefault']
             can_fold = can_fold and len(input_names) > 0 and all(inp in outputs_to_values for inp in input_names)
             # We can only fold nodes with a single output
             can_fold = can_fold and len(output_names) == 1 and output_names[0] not in outputs_to_values