Merge branch 'fix_oqc_test' of https://github.com/sacpis/cuda-quantum into fix_oqc_test

Author: sacpis

.github/workflows/config/gitlab_commits.txt

@@ -1,2 +1,2 @@
 nvidia-mgpu-repo: cuda-quantum/cuquantum-mgpu.git
-nvidia-mgpu-commit: 8d7646431c824f8a7bf88bf3d9ba02f42746a024
+nvidia-mgpu-commit: 438397cdc7529293c78a399243c63dc3f6c3886a

.github/workflows/config/spelling_allowlist.txt

@@ -354,6 +354,7 @@ toolchain
 toolchains
 toolset
 transmon
+transpile
 trotterization
 uccsd
 unary

.github/workflows/docker_images.yml

@@ -841,6 +841,7 @@ jobs:
           # In containers without GPU support, UCX does not work properly since it is configured to work with GPU-support.
           # Hence, don't enforce UCX when running these tests.
           docker exec cuda-quantum bash -c "python3 -m pip install --break-system-packages pandas scipy seaborn h5py contfrac"
+          docker exec cuda-quantum bash -c "sudo apt install -y python3-venv"
           (docker exec cuda-quantum bash -c "unset OMPI_MCA_pml && set -o pipefail && bash validate_container.sh | tee /tmp/validation.out") && passed=true || passed=false
           docker cp cuda-quantum:"/tmp/validation.out" /tmp/validation.out
           docker stop cuda-quantum

.github/workflows/integration_tests.yml

@@ -416,7 +416,8 @@ jobs:
                 exit 1
               }
               rm -f "$TEMP_NETRC"
-              read -r id_token refresh_token < <(echo "$response" | jq -r '.id_token, .refresh_token')
+              id_token=$(printf '%s' "$response" | jq -r '.id_token')
+              refresh_token=$(printf '%s' "$response" | jq -r '.refresh_token')
               echo "::add-mask::$id_token"
               echo "::add-mask::$refresh_token"
               printf "key: %s\nrefresh: %s\n" "$id_token" "$refresh_token" > "$HOME/.anyon_config"
@@ -640,7 +641,7 @@ jobs:
                 ;;
 
               iqm)
-                nvq++ -DSYNTAX_CHECK --target iqm --iqm-machine Crystal_5 $filename
+                nvq++ -DSYNTAX_CHECK --target iqm $filename
                 test_status=$?
                 if [ $test_status -eq 0 ]; then
                   ./a.out
@@ -763,7 +764,7 @@ jobs:
                 if [[ "$filename" == *.cpp ]]; then
                   if [[ "$filename" == *"quantinuum_ng/"* ]]; then
                     echo "### Running Quantinuum-NG test" >> $GITHUB_STEP_SUMMARY
-                    nvq++ -v $filename --target quantinuum --quantinuum-machine Helios-1E --quantinuum-project ${{ secrets.QUANTINUUM_NEXUS_PROJECT_ID }} --quantinuum-max-cost 10 --quantinuum-max-qubits 7 --quantinuum-noisy-simulation false
+                    nvq++ -v $filename --target quantinuum --quantinuum-machine Helios-1E --quantinuum-project ${{ secrets.QUANTINUUM_NEXUS_PROJECT_ID }} --quantinuum-max-cost 15 --quantinuum-max-qubits 7 --quantinuum-noisy-simulation false
                   else
                     echo "### Running standard Quantinuum test" >> $GITHUB_STEP_SUMMARY
                     nvq++ -v $filename -DSYNTAX_CHECK --target quantinuum --quantinuum-machine H2-1SC --quantinuum-project ${{ secrets.QUANTINUUM_NEXUS_PROJECT_ID }}
@@ -1024,6 +1025,7 @@ jobs:
           fetch-depth: 1
 
       - name: Install wheel
+        if: steps.skip_check.outputs.skipped != 'true'
         id: install_wheel
         run: |
           python_version=${{ inputs.python_version || env.python_version }}
@@ -1079,7 +1081,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Test NVQC
-        if: ${{ steps.install_wheel.outputs.skipped != 'true' }}
+        if: ${{ steps.skip_check.outputs.skipped != 'true' || steps.install_wheel.outputs.skipped != 'true' }}
         run: |
           echo "### Submit to NVQC from Python wheels" >> $GITHUB_STEP_SUMMARY
           python_version=${{ inputs.python_version || env.python_version }}

.github/workflows/test_in_devenv.yml

@@ -91,7 +91,7 @@ jobs:
           shell: bash
           run: |
             cd $CUDAQ_REPO_ROOT
-            python3 -m pip install iqm-client==16.1
+            python3 -m pip install iqm-client==28.0.0
             python3 -m pytest -v --durations=0 build/python/tests/interop/
             pytest_status=$?
             if [ ! $pytest_status -eq 0 ]; then
@@ -136,7 +136,7 @@ jobs:
             # Rerun the MPI plugin test
             cd $CUDAQ_REPO_ROOT
             ctest --test-dir build -R MPIApiTest -V
-            external_plugin_status=$?   
+            external_plugin_status=$?
             if [ ! $external_plugin_status -eq 0 ] ; then
               echo "::error file=test_in_devenv.yml::Test CUDA Quantum MPI Plugin Activation failed with status $external_plugin_status."
               exit 1
@@ -153,7 +153,7 @@ jobs:
           docker run --name cuda-quantum-dev cuda-quantum-dev:local
           docker export cuda-quantum-dev > $output_directory/$filename.tar
           docker rm -f cuda-quantum-dev
-    
+
           echo "filename=$filename" >> $GITHUB_OUTPUT
           echo "output_directory=$output_directory" >> $GITHUB_OUTPUT
 
@@ -241,7 +241,7 @@ jobs:
             python3 -m venv --system-site-packages "$VENV_DIR"
             . "$VENV_DIR/bin/activate"
 
-            pip install iqm-client==16.1
+            pip install iqm-client==28.0.0
             pip install . -vvv
             pyinstall_status=$?
             if [ ! $pyinstall_status -eq 0 ]; then
@@ -265,9 +265,9 @@ jobs:
               if [ ! $pytest_status -eq 0 ] && [ ! $pytest_status -eq 5 ]; then
                 echo "::error file=test_in_devenv.yml::Python $backendTest tests failed with status $pytest_status."
                 exit 1
-              fi 
-            done 
-            
+              fi
+            done
+
       - name: Save environment
         id: env_save
         if: inputs.export_environment
@@ -279,7 +279,7 @@ jobs:
           docker run --name dev_env dev_env:local
           docker export dev_env > $output_directory/$filename.tar
           docker rm -f dev_env
-    
+
           echo "filename=$filename" >> $GITHUB_OUTPUT
           echo "output_directory=$output_directory" >> $GITHUB_OUTPUT
 

docs/notebook_validation.py

@@ -25,13 +25,33 @@ def read_available_backends():
     return [backend.strip() for backend in available_backends]
 
 
+# Following pattern matches
+# `set_target("abc")`
+# `set_target( "abc")`
+# `set_target("abc", option="xyz")`
+# `set_target("abc", option = "xyz")`
+# `set_target(\"abc\")`
+# `set_target( \"abc\")`
+# `set_target(\"abc\", option=\"xyz\")`
+# `set_target(\"abc\", option = \"xyz\")`
+# `set_target('abc')`
+# `set_target( 'abc')`
+# `set_target('abc', option='xyz')`
+# `set_target('abc', option = 'xyz')`
+pattern = r"set_target\(\s*(\\?['\"])([^'\"]+)\1(?:\s*,\s*option\s*=\s*(\\?['\"])([^'\"]+)\3)?\)"
+
+
 def validate(notebook_filename, available_backends):
     with open(notebook_filename) as f:
         lines = f.readlines()
     for notebook_content in lines:
-        match = re.search('set_target[\\\s\(]+"(.+)\\\\"[)]', notebook_content)
-        if match and (match.group(1) not in available_backends):
-            return False
+        if re.search(r'\s*\#', notebook_content):
+            continue
+
+        match = re.search(pattern, notebook_content)
+        if match:
+            target = match.group(2)
+            return target in available_backends
     for notebook_content in lines:
         match = re.search('--target ([^ ]+)', notebook_content)
         if match and (match.group(1) not in available_backends):
@@ -122,7 +142,9 @@ def print_results(success, failed, skipped=[]):
 
         ## `quantum_transformer`:
         ## See: https://github.com/NVIDIA/cuda-quantum/issues/2689
-        notebooks_skipped = ['quantum_transformer.ipynb']
+        notebooks_skipped = [
+            'quantum_transformer.ipynb', 'logical_aim_sqale.ipynb'
+        ]
 
         for notebook_filename in notebook_filenames:
             base_name = os.path.basename(notebook_filename)

docs/sphinx/applications/python/digitized_counterdiabatic_qaoa.ipynb

@@ -102,7 +102,7 @@
                 "#non_edges=[[u,v] for u in nodes for v in nodes if u<v and [u,v] not in edges]\n",
                 "#print('Edges: ', edges)\n",
                 "#print('Non-edges: ', non_edges)\n",
-                "#weights=[0.6686,0.6686,0.6886,0.1091,0.0770,0.0770,0.0770,0.0770]\n",
+                "#weights=[0.6686,0.6686,0.6686,0.1091,0.0770,0.0770,0.0770,0.0770]\n",
                 "#penalty=8.0\n",
                 "#num_layers=8"
             ]

docs/sphinx/applications/python/hybrid_quantum_neural_networks.ipynb

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Intorduction to CUDA-Q Dynamics (Jaynes-Cummings Model)"
+    "# Introduction to CUDA-Q Dynamics (Jaynes-Cummings Model)"
    ]
   },
   {
@@ -148,7 +148,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Initialize the states of the system in cupy arrays and define the time chedule"
+    "Initialize the states of the system in cupy arrays and define the time schedule"
    ]
   },
   {