#14095: Move ccl unit tests to separate directory (#14096)

tenstorrent · Oct 24, 2024 · 34da50b · 34da50b
1 parent 6d0c52e
commit 34da50b
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 19 deletions.
diff --git a/tests/nightly/t3000/ccl/test_all_gather_nightly.py b/tests/nightly/t3000/ccl/test_all_gather_nightly.py
@@ -1 +1 @@
-../../../ttnn/unit_tests/operations/test_all_gather_nightly.py
+../../../ttnn/unit_tests/operations/ccl/test_all_gather_nightly.py
diff --git a/tests/nightly/t3000/ccl/test_reduce_scatter_nightly.py b/tests/nightly/t3000/ccl/test_reduce_scatter_nightly.py
@@ -1 +1 @@
-../../../ttnn/unit_tests/operations/test_reduce_scatter_nightly.py
+../../../ttnn/unit_tests/operations/ccl/test_reduce_scatter_nightly.py
diff --git a/tests/scripts/run_profiler_regressions.sh b/tests/scripts/run_profiler_regressions.sh
@@ -8,7 +8,7 @@ run_additional_T3000_test(){
     remove_default_log_locations
     mkdir -p $PROFILER_ARTIFACTS_DIR
 
-    ./tt_metal/tools/profiler/profile_this.py -c "'pytest tests/ttnn/unit_tests/operations/test_all_gather.py::test_all_gather_on_t3000_post_commit_for_profiler_regression'" | tee $PROFILER_ARTIFACTS_DIR/test_out.log
+    ./tt_metal/tools/profiler/profile_this.py -c "'pytest tests/ttnn/unit_tests/operations/ccl/test_all_gather.py::test_all_gather_on_t3000_post_commit_for_profiler_regression'" | tee $PROFILER_ARTIFACTS_DIR/test_out.log
 
     if cat $PROFILER_ARTIFACTS_DIR/test_out.log | grep "SKIPPED"
     then

diff --git a/tests/scripts/t3000/run_t3000_frequent_tests.sh b/tests/scripts/t3000/run_t3000_frequent_tests.sh
@@ -102,10 +102,10 @@ run_t3000_tteager_tests() {
 
   echo "LOG_METAL: Running run_t3000_tteager_tests"
 
-  pytest -n auto tests/ttnn/unit_tests/operations/test_all_gather.py -k post_commit ; fail+=$?
-  pytest -n auto tests/ttnn/unit_tests/operations/test_all_gather_matmul.py -k post_commit ; fail+=$?
-  pytest -n auto tests/ttnn/unit_tests/operations/test_reduce_scatter_post_commit.py ; fail+=$?
-  pytest -n auto tests/ttnn/unit_tests/operations/test_all_reduce_t3000_frequent.py ; fail+=$?
+  pytest -n auto tests/ttnn/unit_tests/operations/ccl/test_all_gather.py -k post_commit ; fail+=$?
+  pytest -n auto tests/ttnn/unit_tests/operations/ccl/test_all_gather_matmul.py -k post_commit ; fail+=$?
+  pytest -n auto tests/ttnn/unit_tests/operations/ccl/test_reduce_scatter_post_commit.py ; fail+=$?
+  pytest -n auto tests/ttnn/unit_tests/operations/ccl/test_all_reduce_t3000_frequent.py ; fail+=$?
 
   # distributed layernorm
   WH_ARCH_YAML=wormhole_b0_80_arch_eth_dispatch.yaml pytest tests/ttnn/unit_tests/operations/test_distributed_layernorm.py ; fail+=$?

diff --git a/tests/scripts/tg/run_tg_frequent_tests.sh b/tests/scripts/tg/run_tg_frequent_tests.sh
@@ -12,7 +12,7 @@ run_tg_tests() {
   pytest -n auto models/demos/tg/llama3_70b/tests/test_llama_decoder_galaxy.py --timeout=600 ; fail+=$?
   pytest -n auto models/demos/tg/llama3_70b/tests/test_llama_model_galaxy_ci.py --timeout=800 ; fail+=$?
   pytest -n auto models/demos/tg/resnet50/tests/test_resnet50_performant.py ; fail+=$?
-  pytest -n auto tests/ttnn/unit_tests/operations/test_all_gather_TG_post_commit.py --timeout=300 ; fail+=$?
+  pytest -n auto tests/ttnn/unit_tests/operations/ccl/test_all_gather_TG_post_commit.py --timeout=300 ; fail+=$?
 
   if [[ $fail -ne 0 ]]; then
     echo "LOG_METAL: run_tg_frequent_tests failed"

diff --git a/tests/scripts/tg/run_tg_nightly_tests.sh b/tests/scripts/tg/run_tg_nightly_tests.sh
@@ -7,7 +7,7 @@ run_tg_llama3_70b_tests() {
 
   echo "LOG_METAL: Running run_tg_llama3_70b_tests"
 
-  pytest tests/ttnn/unit_tests/operations/test_all_gather_TG_nightly.py ; fail+=$?
+  pytest tests/ttnn/unit_tests/operations/ccl/test_all_gather_TG_nightly.py ; fail+=$?
 
   # Falcon40B prefill 60 layer end to end with 10 loops; we need 8x8 grid size
   pytest tests/nightly/tg/models/demos/tg/llama3_70b ; fail+=$?

diff --git a/tests/sweep_framework/sweeps/ccl/all_gather_n300.py b/tests/sweep_framework/sweeps/ccl/all_gather_n300.py
@@ -11,7 +11,7 @@
 from tests.ttnn.utils_for_testing import start_measuring_time, stop_measuring_time
 from loguru import logger
 from tests.tt_eager.python_api_testing.sweep_tests.comparison_funcs import comp_equal, comp_pcc
-from tests.ttnn.unit_tests.operations.test_all_gather import is_unsupported_case_n300
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather import is_unsupported_case_n300
 
 # Override the default timeout in seconds for hang detection.
 TIMEOUT = 30

diff --git a/tests/sweep_framework/sweeps/ccl/line_all_gather.py b/tests/sweep_framework/sweeps/ccl/line_all_gather.py
@@ -11,7 +11,7 @@
 from tests.ttnn.utils_for_testing import start_measuring_time, stop_measuring_time
 from loguru import logger
 from tests.tt_eager.python_api_testing.sweep_tests.comparison_funcs import comp_equal, comp_pcc
-from tests.ttnn.unit_tests.operations.test_all_gather import is_unsupported_case
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather import is_unsupported_case
 from ttnn import ShardTensorToMesh
 
 # Override the default timeout in seconds for hang detection.

diff --git a/.../unit_tests/operations/test_all_gather.py → ...t_tests/operations/ccl/test_all_gather.py b/.../unit_tests/operations/test_all_gather.py → ...t_tests/operations/ccl/test_all_gather.py
diff --git a/...tions/test_all_gather_N300_post_commit.py → ...s/ccl/test_all_gather_N300_post_commit.py b/...tions/test_all_gather_N300_post_commit.py → ...s/ccl/test_all_gather_N300_post_commit.py
@@ -5,7 +5,7 @@
 import pytest
 import ttnn
 from models.utility_functions import skip_for_grayskull
-from tests.ttnn.unit_tests.operations.test_all_gather import (
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather import (
     run_all_gather_on_n300_impl,
     run_all_gather_sharded_n300,
 )

diff --git a/.../operations/test_all_gather_TG_nightly.py → ...rations/ccl/test_all_gather_TG_nightly.py b/.../operations/test_all_gather_TG_nightly.py → ...rations/ccl/test_all_gather_TG_nightly.py
@@ -7,7 +7,7 @@
 from loguru import logger
 import ttnn
 from tests.tt_eager.python_api_testing.sweep_tests.comparison_funcs import comp_equal, comp_pcc
-from tests.ttnn.unit_tests.operations.test_all_gather_TG_post_commit import (
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather_TG_post_commit import (
     run_line_all_gather_on_TG_with_mesh_tensor_along_rows,
 )
 from models.utility_functions import skip_for_grayskull

diff --git a/...rations/test_all_gather_TG_post_commit.py → ...ons/ccl/test_all_gather_TG_post_commit.py b/...rations/test_all_gather_TG_post_commit.py → ...ons/ccl/test_all_gather_TG_post_commit.py
diff --git a/...tions/test_all_gather_llama_perf_sweep.py → ...s/ccl/test_all_gather_llama_perf_sweep.py b/...tions/test_all_gather_llama_perf_sweep.py → ...s/ccl/test_all_gather_llama_perf_sweep.py
@@ -10,7 +10,7 @@
 from models.utility_functions import skip_for_grayskull, get_devices_for_t3000
 import itertools
 from ttnn import ShardTensorToMesh
-from tests.ttnn.unit_tests.operations.test_all_gather import run_all_gather_sharded
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather import run_all_gather_sharded
 
 
 @pytest.mark.timeout(120)

diff --git a/...ests/operations/test_all_gather_matmul.py → .../operations/ccl/test_all_gather_matmul.py b/...ests/operations/test_all_gather_matmul.py → .../operations/ccl/test_all_gather_matmul.py
@@ -9,7 +9,7 @@
 from ttnn import ShardTensorToMesh, ConcatMeshToTensor
 from tests.tt_eager.python_api_testing.sweep_tests.comparison_funcs import comp_equal, comp_pcc
 from models.utility_functions import skip_for_grayskull, skip_for_wormhole_b0
-from tests.ttnn.unit_tests.operations.test_all_gather import is_unsupported_case
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather import is_unsupported_case
 
 
 USE_NON_FUSED = False

diff --git a/...sts/operations/test_all_gather_nightly.py → ...operations/ccl/test_all_gather_nightly.py b/...sts/operations/test_all_gather_nightly.py → ...operations/ccl/test_all_gather_nightly.py
@@ -8,7 +8,7 @@
 import ttnn
 from tests.tt_eager.python_api_testing.sweep_tests.comparison_funcs import comp_equal, comp_pcc
 from models.utility_functions import skip_for_grayskull
-from tests.ttnn.unit_tests.operations.test_all_gather import (
+from tests.ttnn.unit_tests.operations.ccl.test_all_gather import (
     is_unsupported_case,
     run_all_gather_on_t3000_impl,
 )

diff --git a/...rations/test_all_reduce_t3000_frequent.py → ...ons/ccl/test_all_reduce_t3000_frequent.py b/...rations/test_all_reduce_t3000_frequent.py → ...ons/ccl/test_all_reduce_t3000_frequent.py
diff --git a/...s/test_reduce_scatter_N300_post_commit.py → ...l/test_reduce_scatter_N300_post_commit.py b/...s/test_reduce_scatter_N300_post_commit.py → ...l/test_reduce_scatter_N300_post_commit.py
@@ -5,7 +5,7 @@
 import pytest
 import ttnn
 from models.utility_functions import skip_for_grayskull
-from tests.ttnn.unit_tests.operations.test_reduce_scatter_post_commit import (
+from tests.ttnn.unit_tests.operations.ccl.test_reduce_scatter_post_commit import (
     run_reduce_scatter_test,
     run_reduce_scatter_sharded_test,
 )

diff --git a/...s/test_reduce_scatter_llama_perf_sweep.py → ...l/test_reduce_scatter_llama_perf_sweep.py b/...s/test_reduce_scatter_llama_perf_sweep.py → ...l/test_reduce_scatter_llama_perf_sweep.py
@@ -8,7 +8,7 @@
 import ttnn
 from tests.tt_eager.python_api_testing.sweep_tests.comparison_funcs import comp_equal, comp_pcc
 from models.utility_functions import skip_for_grayskull, get_devices_for_t3000
-from tests.ttnn.unit_tests.operations.test_reduce_scatter_post_commit import run_reduce_scatter_sharded_test
+from tests.ttnn.unit_tests.operations.ccl.test_reduce_scatter_post_commit import run_reduce_scatter_sharded_test
 
 
 @pytest.mark.timeout(120)

diff --git a/...operations/test_reduce_scatter_nightly.py → ...ations/ccl/test_reduce_scatter_nightly.py b/...operations/test_reduce_scatter_nightly.py → ...ations/ccl/test_reduce_scatter_nightly.py
@@ -4,7 +4,7 @@
 
 import pytest
 import ttnn
-from tests.ttnn.unit_tests.operations.test_reduce_scatter_post_commit import (
+from tests.ttnn.unit_tests.operations.ccl.test_reduce_scatter_post_commit import (
     run_reduce_scatter_test,
 )
 from models.utility_functions import skip_for_grayskull

diff --git a/...ations/test_reduce_scatter_post_commit.py → ...ns/ccl/test_reduce_scatter_post_commit.py b/...ations/test_reduce_scatter_post_commit.py → ...ns/ccl/test_reduce_scatter_post_commit.py