From 1d33536ce115acdd4afa4f19c12b483bc8f5d792 Mon Sep 17 00:00:00 2001
From: Ashwin Srinath <shwina@users.noreply.github.com>
Date: Wed, 3 Dec 2025 16:42:30 -0500
Subject: [PATCH] Re-enable other CI jobs

---
 .github/workflows/pr.yml | 103 +++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 007ea6a..c42cda0 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -35,47 +35,46 @@ permissions:
   pull-requests: read
 
 jobs:
-  # Temporarily disabled for faster iteration on Python wheels
-  # compute-matrix:
-  #   name: Compute matrix
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     DEVCONTAINER_VERSION: ${{steps.set-outputs.outputs.DEVCONTAINER_VERSION}}
-  #     PER_CUDA_COMPILER_MATRIX: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_MATRIX}}
-  #     PER_CUDA_COMPILER_KEYS: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_KEYS}}
-  #     base_sha: ${{ steps.export-pr-info.outputs.base_sha }}
-  #     pr_number: ${{ steps.export-pr-info.outputs.pr_number }}
-  #   steps:
-  #     - name: Checkout repo
-  #       uses: actions/checkout@v4
-  #     - name: Lookup PR info
-  #       id: get-pr-info
-  #       uses: nv-gha-runners/get-pr-info@main
-  #     - name: Export PR info
-  #       id: export-pr-info
-  #       run: |
-  #         echo "base_sha=${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }}" | tee -a "${GITHUB_OUTPUT}"
-  #         echo "pr_number=${{ fromJSON(steps.get-pr-info.outputs.pr-info).number }}" | tee -a "${GITHUB_OUTPUT}"
-  #     - name: Compute matrix outputs
-  #       id: set-outputs
-  #       run: |
-  #         .github/actions/compute-matrix/compute-matrix.sh ci/matrix.yaml pull_request
+  compute-matrix:
+    name: Compute matrix
+    runs-on: ubuntu-latest
+    outputs:
+      DEVCONTAINER_VERSION: ${{steps.set-outputs.outputs.DEVCONTAINER_VERSION}}
+      PER_CUDA_COMPILER_MATRIX: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_MATRIX}}
+      PER_CUDA_COMPILER_KEYS: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_KEYS}}
+      base_sha: ${{ steps.export-pr-info.outputs.base_sha }}
+      pr_number: ${{ steps.export-pr-info.outputs.pr_number }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Lookup PR info
+        id: get-pr-info
+        uses: nv-gha-runners/get-pr-info@main
+      - name: Export PR info
+        id: export-pr-info
+        run: |
+          echo "base_sha=${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }}" | tee -a "${GITHUB_OUTPUT}"
+          echo "pr_number=${{ fromJSON(steps.get-pr-info.outputs.pr-info).number }}" | tee -a "${GITHUB_OUTPUT}"
+      - name: Compute matrix outputs
+        id: set-outputs
+        run: |
+          .github/actions/compute-matrix/compute-matrix.sh ci/matrix.yaml pull_request
 
-  # nvbench:
-  #   name: NVBench CUDA${{ matrix.cuda_host_combination }}
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #   needs: compute-matrix
-  #   uses: ./.github/workflows/dispatch-build-and-test.yml
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
-  #   with:
-  #     project_name: "nvbench"
-  #     per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
-  #     devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
+  nvbench:
+    name: NVBench CUDA${{ matrix.cuda_host_combination }}
+    permissions:
+      id-token: write
+      contents: read
+    needs: compute-matrix
+    uses: ./.github/workflows/dispatch-build-and-test.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
+    with:
+      project_name: "nvbench"
+      per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
+      devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
 
   python-wheels:
     name: Python Wheels
@@ -84,16 +83,16 @@ jobs:
       contents: read
     uses: ./.github/workflows/build-and-test-python-wheels.yml
 
-  # verify-devcontainers:
-  #   name: Verify Dev Containers
-  #   if: ${{ !contains(github.event.head_commit.message, '[skip-vdc]') }}
-  #   needs: compute-matrix
-  #   permissions:
-  #     id-token: write
-  #     contents: read
-  #   uses: ./.github/workflows/verify-devcontainers.yml
-  #   with:
-  #     base_sha: ${{ needs.compute-matrix.outputs.base_sha }}
+  verify-devcontainers:
+    name: Verify Dev Containers
+    if: ${{ !contains(github.event.head_commit.message, '[skip-vdc]') }}
+    needs: compute-matrix
+    permissions:
+      id-token: write
+      contents: read
+    uses: ./.github/workflows/verify-devcontainers.yml
+    with:
+      base_sha: ${{ needs.compute-matrix.outputs.base_sha }}
 
   # This job is the final job that runs after all other jobs and is used for branch protection status checks.
   # See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
@@ -103,9 +102,9 @@ jobs:
     name: CI
     if: ${{ always() }} # need to use always() instead of !cancelled() because skipped jobs count as success
     needs:
-      # - nvbench
+      - nvbench
       - python-wheels
-      # - verify-devcontainers
+      - verify-devcontainers
     steps:
       - name: Check status of all precursor jobs
         if: >-