Simplify coverage build to single step

Author: vlad-perevezentsev

.github/workflows/generate_coverage.yaml

@@ -11,7 +11,7 @@ jobs:
     name: Generate coverage and push to Coveralls.io
 
     runs-on: ubuntu-latest
-    timeout-minutes: 180
+    timeout-minutes: 150
 
     permissions:
       # Needed to cancel any previous runs that are not completed for a given workflow
@@ -117,44 +117,24 @@ jobs:
           mamba info
           mamba list
 
-      - name: Build dpnp tensor with coverage
-        id: build_tensor
+      - name: Build dpnp with coverage
+        id: build_coverage
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
-        env:
-          SYCL_CACHE_PERSISTENT: 1
-          CMAKE_BUILD_PARALLEL_LEVEL: 2
         with:
           shell: bash
-          timeout_minutes: 90
+          timeout_minutes: 120
           max_attempts: 5
           retry_on: error
           command: |
             . $CONDA/etc/profile.d/conda.sh
             conda activate coverage
             [ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh
             git clean -fxd
-            python scripts/gen_coverage.py --build-step tensor
-
-      - name: Build dpnp with coverage (skip tensor)
-        id: build_skip_tensor
-        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
-        env:
-          SYCL_CACHE_PERSISTENT: 1
-        with:
-          shell: bash
-          timeout_minutes: 90
-          max_attempts: 5
-          retry_on: error
-          command: |
-            . $CONDA/etc/profile.d/conda.sh
-            conda activate coverage
-            [ -f /opt/intel/oneapi/setvars.sh ] && source /opt/intel/oneapi/setvars.sh
-            python scripts/gen_coverage.py --build-step skip-tensor
+            python scripts/gen_coverage.py
 
       - name: Total number of coverage attempts
         run: |
-          echo "Total tensor build attempts: ${{ steps.build_tensor.outputs.total_attempts }}"
-          echo "Total skip-tensor build attempts: ${{ steps.build_skip_tensor.outputs.total_attempts }}"
+          echo "Total number of coverage attempts: ${{ steps.build_coverage.outputs.total_attempts }}"
 
       - name: Upload coverage data to coveralls.io
         uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7

dpnp/CMakeLists.txt

@@ -174,31 +174,18 @@ function(build_dpnp_cython_ext_with_backend _trgt _src _dest)
     target_link_libraries(${_trgt} PRIVATE dpnp_backend_library)
 endfunction()
 
-# Control which components to build (for memory-constrained CI builds)
-# DPNP_BUILD_COMPONENTS:
-#   ALL (default),
-#   TENSOR_ONLY,
-#   SKIP_TENSOR,
-if(NOT DEFINED DPNP_BUILD_COMPONENTS)
-    set(DPNP_BUILD_COMPONENTS "ALL")
-endif()
-
-if(DPNP_BUILD_COMPONENTS STREQUAL "ALL" OR DPNP_BUILD_COMPONENTS STREQUAL "TENSOR_ONLY")
-    add_subdirectory(tensor)
-endif()
-
-if(DPNP_BUILD_COMPONENTS STREQUAL "ALL" OR DPNP_BUILD_COMPONENTS STREQUAL "SKIP_TENSOR")
-    add_subdirectory(backend)
-    add_subdirectory(backend/extensions/blas)
-    add_subdirectory(backend/extensions/fft)
-    add_subdirectory(backend/extensions/indexing)
-    add_subdirectory(backend/extensions/lapack)
-    add_subdirectory(backend/extensions/statistics)
-    add_subdirectory(backend/extensions/ufunc)
-    add_subdirectory(backend/extensions/vm)
-    add_subdirectory(backend/extensions/window)
-
-    add_subdirectory(dpnp_algo)
-    add_subdirectory(dpnp_utils)
-    add_subdirectory(random)
-endif()
+add_subdirectory(tensor)
+
+add_subdirectory(backend)
+add_subdirectory(backend/extensions/blas)
+add_subdirectory(backend/extensions/fft)
+add_subdirectory(backend/extensions/indexing)
+add_subdirectory(backend/extensions/lapack)
+add_subdirectory(backend/extensions/statistics)
+add_subdirectory(backend/extensions/ufunc)
+add_subdirectory(backend/extensions/vm)
+add_subdirectory(backend/extensions/window)
+
+add_subdirectory(dpnp_algo)
+add_subdirectory(dpnp_utils)
+add_subdirectory(random)

scripts/gen_coverage.py

@@ -119,14 +119,6 @@ def parse_args():
         action="store_true",
         help="Remove build dir before rebuild (default: False)",
     )
-    p.add_argument(
-        "--build-step",
-        choices=["tensor", "skip-tensor", "both"],
-        default="both",
-        help="Which build step to run: tensor (only tensor to generate headers), "
-        "skip-tensor (everything except tensor, assumes tensor headers exist), "
-        "or both (default: both)",
-    )
 
     return p.parse_args()
 
@@ -200,36 +192,17 @@ def main():
 
     log_cmake_args(cmake_args, "gen_coverage")
 
-    if args.build_step in ["tensor", "both"]:
-        # Build tensor only to generate Cython headers
-        tensor_cmake_args = cmake_args.copy()
-        tensor_cmake_args.append("-DDPNP_BUILD_COMPONENTS=TENSOR_ONLY")
-
-        build_extension(
-            setup_dir,
-            env,
-            tensor_cmake_args,
-            cmake_executable=args.cmake_executable,
-            generator=args.generator,
-            build_type="Coverage",
-        )
-
-    if args.build_step in ["skip-tensor", "both"]:
-        # Build everything except tensor (assumes tensor headers already exist)
-        skip_tensor_cmake_args = cmake_args.copy()
-        skip_tensor_cmake_args.append("-DDPNP_BUILD_COMPONENTS=SKIP_TENSOR")
-
-        build_extension(
-            setup_dir,
-            env,
-            skip_tensor_cmake_args,
-            cmake_executable=args.cmake_executable,
-            generator=args.generator,
-            build_type="Coverage",
-        )
-        install_editable(setup_dir, env)
+    build_extension(
+        setup_dir,
+        env,
+        cmake_args,
+        cmake_executable=args.cmake_executable,
+        generator=args.generator,
+        build_type="Coverage",
+    )
+    install_editable(setup_dir, env)
 
-    if args.run_pytest and args.build_step in ["skip-tensor", "both"]:
+    if args.run_pytest:
         env["LLVM_PROFILE_FILE"] = "dpnp_pytest.profraw"
         pytest_cmd = [
             "pytest",
@@ -296,13 +269,10 @@ def find_objects():
             )
 
         print("[gen_coverage] Coverage export is completed")
-    elif args.build_step == "tensor":
-        print(
-            "[gen_coverage] Skipping pytest (tensor-only build, tests will run after skip-tensor build)"
-        )
     else:
         print(
-            "[gen_coverage] Skipping pytest and coverage collection (--skip-pytest)"
+            "[gen_coverage] Skipping pytest and coverage collection "
+            "(--skip-pytest)"
         )
 
     print("[gen_coverage] Done")