From b21db5afa878ebb3b2bd47e6fbd5b71a43e7457c Mon Sep 17 00:00:00 2001 From: Saad Jameel Date: Tue, 10 Dec 2024 20:50:41 +0000 Subject: [PATCH] #12349: add back tests that now work on blackhole #12550: re-enable some permute tests, disable the ones that aren't working --- .../sweep_tests/pytests/tt_dnn/test_permute.py | 1 - .../python_api_testing/unit_testing/misc/test_transpose.py | 7 +------ tests/ttnn/unit_tests/operations/test_permute.py | 5 ++++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/tt_eager/python_api_testing/sweep_tests/pytests/tt_dnn/test_permute.py b/tests/tt_eager/python_api_testing/sweep_tests/pytests/tt_dnn/test_permute.py index d9ab2571a58a..98699e2d4f20 100644 --- a/tests/tt_eager/python_api_testing/sweep_tests/pytests/tt_dnn/test_permute.py +++ b/tests/tt_eager/python_api_testing/sweep_tests/pytests/tt_dnn/test_permute.py @@ -20,7 +20,6 @@ ] -@skip_for_blackhole("Mismatching on BH, see #12349") @pytest.mark.parametrize("input_shapes, permute_args", params) def test_run_permute_test(input_shapes, permute_args, device, function_level_defaults): datagen_func = [ diff --git a/tests/tt_eager/python_api_testing/unit_testing/misc/test_transpose.py b/tests/tt_eager/python_api_testing/unit_testing/misc/test_transpose.py index 3b85e37b15e9..4b51e48e7611 100644 --- a/tests/tt_eager/python_api_testing/unit_testing/misc/test_transpose.py +++ b/tests/tt_eager/python_api_testing/unit_testing/misc/test_transpose.py @@ -299,7 +299,6 @@ def test_transpose_wh_sharded_program_cache(dtype, device, use_program_cache): ) -@skip_for_blackhole("Mismatching on BH, see #12349") @skip_for_grayskull("Grayskull has pcc issue when transpose used untilize") @pytest.mark.parametrize("n", [1]) @pytest.mark.parametrize("c", [1]) @@ -333,7 +332,6 @@ def test_tranpose_hw_rm_with_padding(device, n, c, h, w): assert_with_pcc(torch_output_tensor, activation_pyt_padded_out, 0.9999) -@skip_for_blackhole("Mismatching on BH, see #12349") @skip_for_grayskull("Grayskull has pcc issue when transpose used untilize") @pytest.mark.parametrize("n", [16]) @pytest.mark.parametrize("c", [128]) @@ -373,7 +371,6 @@ def run_tranpose_hw_rm_program_cache(device, n, c, h, w, use_program_cache): assert_with_pcc(torch_output_tensor, activation_pyt_padded_out, 0.9999) -@skip_for_blackhole("Mismatching on BH, see #12349") @skip_for_grayskull("Grayskull has pcc issue when transpose used untilize") @pytest.mark.parametrize("n", [16]) @pytest.mark.parametrize("c", [128]) @@ -400,7 +397,7 @@ def test_tranpose_hw_rm_with_program_cache(device, n, c, h, w, use_program_cache @pytest.mark.parametrize("c", [224]) @pytest.mark.parametrize("h", [16]) @pytest.mark.parametrize("w", [112]) -def test_tranpose_hw_sharded_rm(device, n, c, h, w): +def test_transpose_hw_sharded_rm(device, n, c, h, w): torch.manual_seed(2005) torch_input_tensor = torch.rand((n, c, h, w), dtype=torch.bfloat16) torch_output_tensor = torch_input_tensor.transpose(2, 3) @@ -467,7 +464,6 @@ def run_tranpose_hw_sharded_rm_with_program_cache(device, n, c, h, w): assert_with_pcc(torch_output_tensor, tt_output_tensor, 0.9999) -@skip_for_blackhole("Mismatching on BH, see #12349") @pytest.mark.parametrize("n", [16]) @pytest.mark.parametrize("c", [128]) @pytest.mark.parametrize("h", [128]) @@ -579,7 +575,6 @@ def run_tranpose_hc_sharded(device, n, c, h, w, grid_size): assert_with_pcc(torch_output_tensor, tt_output_tensor, 0.9999) -@skip_for_blackhole("Mismatching on BH, see #12349") @pytest.mark.parametrize( "n, c, h, w, grid_size", [ diff --git a/tests/ttnn/unit_tests/operations/test_permute.py b/tests/ttnn/unit_tests/operations/test_permute.py index 158ad3515c48..2d919cd2af64 100644 --- a/tests/ttnn/unit_tests/operations/test_permute.py +++ b/tests/ttnn/unit_tests/operations/test_permute.py @@ -10,7 +10,7 @@ import itertools from tests.ttnn.utils_for_testing import assert_with_pcc -from models.utility_functions import is_blackhole, is_grayskull, skip_for_grayskull +from models.utility_functions import is_blackhole, is_grayskull, skip_for_grayskull, skip_for_blackhole @pytest.mark.parametrize("h", [32]) @@ -185,6 +185,7 @@ def generate_permutations(N): yield perm +@skip_for_blackhole("tilize_block gives bad pcc after second iteration") @skip_for_grayskull("tilize_block gives bad pcc after second iteration") @pytest.mark.parametrize("shape", [(7, 7, 7, 7, 7)]) @pytest.mark.parametrize("perm", generate_permutations(5)) @@ -204,6 +205,7 @@ def test_permute_5d_width(shape, perm, memory_config, dtype, device): assert_with_pcc(torch_output, tt_output, 0.9999) +@skip_for_blackhole("tilize_block gives bad pcc after second iteration") @skip_for_grayskull("tilize_block gives bad pcc after second iteration") @pytest.mark.parametrize("shape", [(3, 65, 3, 3, 65), (1, 6, 256, 20, 50), (6, 20, 50, 1, 256)]) @pytest.mark.parametrize("perm", [(4, 0, 3, 2, 1), (1, 3, 4, 0, 2), (3, 0, 4, 1, 2)]) @@ -225,6 +227,7 @@ def test_permute_5d_blocked(shape, perm, memory_config, dtype, device): assert_with_pcc(torch_output, tt_output, 0.9999) +@skip_for_blackhole("tilize_block gives bad pcc after second iteration") @skip_for_grayskull("tilize_block gives bad pcc after second iteration") def test_permute_nd(device): torch_tensor = torch.rand((1, 3, 16, 16, 16, 16), dtype=torch.bfloat16)