Fix RandomUniform/RandomNormal rewriters for non-const inputs (#1710)

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

Co-authored-by: Guenther Schmuelling <[email protected]>

Author: TomWildenhain-Microsoft

tf2onnx/rewriter/random_normal_rewriter.py

@@ -16,8 +16,8 @@ def rewrite_random_normal(g, ops):
     pattern1 = \
         OpTypePattern('Add', name='output', inputs=[
             OpTypePattern('Mul', name='input2', inputs=[
-                OpTypePattern('RandomStandardNormal', name='input1', inputs=["*"]), "*"
-            ]), "*"
+                OpTypePattern('RandomStandardNormal', name='input1', inputs=["*"]), "Const|ConstV2"
+            ]), "Const|ConstV2"
         ])
 
     pattern2 = \

tf2onnx/rewriter/random_uniform.py

@@ -18,7 +18,7 @@ def rewrite_random_uniform(g, ops):
         OpTypePattern('Add', name='output', inputs=[
             OpTypePattern('Mul', inputs=[
                 OpTypePattern('RandomUniform', name='input1', inputs=["*"]),
-                OpTypePattern('Sub', name='input2', inputs=["*", "*"]),
+                OpTypePattern('Sub', name='input2', inputs=["Const|ConstV2", "Const|ConstV2"]),
             ]), None
         ])
 
@@ -45,9 +45,9 @@ def rewrite_random_uniform_fold_const(g, ops):
         OpTypePattern('Add', name='output', inputs=[
             OpTypePattern('Mul', name='mul', inputs=[
                 OpTypePattern('RandomUniform', name='input1', inputs=["*"]),
-                None,
+                "Const|ConstV2",
             ]),
-            None,
+            "Const|ConstV2",
         ])
 
     matcher = GraphMatcher(pattern)