fix merge

Signed-off-by: xavier dupré <[email protected]>

Author: sdpython

tests/backend_test_base.py

@@ -205,7 +205,10 @@ def freeze_and_run_tf(self, func, feed_dict, outputs, as_session, premade_placeh
         return result, graph_def, initialized_tables
 
     def convert_to_tfjs(self, graph_def_path, output_names):
-        from tensorflowjs.converters import converter
+        try:
+            from tensorflowjs.converters import converter
+        except ImportError:
+            return None
         tfjs_path = os.path.join(self.test_data_directory, self._testMethodName + "_tfjs")
         try:
             converter.convert([graph_def_path, tfjs_path, '--input_format', 'tf_frozen_model',

tests/test_backend.py

@@ -5559,6 +5559,37 @@ def func1(x):
                     self._run_test_case(func1, [_OUTPUT], {_INPUT: x_val}, optimize=False)
                     self._run_test_case(func1, [_OUTPUT], {_INPUT: x_val})
 
+    @check_tf_min_version("2.1")
+    @skip_tflite("TFlite errors on some attributes")
+    @check_opset_min_version(9, "string")
+    def test_asstring(self):
+        def func(x):
+            op_ = tf.strings.as_string(x)
+            return tf.identity(op_, name=_TFOUTPUT)
+
+        x_val = np.array([0, 1, 2, 3], dtype=np.int32)
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_val})
+
+        x_val = np.array([0, 1, 2, 3], dtype=np.float32)
+        # can't check the values because in onnx they are padded with 0, in tf they are not
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_val}, check_value=False)
+
+    @check_tf_min_version("2.1")
+    @skip_tflite("TFlite errors on some attributes")
+    @check_opset_min_version(9, "string")
+    def test_string_to_number(self):
+        def func(x):
+            op_ = tf.strings.to_number(x)
+            return tf.identity(op_, name=_TFOUTPUT)
+
+        # tf gets this wrong and returns fp32 instead of int
+        x_val = np.array("123", dtype=np.object)
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_val})
+
+        x_val = np.array("123.1", dtype=np.object)
+        # can't check the values because in onnx they are padded with 0, in tf they are not
+        self._run_test_case(func, [_OUTPUT], {_INPUT: x_val}, check_value=False)
+
 
 if __name__ == '__main__':
     cl = BackendTests()

tf2onnx/onnx_opset/tensor.py

@@ -3799,3 +3799,27 @@ def version_8(cls, ctx, node, **kwargs):
         # broadcast by expanding
         node.type = "Expand"
         ctx.insert_new_node_on_input(node, "Cast", node.input[1], to=TensorProto.INT64)
+
+
+@tf_op("AsString")
+class AsString:
+    @classmethod
+    def version_9(cls, ctx, node, **kwargs):
+        if (node.get_attr_value("precision") or node.get_attr_value("scientific") or node.get_attr_value("fill")):
+            logger.warning(
+                "ONNX does not support precision, scientific and fill attributes for AsString")
+        shapes = node.output_shapes
+        ctx.remove_node(node.name)
+        _ = ctx.make_node("Cast", node.input, name=node.name,
+                          dtypes=[TensorProto.STRING], shapes=shapes, attr={"to": TensorProto.STRING})
+
+
+@tf_op("StringToNumber")
+class StringToNumber:
+    @classmethod
+    def version_9(cls, ctx, node, **kwargs):
+        shapes = node.output_shapes
+        dtypes = node.output_dtypes
+        ctx.remove_node(node.name)
+        _ = ctx.make_node("Cast", node.input, name=node.name,
+                          dtypes=dtypes, shapes=shapes, attr={"to": dtypes[0]})