PyTest Migration

.github/workflows/_runner-generic.yml

@@ -14,7 +14,7 @@ name: _runner-generic
       docker-image:
         required: true
         type: string
-      test-names:
+      pytest-marker:
         required: true
         type: string
 
@@ -38,14 +38,8 @@ jobs:
           key: ccache-ci
       - name: Run Test
         run: |
-          testNames="${{ inputs.test-names }}"
           cd DeeployTest
           mkdir -p /app/.ccache
           export CCACHE_DIR=/app/.ccache
-          echo "$testNames" | while IFS= read -r testName; do
-            if [[ -n "$testName" ]]; then
-              echo "Running test: $testName"
-              python testRunner_generic.py -t Tests/$testName
-            fi
-          done
+          pytest test_generic.py -v -n 4 -m "${{ inputs.pytest-marker }}"
         shell: bash

.github/workflows/_select-env.yml

@@ -34,7 +34,7 @@ jobs:
           elif [[ "${{ github.ref_name }}" == "main" ]]; then
             IMAGE="ghcr.io/pulp-platform/deeploy:main"
           else
-            IMAGE="ghcr.io/pulp-platform/deeploy:devel"
+            IMAGE="ghcr.io/victor-jung/deeploy:pytest-migration"
           fi
           echo "image=${IMAGE}" >> "$GITHUB_OUTPUT"
 

.github/workflows/ci-platform-generic.yml

@@ -35,69 +35,12 @@ jobs:
     with:
       runner: ${{ needs.select-env.outputs.runner }}
       docker-image: ${{ needs.select-env.outputs.image }}
-      test-names: |
-        Adder
-        MultIO
-        test1DConvolution
-        test2DConvolution
-        test1DDWConvolution
-        test2DDWConvolution
-        test1DPad
-        test2DPad
-        testGEMM
-        testMatMul
-        testMatMulAdd
-        testMaxPool
-        testRQConv
-        testRQMatMul
-        testReduceSum
-        testReduceMean
-        testSlice
-        testRequantizedDWConv
-        test2DRequantizedConv
-        iSoftmax
-        testFloatAdder
-        testFloatGEMM
-        testFloat2DConvolution
-        testFloat2DConvolutionBias
-        testFloat2DConvolutionZeroBias
-        testFloatLayerNorm
-        testFloatDiv
-        testFloat2DDWConvolution
-        testFloat2DDWConvolutionBias
-        testFloat2DDWConvolutionZeroBias
-        testFloatRelu
-        testFloatMaxPool
-        testFloatMatmul
-        testFloatReshapeWithSkipConnection
-        testFloatSoftmax
-        testFloatTranspose
-        testFloatMul
-        testFloatPowScalar
-        testFloatPowVector
-        testFloatSqrt
-        testFloatRMSNorm
-        Quant
-        Dequant
-        QuantizedLinear
+      pytest-marker: "kernels"
 
   generic-models:
     needs: select-env
     uses: ./.github/workflows/_runner-generic.yml
     with:
       runner: ${{ needs.select-env.outputs.runner }}
       docker-image: ${{ needs.select-env.outputs.image }}
-      test-names: |
-        simpleRegression
-        WaveFormer
-        simpleCNN
-        ICCT
-        ICCT_ITA
-        ICCT_8
-        ICCT_ITA_8
-        miniMobileNet
-        miniMobileNetv2
-        CCT/CCT_1_16_16_8
-        CCT/CCT_2_32_32_128_Opset20
-        testFloatDemoTinyViT
-        Autoencoder1D
+      pytest-marker: "models"

Container/Dockerfile.deeploy

@@ -86,6 +86,9 @@ WORKDIR /app
 
 COPY pyproject.toml ./
 
+# Add nvidia channel to the pip configuration
+RUN mkdir -p /etc && printf "[global]\nextra-index-url = https://pypi.ngc.nvidia.com\n" > /etc/pip.conf
+
 # Install dependencies
 RUN mkdir -p /root/.cargo/bin/ && \
     apt-get update && \
@@ -103,7 +106,6 @@ RUN mkdir -p /root/.cargo/bin/ && \
     curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
     python get-pip.py && \
     rm get-pip.py && \
-    pip install nvidia-pyindex && \
     pip install toml-to-requirements && \
     toml-to-req --toml-file pyproject.toml && \
     pip install -r requirements.txt

DeeployTest/conftest.py

@@ -0,0 +1,119 @@
+# SPDX-FileCopyrightText: 2025 ETH Zurich and University of Bologna
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+from pathlib import Path
+
+import coloredlogs
+import pytest
+
+from Deeploy.Logging import DEFAULT_FMT
+from Deeploy.Logging import DEFAULT_LOGGER as log
+
+
+def pytest_addoption(parser: pytest.Parser) -> None:
+    """Native PyTest hook: add custom command-line options for Deeploy tests."""
+    parser.addoption(
+        "--skipgen",
+        action = "store_true",
+        default = False,
+        help = "Skip network generation step",
+    )
+    parser.addoption(
+        "--skipsim",
+        action = "store_true",
+        default = False,
+        help = "Skip simulation step (only generate and build)",
+    )
+    parser.addoption(
+        "--toolchain",
+        action = "store",
+        default = "LLVM",
+        help = "Compiler toolchain to use (LLVM or GCC)",
+    )
+    parser.addoption(
+        "--toolchain-install-dir",
+        action = "store",
+        default = os.environ.get("LLVM_INSTALL_DIR"),
+        help = "Path to toolchain installation directory",
+    )
+    parser.addoption(
+        "--cmake-args",
+        action = "append",
+        default = [],
+        help = "Additional CMake arguments (can be used multiple times)",
+    )
+
+
+def pytest_configure(config: pytest.Config) -> None:
+    """Native PyTest hook: configure pytest for Deeploy tests."""
+    # Register custom markers
+    config.addinivalue_line("markers", "generic: mark test as a Generic platform test")
+    config.addinivalue_line("markers", "kernels: mark test as a kernel test (individual operators)")
+    config.addinivalue_line("markers", "models: mark test as a model test (full networks)")
+    config.addinivalue_line("markers", "slow: mark test as slow running")
+
+    # Configure logging based on verbosity
+    verbosity = config.option.verbose
+    if verbosity >= 3:
+        coloredlogs.install(level = 'DEBUG', logger = log, fmt = DEFAULT_FMT)
+    elif verbosity >= 2:
+        coloredlogs.install(level = 'INFO', logger = log, fmt = DEFAULT_FMT)
+    else:
+        coloredlogs.install(level = 'WARNING', logger = log, fmt = DEFAULT_FMT)
+
+
+@pytest.fixture(scope = "session")
+def deeploy_test_dir():
+    """Return the DeeployTest directory path."""
+    return Path(__file__).parent
+
+
+@pytest.fixture(scope = "session")
+def tests_dir(deeploy_test_dir):
+    """Return the Tests directory path."""
+    return deeploy_test_dir / "Tests"
+
+
+@pytest.fixture(scope = "session")
+def toolchain_dir(request):
+    """Return the toolchain installation directory."""
+    toolchain_install = request.config.getoption("--toolchain-install-dir")
+    if toolchain_install is None:
+        pytest.skip(reason = "LLVM_INSTALL_DIR not set")
+    return toolchain_install
+
+
+@pytest.fixture(scope = "session")
+def ccache_dir():
+    """Setup and return ccache directory."""
+    ccache_path = Path("/app/.ccache")
+    if ccache_path.exists():
+        os.environ["CCACHE_DIR"] = str(ccache_path)
+        return ccache_path
+    return None
+
+
+@pytest.fixture
+def skipgen(request):
+    """Return whether to skip network generation."""
+    return request.config.getoption("--skipgen")
+
+
+@pytest.fixture
+def skipsim(request):
+    """Return whether to skip simulation."""
+    return request.config.getoption("--skipsim")
+
+
+@pytest.fixture
+def toolchain(request):
+    """Return the toolchain to use."""
+    return request.config.getoption("--toolchain")
+
+
+@pytest.fixture
+def cmake_args(request):
+    """Return additional CMake arguments."""
+    return request.config.getoption("--cmake-args")

DeeployTest/pytest.ini

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: 2025 ETH Zurich and University of Bologna
+#
+# SPDX-License-Identifier: Apache-2.0
+
+[pytest]
+# Pytest configuration for Deeploy tests
+
+# Test discovery patterns
+python_files = test_*.py
+python_classes = Test*
+python_functions = test_*
+
+# Minimum version
+minversion = 6.0
+
+# Add current directory to Python path
+pythonpath = .
+
+# Default options
+addopts = 
+    -ra
+    --strict-markers
+    --strict-config
+    --showlocals
+
+# Test output
+console_output_style = progress
+
+# Logging
+log_cli = false
+log_cli_level = INFO
+log_cli_format = %(levelname)s %(message)s
+
+# Warnings
+filterwarnings =
+    error
+    ignore::DeprecationWarning
+    ignore::PendingDeprecationWarning