Merge branch 'main' into main

Author: sacpis

.github/workflows/config/spelling_allowlist.txt

@@ -276,6 +276,7 @@ nullary
 observables
 optimizer
 optimizers
+pagerank
 parallelization
 parallelize
 parallelizing

.github/workflows/integration_tests.yml

@@ -835,10 +835,9 @@ jobs:
 
           # Test all remote-sim tests
           for filename in `find targettests/Remote-Sim -name '*.cpp'`; do
-            # unsupport_args and compile_errors are compile error tests
-            # nested_vectors: Compiler fails to synthesize nested vector parameters (https://github.com/NVIDIA/cuda-quantum/issues/2001)
+            # unsupport_args is compile error test
             # qvector_init_from_state, qvector_init_from_state_lazy, test_trotter: New argument synthesis is not executed for nvqc (https://github.com/NVIDIA/cuda-quantum/issues/2146)
-            if [[ "$filename" != *"unsupport_args"* ]] && [[ "$filename" != *"compile_errors"* ]] && [[ "$filename" != *"nested_vectors"* ]] && [[ "$filename" != *"qvector_init_from_state"* ]] && [[ "$filename" != *"qvector_init_from_state_lazy"* ]] && [[ "$filename" != *"test_trotter"* ]]; then
+            if [[ "$filename" != *"unsupport_args"* ]] && [[ "$filename" != *"qvector_init_from_state"* ]] && [[ "$filename" != *"qvector_init_from_state_lazy"* ]] && [[ "$filename" != *"test_trotter"* ]]; then
               echo "$filename"
               nvqc_config=""
               # Look for a --remote-mqpu-auto-launch to determine the number of QPUs

.github/workflows/nvqc_regression_tests.yml

@@ -131,14 +131,13 @@ jobs:
 
           # Test all remote-sim tests
           for filename in `find targettests/Remote-Sim -name '*.cpp'`; do
-            # unsupport_args and compile_errors are compile error tests
+            # unsupport_args is compile error test
             # pauli_word: https://github.com/NVIDIA/cuda-quantum/issues/1957
-            # nested_vectors: related to vector of pauli_words (https://github.com/NVIDIA/cuda-quantum/issues/1957)
             # custom_operation: https://github.com/NVIDIA/cuda-quantum/issues/1985
             # return_values: only supported in 0.8 NVQC service.
             # qvector_init_from_vector: only supported in 0.8 NVQC service.
             # qvector_init_from_state, qvector_init_from_state_lazy, test_trotter: not supported yet on nvqc: https://github.com/NVIDIA/cuda-quantum/issues/2146
-            if [[ "$filename" != *"unsupport_args"* ]] && [[ "$filename" != *"state_overlap"* ]] && [[ "$filename" != *"compile_errors"* ]] && [[ "$filename" != *"nested_vectors"* ]] && [[ "$filename" != *"pauli_word"* ]] && [[ "$filename" != *"custom_operation"* ]] && [[ "$filename" != *"return_values"* ]] && [[ "$filename" != *"qvector_init_from_state"* ]] && [[ "$filename" != *"qvector_init_from_state_lazy"* ]] && [[ "$filename" != *"qvector_init_from_vector"* ]] && [[ "$filename" != *"test_trotter"* ]]; then
+            if [[ "$filename" != *"unsupport_args"* ]] && [[ "$filename" != *"state_overlap"* ]] && [[ "$filename" != *"pauli_word"* ]] && [[ "$filename" != *"custom_operation"* ]] && [[ "$filename" != *"return_values"* ]] && [[ "$filename" != *"qvector_init_from_state"* ]] && [[ "$filename" != *"qvector_init_from_state_lazy"* ]] && [[ "$filename" != *"qvector_init_from_vector"* ]] && [[ "$filename" != *"test_trotter"* ]]; then
               echo "$filename"
               nvqc_config=""
               # Look for a --remote-mqpu-auto-launch to determine the number of QPUs

docs/sphinx/_static/app_title_images/quantum_pagerank_preview.png

@@ -36,12 +36,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
     "import numpy as np\n",
     "import cudaq\n",
+    "from cudaq import spin\n",
     "from scipy.optimize import minimize\n",
     "import random\n",
     "\n",
@@ -59,7 +60,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -102,7 +103,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -157,16 +158,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [],
    "source": [
     "def qaoa_mixer(n):\n",
     "\n",
-    "    term = cudaq.spin.x(0)\n",
+    "    term = spin.x(0)\n",
     "\n",
     "    for i in range(1, n):\n",
-    "        term = term + cudaq.spin.x(i)\n",
+    "        term = term + spin.x(i)\n",
     "\n",
     "    pool = [term]\n",
     "    return pool\n",
@@ -176,7 +177,7 @@
     "    pool = []\n",
     "\n",
     "    for i in range(n):\n",
-    "        pool.append(cudaq.spin.x(i))\n",
+    "        pool.append(cudaq.SpinOperator(spin.x(i)))\n",
     "\n",
     "    return pool\n",
     "\n",
@@ -186,10 +187,10 @@
     "\n",
     "    for i in range(n-1):\n",
     "        for j in range(i+1, n):\n",
-    "            pool.append(cudaq.spin.x(i) * cudaq.spin.x(j))\n",
-    "            pool.append(cudaq.spin.y(i) * cudaq.spin.y(j))\n",
-    "            pool.append(cudaq.spin.y(i) * cudaq.spin.z(j))\n",
-    "            pool.append(cudaq.spin.z(i) * cudaq.spin.y(j))\n",
+    "            pool.append(cudaq.SpinOperator(spin.x(i)) * cudaq.SpinOperator(spin.x(j)))\n",
+    "            pool.append(cudaq.SpinOperator(spin.y(i)) * cudaq.SpinOperator(spin.y(j)))\n",
+    "            pool.append(cudaq.SpinOperator(spin.y(i)) * cudaq.SpinOperator(spin.z(j)))\n",
+    "            pool.append(cudaq.SpinOperator(spin.z(i)) * cudaq.SpinOperator(spin.y(j)))\n",
     "\n",
     "    return pool\n",
     "\n",
@@ -203,7 +204,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
@@ -230,7 +231,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -251,7 +252,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -308,7 +309,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [
     {
@@ -423,7 +424,12 @@
     "        layer.append(1) \n",
     "        random_mixer = random.choice(temp_pool)\n",
     "        \n",
-    "        mixer_pool = mixer_pool + [random_mixer.get_pauli_word(qubits_num)]\n",
+    "        pool_added = []\n",
+    "        for term in random_mixer:\n",
+    "            pool_added.append(term.get_pauli_word(qubits_num))\n",
+    "            \n",
+    "        mixer_pool = mixer_pool + pool_added\n",
+    "        \n",
     "    \n",
     "        print('Mixer pool at step', istep)\n",
     "        print(mixer_pool)\n",
@@ -484,7 +490,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [
     {
@@ -494,8 +500,8 @@
       "\n",
       " Sampling the Final ADAPT QAOA circuit \n",
       "\n",
-      "The most probable max cut:  01011\n",
-      "All bitstring from circuit sampling:  { 01011:2550 10100:2450 }\n",
+      "The most probable max cut:  10100\n",
+      "All bitstring from circuit sampling:  { 01011:2499 10100:2501 }\n",
       "\n"
      ]
     }
@@ -510,14 +516,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CUDA-Q Version cu12-latest (https://github.com/NVIDIA/cuda-quantum 05873efb8973bd60fcf7cfe193e6ab54c6edee60)\n"
+      "CUDA-Q Version cu12-latest (https://github.com/NVIDIA/cuda-quantum 974716fa2024267f7c12a2ed86ffbfe314d37a36)\n"
      ]
     }
    ],