Add common compute sets to compute set name checking

Summary:
This should help reduce CI breaking.
Ref T38708
TF2.4 Only

Test Plan: CI

Reviewers: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, vladimirm, babakk

Reviewed By: #tensorflow, #framework_ip_review_-_any_oss_or_third-party_code_use_has_been_approved, vladimirm, babakk

Maniphest Tasks: T38708

Differential Revision: https://phabricator.sourcevertex.net/D56756

Author: georgepaw

tensorflow/compiler/plugin/poplar/tests/casts_elimination_test.py

@@ -51,7 +51,6 @@ def testReductionSumVectorF16NoConverts(self):
     report = pva.openReport(report_helper.find_report())
     # Check that there are no casts to float at the beginning.
     ok = [
-        '__seed*', 'host-exchange-local-copy-',
         'Sum/reduce*/ReduceOnTile/InToIntermediateNoExchange/Reduce',
         'Sum/reduce*/ReduceFinalStage/IntermediateToOutput/Reduce'
     ]
@@ -95,7 +94,6 @@ def testNoCastsF16ReduceWithReshape(self):
 
     report = pva.openReport(report_helper.find_report())
     ok = [
-        '__seed*',
         'Sum/reduce*/Reduce',
     ]
     self.assert_all_compute_sets_and_list(report, ok)
@@ -124,10 +122,7 @@ def testMultipleReduces(self):
       self.assertAllClose(result, 7.5)
 
     report = pva.openReport(report_helper.find_report())
-    ok = [
-        '__seed*', 'host-exchange-local-copy-', 'Sum/reduce*/Reduce',
-        'Sum_1/reduce*/Reduce', 'add/add'
-    ]
+    ok = ['Sum/reduce*/Reduce', 'Sum_1/reduce*/Reduce', 'add/add']
     self.assert_all_compute_sets_and_list(report, ok)
 
   def testNoCastsF16ToF32ToF16(self):
@@ -170,8 +165,8 @@ def testDontRemoveCastsIfUsed(self):
 
     report = pva.openReport(report_helper.find_report())
     ok = [
-        '__seed*', 'host-exchange-local-copy-', 'add/*/expression/Cast',
-        'add/*/expression/Op/Add', 'Cast_1/convert.*/Cast'
+        'add/*/expression/Cast', 'add/*/expression/Op/Add',
+        'Cast_1/convert.*/Cast'
     ]
     self.assert_all_compute_sets_and_list(report, ok)
 
@@ -194,8 +189,7 @@ def testReduceMean(self):
 
     report = pva.openReport(report_helper.find_report())
     ok = [
-        '__seed*', 'host-exchange-local-copy-', 'Mean/fusion/Reduce',
-        'Mean/fusion*/Op/Multiply', 'Mean/convert*/Cast'
+        'Mean/fusion/Reduce', 'Mean/fusion*/Op/Multiply', 'Mean/convert*/Cast'
     ]
     self.assert_all_compute_sets_and_list(report, ok)
 
@@ -218,10 +212,7 @@ def testReduceMax(self):
       self.assertAllClose(result, [val, val])
 
     report = pva.openReport(report_helper.find_report())
-    ok = [
-        '__seed*', 'host-exchange-local-copy-', 'Max/reduce*/Reduce',
-        'Cast/convert*/Cast'
-    ]
+    ok = ['Max/reduce*/Reduce', 'Cast/convert*/Cast']
     self.assert_all_compute_sets_and_list(report, ok)
 
 

tensorflow/compiler/plugin/poplar/tests/conv3d_test.py

@@ -81,10 +81,7 @@ def test3DConv3x3x3_WithBias(self):
       self.assertAllClose(result, np.zeros([1, 14, 14, 14, 32]))
 
     report = pva.openReport(report_helper.find_report())
-    ok = [
-        '__seed*', 'host-exchange-local-copy-',
-        'convolution/convolution.*/Conv_3x3x3', 'BiasAdd/fusion/Op/Add'
-    ]
+    ok = ['convolution/convolution.*/Conv_3x3x3', 'BiasAdd/fusion/Op/Add']
     self.assert_all_compute_sets_and_list(report, ok)
 
   def test3DConv8x8x8_WithBias(self):
@@ -115,7 +112,6 @@ def test3DConv8x8x8_WithBias(self):
 
     report = pva.openReport(report_helper.find_report())
     ok = [
-        '__seed*', 'host-exchange-local-copy-', 'Copy_',
         'Conv3D/convolution.*/Conv_8x8x8_stride4x4x4', 'BiasAdd/fusion/Op/Add'
     ]
     self.assert_all_compute_sets_and_list(report, ok)
@@ -147,10 +143,7 @@ def test3DConv1x1x1_WithBias(self):
       self.assertAllClose(result, np.zeros([1, 1, 1, 1, 8]))
 
     report = pva.openReport(report_helper.find_report())
-    ok = [
-        '__seed*', 'host-exchange-local-copy-',
-        'Conv3D/convolution.*/Conv_1x1', 'add/fusion/Op/Add'
-    ]
+    ok = ['Conv3D/convolution.*/Conv_1x1', 'add/fusion/Op/Add']
     self.assert_all_compute_sets_and_list(report, ok)
 
   def test3DConvBackpropInput(self):
@@ -181,8 +174,7 @@ def test3DConvBackpropInput(self):
 
     report = pva.openReport(report_helper.find_report())
     ok = [
-        '__seed*', 'Conv3DBackpropInputV2/conv-with-reverse/Conv_2x2x2',
-        'copy*/OnTileCopy-'
+        'Conv3DBackpropInputV2/conv-with-reverse/Conv_2x2x2',
     ]
     self.assert_all_compute_sets_and_list(report, ok)
 
@@ -213,9 +205,7 @@ def test3DConvBackpropFilter(self):
       self.assertAllClose(result, np.zeros([2, 2, 2, 3, 5]))
 
     report = pva.openReport(report_helper.find_report())
-    ok = [
-        '__seed*', 'Copy_', 'Conv3DBackpropFilterV2/convolution.*/Conv_8x8x8'
-    ]
+    ok = ['Conv3DBackpropFilterV2/convolution.*/Conv_8x8x8']
     self.assert_all_compute_sets_and_list(report, ok)
 
 

tensorflow/compiler/plugin/poplar/tests/conv_graph_caching_sharded_test.py

@@ -67,7 +67,7 @@ def testConvolutionsDontMatchDifferentDevices(self):
     report = pva.openReport(report_helper.find_report())
     # Note how there are two convolutions
     ok = [
-        '__seed*', '*OnTileCopy*', 'vs/conv2d/Conv2D/convolution.*',
+        '*OnTileCopy*', 'vs/conv2d/Conv2D/convolution.*',
         'Copy_vs/conv2d/Conv2D/convolution.*',
         'vs/conv2d_1/Conv2D/convolution.*'
     ]

tensorflow/compiler/plugin/poplar/tests/conv_graph_caching_test.py

@@ -75,8 +75,7 @@ def testConvolutionsMatch(self):
     # Would fail if there were two convolutions in the graph as they would be
     # called conv2d and conv2d_1
     ok = [
-        '__seed*', 'host-exchange-local-copy-', 'Copy_',
-        'vs/conv2d/Conv2D/convolution.*/Conv_1x1', 'Copy_'
+        'vs/conv2d/Conv2D/convolution.*/Conv_1x1',
     ]
     self.assert_all_compute_sets_and_list(report, ok)
 
@@ -118,9 +117,6 @@ def testConvolutionsDontMatchDifferentTypes(self):
     report = pva.openReport(report_helper.find_report())
     # Matches two convolutions
     ok = [
-        '__seed*',
-        'host-exchange-local-copy-',
-        'Copy_',
         'vs/conv2d/Conv2D/convolution.*/Conv_1x1',
         'vs/Cast/convert.*/Cast',
         'vs/conv2d_1/Conv2D/convolution.*/Conv_1x1',
@@ -162,7 +158,6 @@ def testConvolutionsDontMatchDifferentShapes(self):
     report = pva.openReport(report_helper.find_report())
     # Matches two convolutions
     ok = [
-        '__seed*', 'host-exchange-local-copy-',
         'vs/conv2d/Conv2D/convolution.*/Conv_1x1',
         'vs/conv2d_1/Conv2D/convolution.*/Conv_1x1'
     ]
@@ -204,7 +199,6 @@ def testConvolutionsDontMatchDifferentConvParams(self):
     report = pva.openReport(report_helper.find_report())
     # Matches two convolutions
     ok = [
-        '__seed*', 'host-exchange-local-copy-', 'Copy_',
         'vs/conv2d/Conv2D/convolution.*/Conv_1x1',
         'vs/conv2d_1/Conv2D/convolution.*/Conv_1x1'
     ]
@@ -260,8 +254,6 @@ def testConvolutionsMatchFwdBwdWu(self):
     # Both BackpropFilter should be shared
     # pylint: disable=line-too-long
     ok = [
-        '__seed*',
-        'copy*/OnTileCopy',
         'vs/conv1/Conv2D/convolution.*/Conv_1x1',
         'Sum/reduce.*/ReduceOnTile/InToIntermediateNoExchange/Reduce',
         'Sum/reduce.*/ReduceFinalStage/IntermediateToOutput/Reduce',
@@ -323,9 +315,6 @@ def testConvolutionsMatchFwdBwdWuVariableLR(self):
     # Both BackpropFilter should be shared
     # pylint: disable=line-too-long
     ok = [
-        '__seed*',
-        'host-exchange-local-copy-',
-        'Copy_',
         'Sum/reduce.*/ReduceOnTile/InToIntermediateNoExchange/Reduce',
         'Sum/reduce.*/ReduceFinalStage/IntermediateToOutput/Reduce',
         'gradients/vs/conv1/Conv2D_grad/Conv2DBackpropFilter/fusion.*/Conv_4x4',
@@ -493,7 +482,7 @@ def model(device):
     self.assert_max_tile_memory(report, 401526, tolerance=0.2)
 
     # Would fail if there were two convolutions in the graph
-    ok = ['__seed*', 'a/convolution', '[cC]opy']
+    ok = ['a/convolution']
     self.assert_all_compute_sets_and_list(report, ok)
 
 

tensorflow/compiler/plugin/poplar/tests/conv_test.py

@@ -156,10 +156,7 @@ def testConv8x8_WithBias(self):
                                                           fmt)))
 
       report = pva.openReport(report_helper.find_report())
-      ok = [
-          '__seed*', 'host-exchange-local-copy-',
-          'cnv4*/convolution.*/Conv_8x8_stride4x4', 'ba4*/fusion/Op/Add'
-      ]
+      ok = ['cnv4*/convolution.*/Conv_8x8_stride4x4', 'ba4*/fusion/Op/Add']
       self.assert_all_compute_sets_and_list(report, ok)
 
   def testConv1x1_WithBias(self):
@@ -195,10 +192,7 @@ def testConv1x1_WithBias(self):
         self.assertAllClose(result, np.zeros(self._ip_shp([1, 1, 1, 16], fmt)))
 
       report = pva.openReport(report_helper.find_report())
-      ok = [
-          '__seed*', 'Copy_', 'cnv5*/convolution.*/Conv_1x1',
-          'ba5*/fusion/Op/Add'
-      ]
+      ok = ['cnv5*/convolution.*/Conv_1x1', 'ba5*/fusion/Op/Add']
       self.assert_all_compute_sets_and_list(report, ok)
 
   def testConvBackpropInput(self):
@@ -230,8 +224,6 @@ def testConvBackpropInput(self):
     report = pva.openReport(report_helper.find_report())
     # pylint: disable=line-too-long
     ok = [
-        '__seed*',
-        'Copy_',
         'Conv2DBackpropInput/conv-with-reverse/Conv_2x2',
     ]
     # pylint: enable=line-too-long
@@ -265,8 +257,6 @@ def testConvBackpropFilter(self):
 
     report = pva.openReport(report_helper.find_report())
     ok = [
-        '__seed*',
-        '[cC]opy',
         'Conv2DBackpropFilter/convolution.*/Conv_8x8',
     ]
     self.assert_all_compute_sets_and_list(report, ok)
@@ -297,10 +287,7 @@ def testDepthwiseConv3x2(self):
                     [[43, 36, 33, 25, 19, 10], [61, 51, 45, 34, 25, 13]]]])
 
     report = pva.openReport(report_helper.find_report())
-    ok = [
-        '__seed*', 'host-exchange-local-copy-',
-        'depthwise/convolution.*/Conv_1x1', 'add/fusion*/Add'
-    ]
+    ok = ['depthwise/convolution.*/Conv_1x1', 'add/fusion*/Add']
     self.assert_all_compute_sets_and_list(report, ok)
 
   def testDepthwiseConv3x1(self):
@@ -329,10 +316,7 @@ def testDepthwiseConv3x1(self):
 
     report = pva.openReport(report_helper.find_report())
     # pylint: disable=line-too-long
-    ok = [
-        '__seed*', 'host-exchange-local-copy-',
-        'depthwise/convolution.*/Conv_1x1', 'add/fusion*/Add'
-    ]
+    ok = ['depthwise/convolution.*/Conv_1x1', 'add/fusion*/Add']
     # pylint: enable=line-too-long
     self.assert_all_compute_sets_and_list(report, ok)
 
@@ -361,7 +345,6 @@ def testDepthwiseConvBackpropInput(self):
     report = pva.openReport(report_helper.find_report())
     # pylint: disable=line-too-long
     ok = [
-        '__seed*', 'copy*OnTileCopy-',
         'DepthwiseConv2dNativeBackpropInput/conv-with-reverse/Conv_3x3/Convolve',
         'DepthwiseConv2dNativeBackpropInput/conv-with-reverse/Conv_3x3/WeightsTranspose'
     ]
@@ -393,7 +376,6 @@ def testDepthwiseConvBackpropInput1x1(self):
     report = pva.openReport(report_helper.find_report())
     # pylint: disable=line-too-long
     ok = [
-        '__seed*',
         'DepthwiseConv2dNativeBackpropInput/conv-with-reverse/*Transpose',
         'DepthwiseConv2dNativeBackpropInput/conv-with-reverse/Conv_1x1',
     ]