sandia_qscout_qpu -> qscout_peregrine_qpu (#911)

(notebook check will pass after server-side changes)
Infleqtion · Mar 7, 2024 · 328db72 · 328db72
1 parent 0531504
commit 328db72
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 27 deletions.
diff --git a/cirq-superstaq/cirq_superstaq/service.py b/cirq-superstaq/cirq_superstaq/service.py
@@ -562,7 +562,7 @@ def aqt_compile(
     def qscout_compile(
         self,
         circuits: cirq.Circuit | Sequence[cirq.Circuit],
-        target: str = "sandia_qscout_qpu",
+        target: str = "qscout_peregrine_qpu",
         *,
         mirror_swaps: bool = False,
         base_entangling_gate: str = "xx",
@@ -608,11 +608,11 @@ def qscout_compile(
 
         Raises:
             ValueError: If `base_entangling_gate` is not a valid gate option.
-            ValueError: If `target` is not a valid Sandia target.
+            ValueError: If `target` is not a valid QSCOUT target.
         """
         target = self._resolve_target(target)
-        if not target.startswith("sandia_"):
-            raise ValueError(f"{target!r} is not a valid Sandia target.")
+        if not target.startswith("qscout_"):
+            raise ValueError(f"{target!r} is not a valid QSCOUT target.")
 
         base_entangling_gate = base_entangling_gate.lower()
         if base_entangling_gate not in ("xx", "zz", "sxx", "szz"):
@@ -761,7 +761,7 @@ def compile(
 
         if target.startswith("aqt_"):
             return self.aqt_compile(circuits, **kwargs)
-        elif target.startswith("sandia_"):
+        elif target.startswith("qscout_"):
             return self.qscout_compile(circuits, **kwargs)
 
         request_json = self._get_compile_request_json(circuits, target, **kwargs)

diff --git a/cirq-superstaq/cirq_superstaq/service_test.py b/cirq-superstaq/cirq_superstaq/service_test.py
@@ -423,7 +423,7 @@ def test_service_qscout_compile_single(mock_qscout_compile: mock.MagicMock) -> N
 
     service = css.Service(api_key="key", remote_host="http://example.com")
     out = service.qscout_compile(circuit, test_options="yes")
-    alt_out = service.compile(circuit, target="sandia_qscout_qpu", test_options="yes")
+    alt_out = service.compile(circuit, target="qscout_peregrine_qpu", test_options="yes")
     assert out.circuit == circuit
     assert out.final_logical_to_physical == final_logical_to_physical
     assert out.initial_logical_to_physical == initial_logical_to_physical
@@ -434,7 +434,7 @@ def test_service_qscout_compile_single(mock_qscout_compile: mock.MagicMock) -> N
     assert alt_out.final_logical_to_physical == final_logical_to_physical
     assert alt_out.jaqal_program == jaqal_program
 
-    with pytest.raises(ValueError, match="'ss_example_qpu' is not a valid Sandia target."):
+    with pytest.raises(ValueError, match="'ss_example_qpu' is not a valid QSCOUT target."):
         service.qscout_compile(cirq.Circuit(), target="ss_example_qpu")
 
 

diff --git a/docs/source/get_started/access_info/access_info_css.ipynb b/docs/source/get_started/access_info/access_info_css.ipynb
@@ -152,7 +152,7 @@
        " Target(target='qtm_h1-1e_simulator', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
        " Target(target='qtm_h2-1_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
        " Target(target='rigetti_aspen-m-3_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=False, retired=False),\n",
-       " Target(target='sandia_qscout_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
+       " Target(target='qscout_peregrine_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
        " Target(target='ss_unconstrained_simulator', supports_submit=True, supports_submit_qubo=True, supports_compile=True, available=True, retired=False)]"
       ]
      },

diff --git a/docs/source/get_started/access_info/access_info_qss.ipynb b/docs/source/get_started/access_info/access_info_qss.ipynb
@@ -152,7 +152,7 @@
         " Target(target='qtm_h1-1e_simulator', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
         " Target(target='qtm_h2-1_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
         " Target(target='rigetti_aspen-m-3_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=False, retired=False),\n",
-        " Target(target='sandia_qscout_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
+        " Target(target='qscout_peregrine_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
         " Target(target='ss_unconstrained_simulator', supports_submit=True, supports_submit_qubo=True, supports_compile=True, available=True, retired=False)]"
        ]
      },

diff --git a/docs/source/optimizations/qscout/qscout_css.ipynb b/docs/source/optimizations/qscout/qscout_css.ipynb
@@ -749,7 +749,7 @@
     "\n",
     "# Get qscout backend from service provider\n",
     "job = service.create_job(\n",
-    "    qc, repetitions=100, target=\"sandia_qscout_qpu\", method=\"dry-run\"\n",
+    "    qc, repetitions=100, target=\"qscout_peregrine_qpu\", method=\"dry-run\"\n",
     ")  # specify \"dry-run\" as the method to run Superstaq simulation\n",
     "\n",
     "# Get the counts from the measurement\n",

diff --git a/docs/source/optimizations/qscout/qscout_qss.ipynb b/docs/source/optimizations/qscout/qscout_qss.ipynb
@@ -754,7 +754,7 @@
     "qc.measure(1, 1)\n",
     "\n",
     "# Get qscout backend from provider\n",
-    "backend = provider.get_backend(\"sandia_qscout_qpu\")\n",
+    "backend = provider.get_backend(\"qscout_peregrine_qpu\")\n",
     "\n",
     "job = backend.run(\n",
     "    qc, shots=100, method=\"dry-run\"\n",

diff --git a/general-superstaq/general_superstaq/testing.py b/general-superstaq/general_superstaq/testing.py
@@ -225,7 +225,7 @@
         "available": False,
         "retired": False,
     },
-    "sandia_qscout_qpu": {
+    "qscout_peregrine_qpu": {
         "supports_submit": False,
         "supports_submit_qubo": False,
         "supports_compile": True,

diff --git a/general-superstaq/general_superstaq/validation.py b/general-superstaq/general_superstaq/validation.py
@@ -46,7 +46,7 @@ def validate_target(target: str) -> None:
         "oxford",
         "quera",
         "rigetti",
-        "sandia",
+        "qscout",
         "ss",
         "toshiba",
     ]

diff --git a/qiskit-superstaq/examples/qscout_tutorial.ipynb b/qiskit-superstaq/examples/qscout_tutorial.ipynb
@@ -608,7 +608,7 @@
    ],
    "source": [
     "superstaq = qss.superstaq_provider.SuperstaqProvider()\n",
-    "backend = superstaq.get_backend(\"sandia_qscout_qpu\")\n",
+    "backend = superstaq.get_backend(\"qscout_peregrine_qpu\")\n",
     "qc = qiskit.QuantumCircuit(2, 2)\n",
     "qc.h(0)\n",
     "qc.cx(0, 1)\n",

diff --git a/qiskit-superstaq/qiskit_superstaq/superstaq_backend.py b/qiskit-superstaq/qiskit_superstaq/superstaq_backend.py
@@ -168,7 +168,7 @@ def compile(
         elif self.name().startswith("aqt_"):
             return self.aqt_compile(circuits, **kwargs)
 
-        elif self.name().startswith("sandia_"):
+        elif self.name().startswith("qscout_"):
             return self.qscout_compile(circuits, **kwargs)
 
         elif self.name().startswith("cq_"):
@@ -340,11 +340,11 @@ def qscout_compile(
             `.jaqal_program(s)` attribute contains the corresponding Jaqal program(s).
 
         Raises:
-            ValueError: If this is not a Sandia backend.
+            ValueError: If this is not a QSCOUT backend.
             ValueError: If `base_entangling_gate` is not a valid entangling basis.
         """
-        if not self.name().startswith("sandia_"):
-            raise ValueError(f"{self.name()!r} is not a valid Sandia target.")
+        if not self.name().startswith("qscout_"):
+            raise ValueError(f"{self.name()!r} is not a valid QSCOUT target.")
 
         base_entangling_gate = base_entangling_gate.lower()
         if base_entangling_gate not in ("xx", "zz", "sxx", "szz"):

diff --git a/qiskit-superstaq/qiskit_superstaq/superstaq_backend_test.py b/qiskit-superstaq/qiskit_superstaq/superstaq_backend_test.py
@@ -175,7 +175,7 @@ def test_aqt_compile(mock_post: MagicMock) -> None:
     with pytest.raises(ValueError, match="'aqt_keysight_qpu' is not a valid IBMQ target."):
         backend.ibmq_compile([qc])
 
-    with pytest.raises(ValueError, match="'aqt_keysight_qpu' is not a valid Sandia target."):
+    with pytest.raises(ValueError, match="'aqt_keysight_qpu' is not a valid QSCOUT target."):
         backend.qscout_compile([qc])
 
     with pytest.raises(ValueError, match="'aqt_keysight_qpu' is not a valid CQ target."):
@@ -252,7 +252,7 @@ def test_ibmq_compile(mock_post: MagicMock) -> None:
 def test_qscout_compile(
     mock_post: MagicMock, fake_superstaq_provider: MockSuperstaqProvider
 ) -> None:
-    backend = fake_superstaq_provider.get_backend("sandia_qscout_qpu")
+    backend = fake_superstaq_provider.get_backend("qscout_peregrine_qpu")
 
     qc = qiskit.QuantumCircuit(1)
     qc.h(0)

diff --git a/qiskit-superstaq/qiskit_superstaq/superstaq_provider.py b/qiskit-superstaq/qiskit_superstaq/superstaq_provider.py
@@ -329,7 +329,7 @@ def ibmq_compile(
     def qscout_compile(
         self,
         circuits: qiskit.QuantumCircuit | Sequence[qiskit.QuantumCircuit],
-        target: str = "sandia_qscout_qpu",
+        target: str = "qscout_peregrine_qpu",
         *,
         mirror_swaps: bool = False,
         base_entangling_gate: str = "xx",
@@ -374,11 +374,11 @@ def qscout_compile(
             `.jaqal_program(s)` attribute contains the corresponding Jaqal program(s).
 
         Raises:
-            ValueError: If `target` is not a valid Sandia target.
+            ValueError: If `target` is not a valid QSCOUT target.
             ValueError: If `base_entangling_gate` is not a valid gate option.
         """
-        if not target.startswith("sandia_"):
-            raise ValueError(f"{target!r} is not a valid Sandia target.")
+        if not target.startswith("qscout_"):
+            raise ValueError(f"{target!r} is not a valid QSCOUT target.")
 
         return self.get_backend(target).qscout_compile(
             circuits,

diff --git a/qiskit-superstaq/qiskit_superstaq/superstaq_provider_test.py b/qiskit-superstaq/qiskit_superstaq/superstaq_provider_test.py
@@ -294,7 +294,7 @@ def test_qscout_compile(
 
 
 def test_invalid_target_qscout_compile(fake_superstaq_provider: MockSuperstaqProvider) -> None:
-    with pytest.raises(ValueError, match="'ss_example_qpu' is not a valid Sandia target."):
+    with pytest.raises(ValueError, match="'ss_example_qpu' is not a valid QSCOUT target."):
         fake_superstaq_provider.qscout_compile(qiskit.QuantumCircuit(), target="ss_example_qpu")
 
 

diff --git a/supermarq-benchmarks/examples/Supermarq_HPCA_Tutorial_css.ipynb b/supermarq-benchmarks/examples/Supermarq_HPCA_Tutorial_css.ipynb
@@ -129,7 +129,7 @@
          " Target(target='qtm_h1-1_qpu', supports_submit=True, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
          " Target(target='qtm_h1-1e_simulator', supports_submit=True, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
          " Target(target='qtm_h2-1_qpu', supports_submit=True, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
-         " Target(target='sandia_qscout_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
+         " Target(target='qscout_peregrine_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
          " Target(target='ss_unconstrained_simulator', supports_submit=True, supports_submit_qubo=True, supports_compile=True, available=True, retired=False)]"
         ]
        },

diff --git a/supermarq-benchmarks/examples/Supermarq_HPCA_Tutorial_qss.ipynb b/supermarq-benchmarks/examples/Supermarq_HPCA_Tutorial_qss.ipynb
@@ -131,7 +131,7 @@
        " Target(target='qtm_h1-1_qpu', supports_submit=True, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
        " Target(target='qtm_h1-1e_simulator', supports_submit=True, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
        " Target(target='qtm_h2-1_qpu', supports_submit=True, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
-       " Target(target='sandia_qscout_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
+       " Target(target='qscout_peregrine_qpu', supports_submit=False, supports_submit_qubo=False, supports_compile=True, available=True, retired=False),\n",
        " Target(target='ss_unconstrained_simulator', supports_submit=True, supports_submit_qubo=True, supports_compile=True, available=True, retired=False),\n"
       ]
      },