[PT] merge tests folders (#3821)

### Changes

Merge `tests/torch2` to `tests/torch`
Removed unused code and data

Author: AlexanderDokuchaev

.github/workflows/call_precommit.yml

@@ -103,96 +103,6 @@ jobs:
         env:
           NUM_WORKERS: 4
 
-  pytorch-cpu:
-    timeout-minutes: 40
-    runs-on: ubuntu-latest-8-cores
-    defaults:
-      run:
-        shell: bash
-    env:
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - name: Install dependencies
-        run : |
-          sudo apt-get update
-          sudo apt-get --assume-yes install gcc g++ build-essential ninja-build libgl1-mesa-dev libglib2.0-0
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          lfs: true
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
-        with:
-          python-version: ${{ inputs.python_version }}
-      - name: Install uv
-        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
-      - name: Runner info
-        continue-on-error: true
-        run: |
-          cat /etc/*release
-          cat /proc/cpuinfo
-      - name: Override constraints
-        if: ${{ inputs.override_requirements != '' }}
-        run: python .github/scripts/override_constraints.py "${{ inputs.override_requirements }}"
-        shell: bash
-      - name: Install NNCF and test requirements
-        run: uv pip install --system . -r tests/torch/requirements.txt
-      - name: Print installed modules
-        run: pip list
-      - name: Run PyTorch precommit test scope
-        run: |
-          make test-torch-cpu
-        env:
-          NUM_WORKERS: 4
-
-  pytorch-cuda:
-    timeout-minutes: 40
-    runs-on: aks-linux-4-cores-28gb-gpu-tesla-t4
-    if: ${{ inputs.gpu_enabled == true }}
-    defaults:
-      run:
-        shell: bash
-    env:
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - name: Install dependencies
-        run : |
-          sudo apt-get update
-          sudo apt-get --assume-yes install build-essential ninja-build libgl1-mesa-dev libglib2.0-0 wget make
-      - name: Download CUDA
-        run: |
-          wget -q https://developer.download.nvidia.com/compute/cuda/12.6.3/local_installers/cuda_12.6.3_560.35.05_linux.run
-          sudo sh cuda_12.6.3_560.35.05_linux.run --toolkit --silent
-      - name: Runner info
-        continue-on-error: true
-        run: |
-          export PATH=/usr/local/cuda-12.4/bin${PATH:+:${PATH}}
-          export LD_LIBRARY_PATH=/usr/local/cuda-12.4/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-          nvidia-smi
-          cat /proc/cpuinfo
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          lfs: true
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
-        with:
-          python-version: ${{ inputs.python_version }}
-      - name: Install uv
-        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
-      - name: Override constraints
-        if: ${{ inputs.override_requirements != '' }}
-        run: python .github/scripts/override_constraints.py "${{ inputs.override_requirements }}"
-        shell: bash
-      - name: Install NNCF and test requirements
-        run: uv pip install --system . -r tests/torch/requirements.txt
-      - name: Print installed modules
-        run: pip list
-      - name: Check CUDA
-        run: |
-          python -c "import torch; print(torch.cuda.is_available())"
-      - name: Run PyTorch precommit test scope
-        run: |
-          export PATH=/usr/local/cuda-12.4/bin${PATH:+:${PATH}}
-          export LD_LIBRARY_PATH=/usr/local/cuda-12.4/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-          make test-torch-cuda
-
   tools:
     timeout-minutes: 40
     runs-on: ubuntu-latest
@@ -215,7 +125,7 @@ jobs:
       - name: Run tools precommit test scope
         run: pytest -ra tests/tools
 
-  pytorch2-cpu:
+  pytorch-cpu:
     timeout-minutes: 40
     runs-on: ubuntu-latest
     defaults:
@@ -235,13 +145,13 @@ jobs:
         run: python .github/scripts/override_constraints.py "${{ inputs.override_requirements }}"
         shell: bash
       - name: Install NNCF and test requirements
-        run: uv pip install --system . -r tests/torch2/requirements.txt
+        run: uv pip install --system . -r tests/torch/requirements.txt
       - name: Print installed modules
         run: pip list
-      - name: Run torch2 precommit test scope
-        run: pytest -ra -n2 --durations=30 tests/torch2 -m "not cuda"
+      - name: Run torch precommit test scope
+        run: pytest -ra -n2 --durations=30 tests/torch -m "not cuda"
 
-  pytorch2-cuda:
+  pytorch-cuda:
     timeout-minutes: 40
     runs-on: aks-linux-4-cores-28gb-gpu-tesla-t4
     if: ${{ inputs.gpu_enabled == true }}
@@ -279,7 +189,7 @@ jobs:
         run: python .github/scripts/override_constraints.py "${{ inputs.override_requirements }}"
         shell: bash
       - name: Install NNCF and test requirements
-        run: uv pip install --system . -r tests/torch2/requirements.txt
+        run: uv pip install --system . -r tests/torch/requirements.txt
       - name: Print installed modules
         run: pip list
       - name: Check CUDA
@@ -289,4 +199,4 @@ jobs:
         run: |
           export PATH=/usr/local/cuda-12.4/bin${PATH:+:${PATH}}
           export LD_LIBRARY_PATH=/usr/local/cuda-12.4/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-          pytest -ra tests/torch2 -m cuda
+          pytest -ra --durations=30 tests/torch -m cuda

.github/workflows/call_precommit_windows.yml

@@ -94,45 +94,6 @@ jobs:
           NUM_WORKERS: 4
 
   pytorch-cpu:
-    timeout-minutes: 100
-    runs-on: windows-2025-8-core
-    defaults:
-      run:
-        shell: bash
-    env:
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          lfs: true
-      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
-        with:
-          python-version: ${{ inputs.python_version }}
-      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
-      - name: Override constraints
-        if: ${{ inputs.override_requirements != '' }}
-        run: python .github/scripts/override_constraints.py "${{ inputs.override_requirements }}"
-        shell: bash
-      - name: Install NNCF and test requirements
-        run: pip install . -r tests/torch/requirements.txt
-      - name: Print installed modules
-        run: pip list
-      - name: Run PyTorch precommit test scope
-        run: |
-          set +e
-
-          sys_lib="$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")"
-          prefix_lib="$(python -c "import sys; print(sys.prefix + '/libs')")"
-          include_dir="$(python -c "import sysconfig; print(sysconfig.get_path('include'))")"
-
-          export LIB="${LIB};${sys_lib};${prefix_lib}"
-          export INCLUDE="${INCLUDE};${include_dir}"
-
-          make test-torch-cpu
-        env:
-          NUM_WORKERS: 1  # Parallel tests are falls on build extenstion.
-
-  pytorch2-cpu:
     timeout-minutes: 40
     runs-on: windows-2025-8-core
     defaults:
@@ -152,10 +113,10 @@ jobs:
         shell: bash
       - name: Install NNCF and test requirements
         run: |
-          pip install . -r tests/torch2/requirements.txt
+          pip install . -r tests/torch/requirements.txt
       - name: Print installed modules
         run: pip list
-      - name: Run torch2 precommit test scope
+      - name: Run torch precommit test scope
         run: |
           set +e
 
@@ -166,4 +127,4 @@ jobs:
           export LIB="${LIB};${sys_lib};${prefix_lib}"
           export INCLUDE="${INCLUDE};${include_dir}"
 
-          pytest -ra tests/torch2 -m "not cuda"
+          pytest -ra tests/torch -m "not cuda"

tests/cross_fw/shared/isolation_runner.py

@@ -27,7 +27,7 @@ def run_pytest_case_function_in_separate_process(fn: Callable) -> tuple[int, str
     pytest run failed, this function will trigger pytest.fail().
     :param fn - The function object corresponding to a pytest test function defined elsewhere.
     :returns A tuple of return code for the pytest invocation, and string representations of the stdout and stderr
-    pipe outputs of the pytest invoсation.
+    pipe outputs of the pytest invocation.
     """
     filename = inspect.getfile(fn)
     func_name = fn.__name__

tests/docs/test_md_instalation.py

@@ -123,7 +123,7 @@ def test_test_environment():
     ref = {
         "python": _parse_python_version_from_precommit_workflow(True),
         "pytorch": actual_versions["pytorch"],
-        "cuda_torch": _get_cuda_version_from_workflow(WORKFLOW_CALL_PRECOMMIT, "pytorch2-cuda"),
+        "cuda_torch": _get_cuda_version_from_workflow(WORKFLOW_CALL_PRECOMMIT, "pytorch-cuda"),
     }
     print(md_versions, ref)
     assert md_versions == ref, (

tests/executorch/conftest.py

@@ -8,4 +8,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-pytest_plugins = ["tests.torch2.conftest"]
+pytest_plugins = ["tests.torch.conftest"]

tests/executorch/test_quantizer_compression.py

@@ -37,9 +37,9 @@
 from nncf.torch.quantization.layers import INT8SymmetricWeightsDecompressor
 from tests.cross_fw.shared.nx_graph import compare_nx_graph_with_reference
 from tests.cross_fw.shared.paths import TEST_ROOT
+from tests.torch.fx.helpers import get_torch_fx_model
 from tests.torch.test_models.llama import LlamaDecoderOnly
 from tests.torch.test_models.synthetic import ShortTransformer
-from tests.torch2.fx.helpers import get_torch_fx_model
 
 FX_PT2E_DIR = TEST_ROOT / "executorch" / "data" / "fx" / "compress_pt2e"
 FX_AO_DIR = TEST_ROOT / "executorch" / "data" / "fx" / "ao_export_compression_OpenVINOQuantizer"

tests/post_training/experimental/sparsify_activations/pipelines.py

@@ -45,8 +45,8 @@
 from tests.post_training.pipelines.lm_weight_compression import WCNumCompressNodes
 from tests.post_training.pipelines.lm_weight_compression import WCTimeStats
 from tests.post_training.pipelines.lm_weight_compression import collect_int4_int8_num_errors
+from tests.torch.function_hook.sparsify_activations.helpers import count_sparsifier_patterns_in_ov
 from tests.torch.helpers import set_torch_seed
-from tests.torch2.function_hook.sparsify_activations.helpers import count_sparsifier_patterns_in_ov
 
 
 @dataclass