Merge branch 'main' into smaugdela_dev

Author: smaugdela

qiskit_scaleway/backends/base_job.py

@@ -76,10 +76,11 @@ def submit(self, session_id: str) -> None:
  raise RuntimeError(f"Job already submitted (ID: {self._job_id})")
 
  options = self._config.copy()
+ shots = options.pop("shots")
 
  run_data = QaaSJobRunData(
  options={
- "shots": options.pop("shots"),
+ "shots": shots,
  "memory": options.pop("memory", False),
  },
  circuits=list(
@@ -137,6 +138,7 @@ def submit(self, session_id: str) -> None:
  name=self._name,
  session_id=session_id,
  model_id=model.id,
+ parameters={"shots": shots},
  ).id
 
  def result(
@@ -184,7 +186,7 @@ def _extract_payload_from_response(self, job_result: QaaSJobResult) -> str:
  url = job_result.url
 
  if url is not None:
- resp = httpx.get(url.replace("http://s3", "http://localhost"))
+ resp = httpx.get(url)
  resp.raise_for_status()
 
  return resp.text

qiskit_scaleway/backends/iqm/backend.py

@@ -14,6 +14,7 @@
 from qiskit.providers import Options
 
 from qiskit_scaleway.backends import BaseBackend
+from qiskit_scaleway.backends.iqm.move_gate import MoveGate
 from qiskit_scaleway.utils import create_target_from_platform
 
 from scaleway_qaas_client.v1alpha1 import QaaSClient, QaaSPlatform
@@ -30,7 +31,9 @@ def __init__(self, provider, client: QaaSClient, platform: QaaSPlatform):
  self._options = self._default_options()
 
  self._platform = platform
- self._target = create_target_from_platform(self._platform)
+ self._target = create_target_from_platform(
+ self._platform, additional_gates={"move": MoveGate()}
+ )
 
  self._options.max_shots = platform.max_shot_count
  self._options.set_validator("shots", (1, platform.max_shot_count))

qiskit_scaleway/backends/iqm/move_gate.py

@@ -0,0 +1,66 @@
+# Copyright 2024 Qiskit on IQM developers
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""MOVE gate to be used on the IQM Star architecture."""
+
+import numpy as np
+import qiskit.quantum_info as qi
+
+from qiskit.circuit import Gate
+
+# MOVE gate has undefined phases, so we pick two arbitrary phases here
+_phase_1 = np.exp(0.7j)
+_phase_2 = 1.0 # np.exp(1.2j)
+MOVE_GATE_UNITARY = [
+ [1.0, 0.0, 0.0, 0.0],
+ [0.0, 0.0, _phase_1, 0.0],
+ [0.0, _phase_1.conj(), 0.0, 0.0],
+ [0.0, 0.0, 0.0, _phase_2],
+]
+"""Unitary matrix for simulating the ideal MOVE gate.
+
+This matrix is not a realistic description of MOVE, since it applies a zero phase on the moved
+state, and acts as identity in the :math:`|11\rangle` subspace, thus being equal to the SWAP gate."""
+
+
+class MoveGate(Gate):
+ r"""The MOVE operation is a unitary population exchange operation between a qubit and a resonator.
+ Its effect is only defined in the invariant subspace :math:`S = \text{span}\{|00\rangle, |01\rangle, |10\rangle\}`,
+ where it swaps the populations of the states :math:`|01\rangle` and :math:`|10\rangle`.
+ Its effect on the orthogonal subspace is undefined.
+
+ MOVE has the following presentation in the subspace :math:`S`:
+
+ .. math:: \text{MOVE}_S = |00\rangle \langle 00| + a |10\rangle \langle 01| + a^{-1} |01\rangle \langle 10|,
+
+ where :math:`a` is an undefined complex phase that is canceled when the MOVE gate is applied a second time.
+
+ To ensure that the state of the qubit and resonator has no overlap with :math:`|11\rangle`, it is
+ recommended that no single qubit gates are applied to the qubit in between a
+ pair of MOVE operations.
+
+ .. note::
+ The MOVE gate must always be be applied on the qubit and the resonator in the
+ order ``[qubit, resonator]``, regardless of which component is currently holding the state.
+ """
+
+ def __init__(self, label=None): # noqa: ANN001
+ """Initializes the move gate"""
+ super().__init__("move", 2, [], label=label)
+ self.unitary = qi.Operator(MOVE_GATE_UNITARY)
+
+ def _define(self): # noqa: ANN202
+ """This function is purposefully not defined so that that the Qiskit transpiler cannot accidentally
+ decompose the MOVE gate into a sequence of other gates, instead it will throw an error.
+ """
+ return

qiskit_scaleway/utils/target.py

@@ -1,9 +1,10 @@
 from dataclasses import dataclass, field
 from dataclasses_json import dataclass_json
-from typing import List, Optional
+from typing import List, Optional, Dict
 
 from qiskit.transpiler import Target
 from qiskit.circuit.library import get_standard_gate_name_mapping
+from qiskit.circuit import Gate
 
 from scaleway_qaas_client.v1alpha1 import QaaSPlatform
 
@@ -33,7 +34,9 @@ class _PlatformMetadata:
  qiskit: _QiskitClientData
 
 
-def create_target_from_platform(platform: QaaSPlatform) -> Target:
+def create_target_from_platform(
+ platform: QaaSPlatform, additional_gates: Optional[Dict[str, Gate]] = None
+) -> Target:
  target = Target(num_qubits=platform.max_qubit_count)
 
  if not platform.metadata:
@@ -54,6 +57,9 @@ def create_target_from_platform(platform: QaaSPlatform) -> Target:
  for instruction in instructions:
  qiskit_instruction = qiskit_gate_mapping.get(instruction.name)
 
+ if not qiskit_instruction and additional_gates:
+ qiskit_instruction = additional_gates.get(instruction.name)
+
  if not qiskit_instruction:
  raise Exception("could not find instruction:", instruction.name)
 

setup.py

@@ -22,7 +22,7 @@
 
 setup(
  name="qiskit_scaleway",
- version="0.2.10",
+ version="0.2.12",
  project_urls={
  "Documentation": "https://www.scaleway.com/en/quantum-as-a-service/",
  "Source": "https://github.com/scaleway/qiskit-scaleway",