Merge branch 'main' of github.com:Qiskit/qiskit-terra into remove/121…

…45/1

.mergify.yml

@@ -6,4 +6,4 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - stable/1.2
+          - stable/1.3

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "1.3.0"
+version = "2.0.0"
 edition = "2021"
 rust-version = "1.70"  # Keep in sync with README.md and rust-toolchain.toml.
 license = "Apache-2.0"

crates/accelerate/Cargo.toml

@@ -26,6 +26,7 @@ qiskit-circuit.workspace = true
 thiserror.workspace = true
 ndarray_einsum_beta = "0.7"
 once_cell = "1.20.2"
+rustiq-core = "0.0.10"
 bytemuck.workspace = true
 
 [dependencies.smallvec]

crates/accelerate/src/circuit_library/blocks.rs

@@ -0,0 +1,173 @@
+// This code is part of Qiskit.
+//
+// (C) Copyright IBM 2024
+//
+// This code is licensed under the Apache License, Version 2.0. You may
+// obtain a copy of this license in the LICENSE.txt file in the root directory
+// of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+//
+// Any modifications or derivative works of this code must retain this
+// copyright notice, and modified files need to carry a notice indicating
+// that they have been altered from the originals.
+
+use pyo3::{
+    prelude::*,
+    types::{PyList, PyTuple},
+};
+use qiskit_circuit::{
+    circuit_instruction::OperationFromPython,
+    operations::{Operation, Param, StandardGate},
+    packed_instruction::PackedOperation,
+};
+use smallvec::SmallVec;
+
+use crate::{circuit_library::entanglement::get_entanglement, QiskitError};
+
+#[derive(Debug, Clone)]
+pub enum BlockOperation {
+    Standard { gate: StandardGate },
+    PyCustom { builder: Py<PyAny> },
+}
+
+impl BlockOperation {
+    pub fn assign_parameters(
+        &self,
+        py: Python,
+        params: &[&Param],
+    ) -> PyResult<(PackedOperation, SmallVec<[Param; 3]>)> {
+        match self {
+            Self::Standard { gate } => Ok((
+                (*gate).into(),
+                SmallVec::from_iter(params.iter().map(|&p| p.clone())),
+            )),
+            Self::PyCustom { builder } => {
+                // the builder returns a Python operation plus the bound parameters
+                let py_params =
+                    PyList::new_bound(py, params.iter().map(|&p| p.clone().into_py(py))).into_any();
+
+                let job = builder.call1(py, (py_params,))?;
+                let result = job.downcast_bound::<PyTuple>(py)?;
+
+                let operation: OperationFromPython = result.get_item(0)?.extract()?;
+                let bound_params = result
+                    .get_item(1)?
+                    .iter()?
+                    .map(|ob| Param::extract_no_coerce(&ob?))
+                    .collect::<PyResult<SmallVec<[Param; 3]>>>()?;
+
+                Ok((operation.operation, bound_params))
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+#[pyclass]
+pub struct Block {
+    pub operation: BlockOperation,
+    pub num_qubits: u32,
+    pub num_parameters: usize,
+}
+
+#[pymethods]
+impl Block {
+    #[staticmethod]
+    #[pyo3(signature = (gate,))]
+    pub fn from_standard_gate(gate: StandardGate) -> Self {
+        Block {
+            operation: BlockOperation::Standard { gate },
+            num_qubits: gate.num_qubits(),
+            num_parameters: gate.num_params() as usize,
+        }
+    }
+
+    #[staticmethod]
+    #[pyo3(signature = (num_qubits, num_parameters, builder,))]
+    pub fn from_callable(
+        py: Python,
+        num_qubits: i64,
+        num_parameters: i64,
+        builder: &Bound<PyAny>,
+    ) -> PyResult<Self> {
+        if !builder.is_callable() {
+            return Err(QiskitError::new_err(
+                "builder must be a callable: parameters->(bound gate, bound gate params)",
+            ));
+        }
+        let block = Block {
+            operation: BlockOperation::PyCustom {
+                builder: builder.to_object(py),
+            },
+            num_qubits: num_qubits as u32,
+            num_parameters: num_parameters as usize,
+        };
+
+        Ok(block)
+    }
+}
+
+// We introduce typedefs to make the types more legible. We can understand the hierarchy
+// as follows:
+// Connection: Vec<u32> -- indices that the multi-qubit gate acts on
+// BlockEntanglement: Vec<Connection> -- entanglement for single block
+// LayerEntanglement: Vec<BlockEntanglement> -- entanglements for all blocks in the layer
+// Entanglement: Vec<LayerEntanglement> -- entanglement for every layer
+type BlockEntanglement = Vec<Vec<u32>>;
+pub(super) type LayerEntanglement = Vec<BlockEntanglement>;
+
+/// Represent the entanglement in an n-local circuit.
+pub struct Entanglement {
+    // Possible optimization in future: This eagerly expands the full entanglement for every layer.
+    // This could be done more efficiently, e.g., by creating entanglement objects that store
+    // their underlying representation (e.g. a string or a list of connections) and returning
+    // these when given a layer-index.
+    entanglement_vec: Vec<LayerEntanglement>,
+}
+
+impl Entanglement {
+    /// Create an entanglement from the input of an n_local circuit.
+    pub fn from_py(
+        num_qubits: u32,
+        reps: usize,
+        entanglement: &Bound<PyAny>,
+        entanglement_blocks: &[&Block],
+    ) -> PyResult<Self> {
+        let entanglement_vec = (0..reps)
+            .map(|layer| -> PyResult<LayerEntanglement> {
+                if entanglement.is_callable() {
+                    let as_any = entanglement.call1((layer,))?;
+                    let as_list = as_any.downcast::<PyList>()?;
+                    unpack_entanglement(num_qubits, layer, as_list, entanglement_blocks)
+                } else {
+                    let as_list = entanglement.downcast::<PyList>()?;
+                    unpack_entanglement(num_qubits, layer, as_list, entanglement_blocks)
+                }
+            })
+            .collect::<PyResult<_>>()?;
+
+        Ok(Self { entanglement_vec })
+    }
+
+    pub fn get_layer(&self, layer: usize) -> &LayerEntanglement {
+        &self.entanglement_vec[layer]
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &LayerEntanglement> {
+        self.entanglement_vec.iter()
+    }
+}
+
+fn unpack_entanglement(
+    num_qubits: u32,
+    layer: usize,
+    entanglement: &Bound<PyList>,
+    entanglement_blocks: &[&Block],
+) -> PyResult<LayerEntanglement> {
+    entanglement_blocks
+        .iter()
+        .zip(entanglement.iter())
+        .map(|(block, ent)| -> PyResult<Vec<Vec<u32>>> {
+            get_entanglement(num_qubits, block.num_qubits, &ent, layer)?.collect()
+        })
+        .collect()
+}

crates/accelerate/src/circuit_library/entanglement.rs

@@ -14,7 +14,7 @@ use itertools::Itertools;
 use pyo3::prelude::*;
 use pyo3::types::PyDict;
 use pyo3::{
-    types::{PyAnyMethods, PyInt, PyList, PyListMethods, PyString, PyTuple},
+    types::{PyAnyMethods, PyList, PyListMethods, PyString, PyTuple},
     Bound, PyAny, PyResult,
 };
 
@@ -194,12 +194,7 @@ fn _check_entanglement_list<'a>(
     block_size: u32,
 ) -> PyResult<Box<dyn Iterator<Item = PyResult<Vec<u32>>> + 'a>> {
     let entanglement_iter = list.iter().map(move |el| {
-        let connections = el
-            .downcast::<PyTuple>()?
-            // .expect("Entanglement must be list of tuples") // clearer error message than `?`
-            .iter()
-            .map(|index| index.downcast::<PyInt>()?.extract())
-            .collect::<Result<Vec<u32>, _>>()?;
+        let connections: Vec<u32> = el.extract()?;
 
         if connections.len() != block_size as usize {
             return Err(QiskitError::new_err(format!(

crates/accelerate/src/circuit_library/mod.rs

@@ -12,8 +12,11 @@
 
 use pyo3::prelude::*;
 
+mod blocks;
 mod entanglement;
 mod iqp;
+mod multi_local;
+mod parameter_ledger;
 mod pauli_evolution;
 mod pauli_feature_map;
 mod quantum_volume;
@@ -25,5 +28,8 @@ pub fn circuit_library(m: &Bound<PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(iqp::py_iqp))?;
     m.add_wrapped(wrap_pyfunction!(iqp::py_random_iqp))?;
     m.add_wrapped(wrap_pyfunction!(quantum_volume::quantum_volume))?;
+    m.add_wrapped(wrap_pyfunction!(multi_local::py_n_local))?;
+    m.add_class::<blocks::Block>()?;
+
     Ok(())
 }