diff --git a/tests/py/dynamo/backend/test_backend_compiler.py b/tests/py/dynamo/backend/test_backend_compiler.py index 506c9a1959..08cefcd524 100644 --- a/tests/py/dynamo/backend/test_backend_compiler.py +++ b/tests/py/dynamo/backend/test_backend_compiler.py @@ -22,7 +22,7 @@ def forward(self, x, y): fx_graph = torch.fx.symbolic_trace(FullySupportedMultiOp()) partitioned_graph, _ = fast_partition(deepcopy(fx_graph), min_block_size=3) - self.assertEquals( + self.assertEqual( len( [ 1 @@ -96,17 +96,17 @@ def forward(self, x, y): testing_partitioning=True, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(partitioned_graphs), 1, "Without control flow breaks, there should only be a single graph", ) - self.assertEquals( + self.assertEqual( len( [ 1 @@ -201,7 +201,7 @@ def forward(self, x, y): fx_graph = torch.fx.symbolic_trace(FullySupportedMultiOp()) partitioned_graph, _ = fast_partition(deepcopy(fx_graph), min_block_size=3) - self.assertEquals( + self.assertEqual( len(list(partitioned_graph.named_children())), 1, "All operators are supported, there should be one segment", @@ -265,17 +265,17 @@ def forward(self, x, y): testing_partitioning=True, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(partitioned_graphs), 1, "Without control flow breaks, there should only be a single graph", ) - self.assertEquals( + self.assertEqual( len( [ 1 diff --git a/tests/py/dynamo/backend/test_specialized_models.py b/tests/py/dynamo/backend/test_specialized_models.py index 613fc167bb..dc2620197e 100644 --- a/tests/py/dynamo/backend/test_specialized_models.py +++ b/tests/py/dynamo/backend/test_specialized_models.py @@ -33,7 +33,7 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -90,7 +90,7 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -263,13 +263,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", diff --git a/tests/py/dynamo/lowering/test_aten_lowering_passes.py b/tests/py/dynamo/lowering/test_aten_lowering_passes.py index 2d7a4731f5..71ef487c3a 100644 --- a/tests/py/dynamo/lowering/test_aten_lowering_passes.py +++ b/tests/py/dynamo/lowering/test_aten_lowering_passes.py @@ -118,13 +118,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -187,13 +187,13 @@ def forward(self, q, k, v): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -303,13 +303,13 @@ def forward(self, q, k, v): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -418,13 +418,13 @@ def forward(self, input, weight, bias): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -524,13 +524,13 @@ def forward(self, input): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", diff --git a/tests/py/dynamo/lowering/test_decompositions.py b/tests/py/dynamo/lowering/test_decompositions.py index 533e9d84d3..650ef70d3f 100644 --- a/tests/py/dynamo/lowering/test_decompositions.py +++ b/tests/py/dynamo/lowering/test_decompositions.py @@ -34,7 +34,7 @@ def forward(self, x, y): fx_graph, inputs, expected_ops=expected_ops, min_block_size=2 ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -63,7 +63,7 @@ def forward(self, x): fx_graph, inputs, unexpected_ops=unexpected_ops, min_block_size=1 ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", @@ -98,13 +98,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -138,13 +138,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -206,13 +206,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -265,13 +265,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -325,13 +325,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -385,13 +385,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -449,13 +449,13 @@ def forward(self, x): min_block_size=1, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(expected_ops_unseen), 0, f"The following expected ops were not encountered: {expected_ops_unseen}", @@ -478,7 +478,7 @@ def forward(self, x): optimized_model_results_shape = optimized_model_results.size() torch_model_results_shape = torch_model_results.size() - self.assertEquals( + self.assertEqual( optimized_model_results_shape, torch_model_results_shape, f"The optimized model results shape and torch model results shape should be equal in empty_like", diff --git a/tests/py/dynamo/partitioning/test_fast_partitioning.py b/tests/py/dynamo/partitioning/test_fast_partitioning.py index 2ff5433b22..30f691d9e9 100644 --- a/tests/py/dynamo/partitioning/test_fast_partitioning.py +++ b/tests/py/dynamo/partitioning/test_fast_partitioning.py @@ -19,7 +19,7 @@ def forward(self, x, y): fx_graph = torch.fx.symbolic_trace(FullySupportedOneOp()) partitioned_graph, _ = partitioning.fast_partition(deepcopy(fx_graph)) - self.assertEquals( + self.assertEqual( len( [ 1 @@ -43,7 +43,7 @@ def forward(self, x, y): partitioned_graph, _ = partitioning.fast_partition( deepcopy(fx_graph), require_full_compilation=True ) - self.assertEquals( + self.assertEqual( len( [ 1 @@ -71,7 +71,7 @@ def forward(self, x, y): partitioned_graph, _ = partitioning.fast_partition( deepcopy(fx_graph), min_block_size=2 ) - self.assertEquals( + self.assertEqual( len( [ 1 @@ -100,7 +100,7 @@ def forward(self, x, y): partitioned_graph, _ = partitioning.fast_partition( deepcopy(fx_graph), min_block_size=2 ) - self.assertEquals( + self.assertEqual( len( [ 1 @@ -155,18 +155,18 @@ def forward(self, x, y): use_fast_partitioner=True, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(partitioned_graphs), 1, "Without control flow breaks, there should only be a single graph", ) - self.assertEquals( + self.assertEqual( len( [ 1 diff --git a/tests/py/dynamo/partitioning/test_global_partitioning.py b/tests/py/dynamo/partitioning/test_global_partitioning.py index 51d93a40f2..cd9da7521c 100644 --- a/tests/py/dynamo/partitioning/test_global_partitioning.py +++ b/tests/py/dynamo/partitioning/test_global_partitioning.py @@ -19,7 +19,7 @@ def forward(self, x, y): fx_graph = torch.fx.symbolic_trace(FullySupportedOneOp()) partitioned_graph, _ = partitioning.global_partition(deepcopy(fx_graph)) - self.assertEquals( + self.assertEqual( len(list(partitioned_graph.named_children())), 0, "Single operators should not be segmented", @@ -37,7 +37,7 @@ def forward(self, x, y): partitioned_graph, _ = partitioning.global_partition( deepcopy(fx_graph), require_full_compilation=True ) - self.assertEquals( + self.assertEqual( len(list(partitioned_graph.named_children())), 1, "Single operators can be segmented if full compilation is required", @@ -59,7 +59,7 @@ def forward(self, x, y): partitioned_graph, _ = partitioning.global_partition( deepcopy(fx_graph), min_block_size=2 ) - self.assertEquals( + self.assertEqual( len(list(partitioned_graph.named_children())), 1, "All operators are supported, there should be one segment", @@ -82,7 +82,7 @@ def forward(self, x, y): partitioned_graph, _ = partitioning.global_partition( deepcopy(fx_graph), min_block_size=2 ) - self.assertEquals( + self.assertEqual( len(list(partitioned_graph.named_children())), 2, "Unsupported operators interleave supported ones, expected 2 segments", @@ -131,18 +131,18 @@ def forward(self, x, y): use_fast_partitioner=False, ) - self.assertEquals( + self.assertEqual( len(unexpected_ops_seen), 0, f"The following unexpected ops were encountered: {unexpected_ops_seen}", ) - self.assertEquals( + self.assertEqual( len(partitioned_graphs), 1, "Without control flow breaks, there should only be a single graph", ) - self.assertEquals( + self.assertEqual( len(list(partitioned_graphs[0].named_children())), 1, "Certain operators are set to run in Torch, expected 1 segment",