Merge remote-tracking branch 'origin/main' into use-prereq-lockfile-src

Author: mitchdz

.github/pre-commit/spelling_allowlist.txt

@@ -108,6 +108,7 @@ QPP
 QPU
 QPUs
 QPU’s
+QRMI
 QTX
 QX
 QaaS

.github/workflows/build_package_sources.yml

@@ -24,14 +24,6 @@
 on:
   workflow_dispatch:
     inputs:
-      push_to_NGC:
-        required: false
-        type: boolean
-        default: false
-        description: 'Push the built source image to NGC, otherwise push to GHCR.'
-      environment:
-        required: false
-        type: string
       artifact_url:
         required: false
         type: string
@@ -455,39 +447,52 @@ jobs:
           push: false
 
       - name: Log in to GitHub CR
-        if: github.event.inputs.push_to_NGC != 'true'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Log in to NGC
-        if: github.event.inputs.push_to_NGC == 'true'
-        uses: docker/login-action@v3
-        with:
-          registry: nvcr.io
-          username: '$oauthtoken'
-          password: ${{ secrets.NGC_CREDENTIALS }}
-
-      - name: Tag and push to GHCR or NGC
+      - name: Tag and push amd64 image
         id: push
         run: |
           docker load --input /tmp/package-sources.tar
           cuda_major=$(echo "${{ matrix.cuda }}" | cut -d. -f1)
           target_image="nvcr.io/nvidia/nightly/cuda-quantum:cu${cuda_major}-latest"
           tag_suffix="${target_image##*:}"
-          if [ "${{ github.event.inputs.push_to_NGC }}" = "true" ]; then
-            # Derive push destination from target_image: .../cuda-quantum:tag -> .../cuda-quantum-src:tag
-            repo_part="${target_image%:*}"
-            tag="${repo_part}-src:${tag_suffix}"
-          else
-            owner_lower=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
-            tag="ghcr.io/${owner_lower}/cuda-quantum-src:${tag_suffix}"
-          fi
-          docker tag package-sources:latest "$tag"
-          docker push "$tag"
+          owner_lower=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          tag="ghcr.io/${owner_lower}/cuda-quantum-src:${tag_suffix}"
+          tag_amd64="${tag}-amd64"
+          tag_arm64="${tag}-arm64"
+          docker tag package-sources:latest "$tag_amd64"
+          docker push "$tag_amd64"
           echo "image_tag=$tag" | tee -a $GITHUB_OUTPUT
+          echo "tag_amd64=$tag_amd64" | tee -a $GITHUB_OUTPUT
+          echo "tag_arm64=$tag_arm64" | tee -a $GITHUB_OUTPUT
+
+      - name: Create arm64 image (copy /sources from amd64)
+        run: |
+          tag_amd64="${{ steps.push.outputs.tag_amd64 }}"
+          tag_arm64="${{ steps.push.outputs.tag_arm64 }}"
+          base_image="${{ steps.base-image.outputs.base_image }}"
+          # Extract /sources from amd64 image
+          cid=$(docker create "$tag_amd64")
+          docker cp "$cid:/sources" ./sources-from-amd64
+          docker rm "$cid"
+          # Build arm64 image: same base, add /sources
+          cat > Dockerfile.arm64 << EOF
+          FROM ${base_image}
+          COPY sources-from-amd64 /sources
+          EOF
+          docker buildx build --platform linux/arm64 -f Dockerfile.arm64 -t "$tag_arm64" --load .
+          docker push "$tag_arm64"
+
+      - name: Create and push multi-arch manifest
+        run: |
+          tag="${{ steps.push.outputs.image_tag }}"
+          tag_amd64="${{ steps.push.outputs.tag_amd64 }}"
+          tag_arm64="${{ steps.push.outputs.tag_arm64 }}"
+          docker buildx imagetools create --tag "$tag" "$tag_amd64" "$tag_arm64"
 
       - name: Summary
         run: |

.github/workflows/ci_macos.yml

@@ -1,4 +1,15 @@
 on:
+  workflow_call:
+    inputs:
+      cache_base:
+        required: false
+        type: string
+        default: main
+      cudaq_version:
+        required: false
+        type: string
+        description: 'Override version for wheel/installer (e.g. when called from deployments for a release).'
+        default: ''
   # Daily rebuild on main to ensure devdeps rebuilt as needed
   schedule:
     - cron: '0 4 * * *'  # aim to be ready by 9am CET/CEST
@@ -59,11 +70,16 @@ jobs:
 
       - id: version
         run: |
-          is_versioned=${{ github.ref_type == 'tag' || startsWith(github.ref_name, 'releases/') || startsWith(github.ref_name, 'staging/') }}
-          if ${is_versioned}; then
-            cudaq_version=$(echo ${{ github.ref_name }} | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
+          if [ -n "${{ inputs.cudaq_version }}" ]; then
+            cudaq_version=$(echo "${{ inputs.cudaq_version }}" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}([A-Za-z0-9_\-\.]*)" || true)
+            cudaq_version=${cudaq_version:-0.0.0}
           else
-            cudaq_version=0.0.0
+            is_versioned=${{ github.ref_type == 'tag' || startsWith(github.ref_name, 'releases/') || startsWith(github.ref_name, 'staging/') }}
+            if ${is_versioned}; then
+              cudaq_version=$(echo ${{ github.ref_name }} | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
+            else
+              cudaq_version=0.0.0
+            fi
           fi
           echo "cudaq_version=$cudaq_version" >> $GITHUB_OUTPUT
 
@@ -88,8 +104,9 @@ jobs:
     name: Build & Test (arm64)
     needs: devdeps
     runs-on: macos-26
-    timeout-minutes: 180
     env:
+      CC: clang
+      CXX: clang++
       MACOSX_DEPLOYMENT_TARGET: '13.0'
 
     steps:
@@ -127,8 +144,6 @@ jobs:
       - name: Build MLIR Python bindings
         run: |
           source scripts/set_env_defaults.sh
-
-          # Incremental rebuild: add python-bindings to cached LLVM build
           Python3_EXECUTABLE="$(which python3)" \
           LLVM_PROJECTS='clang;lld;mlir;openmp;python-bindings' \
           LLVM_SOURCE="$HOME/.llvm-project" \
@@ -152,8 +167,9 @@ jobs:
         python_version: ['3.11', '3.12', '3.13']
       fail-fast: false
     runs-on: macos-26
-    timeout-minutes: 90
     env:
+      CC: clang
+      CXX: clang++
       MACOSX_DEPLOYMENT_TARGET: '13.0'
     outputs:
       cudaq_version: ${{ needs.metadata.outputs.cudaq_version }}
@@ -189,8 +205,6 @@ jobs:
       - name: Build MLIR Python bindings
         run: |
           source scripts/set_env_defaults.sh
-
-          # Incremental rebuild: add python-bindings to cached LLVM build
           Python3_EXECUTABLE="$(which python3)" \
           LLVM_PROJECTS='clang;lld;mlir;openmp;python-bindings' \
           LLVM_SOURCE="$HOME/.llvm-project" \
@@ -216,7 +230,7 @@ jobs:
           # Consistent with Linux: pycudaq-<python_version_dashed>-<platform_info>
           name: pycudaq-${{ matrix.python_version }}-darwin-arm64
           path: dist/cuda_quantum*.whl
-          retention-days: 1
+          retention-days: 3
           if-no-files-found: error
 
   # ============================================================================
@@ -230,7 +244,6 @@ jobs:
         python_version: ['3.11', '3.12', '3.13']
       fail-fast: false
     runs-on: macos-26
-    timeout-minutes: 30
 
     steps:
       - name: Checkout repository
@@ -268,8 +281,9 @@ jobs:
     name: Installer (arm64)
     needs: [devdeps, metadata]
     runs-on: macos-26
-    timeout-minutes: 120
     env:
+      CC: clang
+      CXX: clang++
       MACOSX_DEPLOYMENT_TARGET: '13.0'
     outputs:
       cudaq_version: ${{ needs.metadata.outputs.cudaq_version }}
@@ -307,8 +321,6 @@ jobs:
       - name: Build MLIR Python bindings
         run: |
           source scripts/set_env_defaults.sh
-
-          # Incremental rebuild: add python-bindings to cached LLVM build
           Python3_EXECUTABLE="$(which python3)" \
           LLVM_PROJECTS='clang;lld;mlir;openmp;python-bindings' \
           LLVM_SOURCE="$HOME/.llvm-project" \
@@ -332,7 +344,7 @@ jobs:
           # Consistent with Linux: cudaq-<platform>-<config>-installer-<run_id>
           name: cudaq-arm64-darwin-installer-${{ github.run_id }}
           path: out/install_cuda_quantum*
-          retention-days: 1
+          retention-days: 3
           if-no-files-found: error
 
   # ============================================================================
@@ -343,7 +355,6 @@ jobs:
     name: Validate Installation (arm64)
     needs: [installer, wheel]
     runs-on: macos-26
-    timeout-minutes: 30
 
     steps:
       - name: Checkout repository
@@ -366,16 +377,34 @@ jobs:
           name: pycudaq-3.12-darwin-arm64
           path: wheel/
 
-      - name: Install CUDA-Q (C++ via installer)
+      - name: Create test user
+        run: |
+          sudo sysadminctl -addUser cudaqtest -password 'cudaqtest123' -admin
+          sudo mkdir -p /Users/cudaqtest
+          sudo chown cudaqtest /Users/cudaqtest
+
+      - name: Install CUDA-Q (C++ via installer to neutral path)
         run: |
+          install_path=/opt/cudaq-test
+          sudo mkdir -p "$install_path"
+          sudo chown cudaqtest "$install_path"
           chmod +x installer/install_cuda_quantum*
-          bash installer/install_cuda_quantum* --accept -- --installpath $HOME/.cudaq
+          sudo -u cudaqtest bash installer/install_cuda_quantum* --accept -- --installpath "$install_path"
 
       - name: Install CUDA-Q (Python via wheel)
         run: |
-          pip install wheel/*.whl
+          sudo -u cudaqtest -H python3 -m venv /Users/cudaqtest/venv
+          sudo -u cudaqtest -H /Users/cudaqtest/venv/bin/pip install wheel/*.whl
 
       - name: Validate installation
         run: |
-          source $HOME/.zshrc
-          bash scripts/validate_installation.sh
+          install_path=/opt/cudaq-test
+          workdir=$(sudo -u cudaqtest mktemp -d)
+          sudo cp -R scripts docs "$workdir/"
+          sudo chown -R cudaqtest "$workdir"
+          sudo -u cudaqtest bash -lc "
+            source /Users/cudaqtest/venv/bin/activate
+            source ${install_path}/set_env.sh
+            cd ${workdir}
+            bash scripts/validate_installation.sh
+          "

.github/workflows/deployments.yml

@@ -30,6 +30,11 @@ on:
         description: Create a GitHub release with the given version number (e.g. 0.3.0). A GitHub release with that version must not exist already.
         required: false
         default: ''
+      include_macos:
+        type: boolean
+        description: Build and include macOS wheels and installer.
+        required: false
+        default: true
   workflow_run:
     workflows:
       - PR merged
@@ -295,7 +300,7 @@ jobs:
 
   dispatch:
     name: Dispatch deployments
-    needs: [metadata, devdeps, wheeldeps, openmpi]
+    needs: [metadata, devdeps, wheeldeps, source_build, openmpi]
     if: github.event_name != 'workflow_dispatch'
     runs-on: ubuntu-latest
 
@@ -809,3 +814,14 @@ jobs:
       cuda_version: ${{ matrix.cuda_version }}
       build_cache: ${{ fromJson(needs.config.outputs.json).build_cache[format('{0}-cu{1}-installer', matrix.platform, matrix.cuda_version)] }}
       environment: ghcr-deployment
+
+  macos_ci:
+    name: macOS CI
+    needs: metadata
+    if: >-
+      needs.metadata.outputs.create_packages == 'true'
+      && (github.event_name != 'workflow_dispatch' || inputs.include_macos != false)
+    uses: ./.github/workflows/ci_macos.yml
+    with:
+      cache_base: ${{ needs.metadata.outputs.cache_base }}
+      cudaq_version: ${{ inputs.create_release }}

.github/workflows/dev_environment_macos.yml

@@ -89,11 +89,12 @@ jobs:
           # Unlike Linux CI which uses Docker layer caching (automatically invalidates
           # when the copied files change), macOS uses ORAS artifact caching with no
           # content-based invalidation. This hash ensures cache is rebuilt when
-          # build scripts change. Update this list if new files affect the build.
+          # build scripts or the devdeps workflow itself change (e.g. LLVM_PROJECTS).
           scripts_hash=$(cat \
             scripts/install_prerequisites.sh \
             scripts/build_llvm.sh \
             scripts/set_env_defaults.sh \
+            .github/workflows/dev_environment_macos.yml \
             | sha256sum | cut -c1-8)
           echo "scripts_hash=$scripts_hash" >> $GITHUB_OUTPUT
 
@@ -116,6 +117,9 @@ jobs:
       contents: read
       packages: write
       id-token: write
+    env:
+      CC: clang
+      CXX: clang++
 
     outputs:
       image_hash: ${{ steps.image_hash.outputs.image_hash }}
@@ -170,10 +174,15 @@ jobs:
           brew unlink gcc 2>/dev/null || true
           brew link gcc --overwrite 2>/dev/null || true
           
-          # Build prerequisites without Python bindings
-          # Python bindings are rebuilt per-Python-version in wheel jobs
+          # NumPy is required by MLIR's find_package(Python3 ... NumPy)
+          pip3 install numpy --break-system-packages
+          
+          # Build prerequisites with Python bindings enabled so the cmake
+          # cache already has MLIR_ENABLE_BINDINGS_PYTHON=ON.  Downstream
+          # wheel jobs only change Python3_EXECUTABLE, which keeps ninja's
+          # incremental rebuild scoped to the binding targets.
           source scripts/set_env_defaults.sh
-          export LLVM_PROJECTS='clang;lld;mlir;openmp'
+          export LLVM_PROJECTS='clang;lld;mlir;openmp;python-bindings'
           
           echo "Building prerequisites..."
           echo "LLVM_INSTALL_PREFIX=$LLVM_INSTALL_PREFIX"

.github/workflows/integration_tests.yml

@@ -423,9 +423,9 @@ jobs:
               ;;
             tii)
               echo "### Setting up TII account" >> $GITHUB_STEP_SUMMARY
-              echo "::add-mask::${{ secrets.TII_AUTH_TOKEN }}"
+              echo "::add-mask::${{ secrets.TII_API_TOKEN }}"
               echo "::add-mask::${{ secrets.TII_PROJECT }}"
-              echo "TII_AUTH_TOKEN=${{ secrets.TII_AUTH_TOKEN }}" >> $GITHUB_ENV
+              echo "TII_API_TOKEN=${{ secrets.TII_API_TOKEN }}" >> $GITHUB_ENV
               echo "TII_PROJECT=${{ secrets.TII_PROJECT }}" >> $GITHUB_ENV
               ;;
           esac
@@ -643,11 +643,27 @@ jobs:
                   python3 $filename 1> /dev/null
                   test_status=$?
                   if [ $test_status -eq 0 ]; then
-                    echo ":white_check_mark: Successfully ran test: $filename" >> $GITHUB_STEP_SUMMARY
+                    echo ":white_check_mark: Successfully ran test: $filename  (direct execution)" >> $GITHUB_STEP_SUMMARY
                   else
-                    echo ":x: Test failed (failed to execute): $filename" >> $GITHUB_STEP_SUMMARY
+                    echo ":x: Test failed (failed to execute): $filename (direct execution)" >> $GITHUB_STEP_SUMMARY
                     test_err_sum=$((test_err_sum+1))
                   fi
+                  if [ "$(uname)" = "Linux" ] && [ "$(uname -m)" = "x86_64" ] && \
+                     [ -f "${QRMI_INSTALL_PREFIX:-/usr/local/qrmi}/lib64/libqrmi.so" ]; then
+                    PASQAL_MACHINE_TARGET=qrmi \
+                    SLURM_JOB_QPU_RESOURCES=EMU_FREE \
+                    EMU_FREE_QRMI_PASQAL_CLOUD_PROJECT_ID=$PASQAL_PROJECT_ID \
+                    python3 "$filename" 1> /dev/null
+                    test_status=$?
+                    if [ $test_status -eq 0 ]; then
+                      echo ":white_check_mark: Successfully ran test: $filename (qrmi execution)" >> $GITHUB_STEP_SUMMARY
+                    else
+                      echo ":x: Test failed (failed to execute): $filename (qrmi execution)" >> $GITHUB_STEP_SUMMARY
+                      test_err_sum=$((test_err_sum+1))
+                    fi
+                  else
+                    echo ":information_source: Skipped QRMI test for $filename (QRMI not available in this build)" >> $GITHUB_STEP_SUMMARY
+                  fi
                 else
                   echo "::warning::Unsupported file type: $filename"
                   echo ":warning: Test skipped (unsupported file type): $filename" >> $GITHUB_STEP_SUMMARY
@@ -776,6 +792,7 @@ jobs:
                   echo "::warning::Unsupported file type: $filename"
                   echo ":warning: Test skipped (unsupported file type): $filename" >> $GITHUB_STEP_SUMMARY
                   test_skip_sum=$((test_skip_sum+1))
+                fi
                 ;;
             esac
           done