Merge pull request #869 from RandySheriffH/rashuai/DynamicRandom

Rashuai/dynamic random

Author: RandySheriffH

tests/test_backend.py

@@ -1374,14 +1374,9 @@ def func():
     @skip_caffe2_backend()
     def test_randomuniform_dyn_shape(self):
         # test for dynamic shape coming from a shape op
-        x_val = np.array([[1, 2, 3], [4, 5, 6], [7, 8, 9]], dtype=np.float32)
+        x_val = np.array([0, 1, 2, 3, 5], dtype=np.int64)
         def func(x):
-            x_ = tf.stack([x, x])
-            x_ = tf.identity(x_)
-            x_ = tf.shape(x_, name="shape")
-            x_ = random_uniform(x_, name="rand", dtype=tf.float32)
-            x_ = tf.identity(x_)
-            return tf.identity(x_, name=_TFOUTPUT)
+            return random_uniform(x[3:], name=_TFOUTPUT, dtype=tf.float32)
         # since results are random, compare the shapes only
         self._run_test_case(func, [_OUTPUT], {_INPUT: x_val}, check_value=False, check_shape=True)
 

tf2onnx/onnx_opset/generator.py

@@ -44,6 +44,18 @@ def version_1(cls, ctx, node, **kwargs):
             node.set_attr("shape", shape)
             ctx.set_shape(node.output[0], shape)
 
+    @classmethod
+    def version_9(cls, ctx, node, **kwargs):
+        if node.inputs[0].is_const():
+            cls.version_1(ctx, node, **kwargs)
+        else:
+            seed = node.get_attr("seed")
+            node.set_attr("seed", float(seed.f))
+            cast_node = ctx.make_node("Cast", node.input, attr={'to': onnx_pb.TensorProto.INT64})
+            const_node = ctx.make_node("ConstantOfShape", cast_node.output)
+            node.input = const_node.output
+            node.type = node.type + 'Like'
+
 
 @tf_op(["RandomNormalLike", "RandomUniformLike"])
 class PassThroughOp: