Skip to content

Commit

Permalink
Merge branch 'main' into avoid-operation-creation
Browse files Browse the repository at this point in the history
  • Loading branch information
mtreinish authored Jul 31, 2024
2 parents f3a10a2 + 4b056a7 commit ea676ca
Show file tree
Hide file tree
Showing 154 changed files with 5,284 additions and 1,111 deletions.
5 changes: 3 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ license = "Apache-2.0"
bytemuck = "1.16"
indexmap.version = "2.2.6"
hashbrown.version = "0.14.0"
num-bigint = "0.4"
num-complex = "0.4"
ndarray = "^0.15.6"
numpy = "0.21.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/accelerate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rand_distr = "0.4.3"
ahash = "0.8.11"
num-traits = "0.2"
num-complex.workspace = true
num-bigint = "0.4"
num-bigint.workspace = true
rustworkx-core = "0.15"
faer = "0.19.1"
itertools = "0.13.0"
Expand Down
1 change: 1 addition & 0 deletions crates/accelerate/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ pub mod results;
pub mod sabre;
pub mod sampled_exp_val;
pub mod sparse_pauli_op;
pub mod star_prerouting;
pub mod stochastic_swap;
pub mod synthesis;
pub mod target_transpiler;
Expand Down
284 changes: 284 additions & 0 deletions crates/accelerate/src/sabre/heuristic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
// 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::exceptions::PyValueError;
use pyo3::prelude::*;
use pyo3::types::PyString;
use pyo3::Python;

/// Affect the dynamic scaling of the weight of node-set-based heuristics (basic and lookahead).
#[pyclass]
#[pyo3(module = "qiskit._accelerate.sabre", frozen)]
#[derive(Clone, Copy, PartialEq, Eq)]
pub enum SetScaling {
/// No dynamic scaling of the weight.
Constant,
/// Scale the weight by the current number of nodes in the set (e.g., if it contains 5 nodes,
/// the weight will be multiplied by ``0.2``).
Size,
}
#[pymethods]
impl SetScaling {
pub fn __reduce__(&self, py: Python) -> PyResult<Py<PyAny>> {
let name = match self {
SetScaling::Constant => "Constant",
SetScaling::Size => "Size",
};
Ok((
py.import_bound("builtins")?.getattr("getattr")?,
(py.get_type_bound::<Self>(), name),
)
.into_py(py))
}
}

/// Define the characteristics of the basic heuristic. This is a simple sum of the physical
/// distances of every gate in the front layer.
#[pyclass]
#[pyo3(module = "qiskit._accelerate.sabre", frozen)]
#[derive(Clone, Copy, PartialEq)]
pub struct BasicHeuristic {
/// The relative weighting of this heuristic to others. Typically you should just set this to
/// 1.0 and define everything else in terms of this.
pub weight: f64,
/// Set the dynamic scaling of the weight based on the layer it is applying to.
pub scale: SetScaling,
}
#[pymethods]
impl BasicHeuristic {
#[new]
pub fn new(weight: f64, scale: SetScaling) -> Self {
Self { weight, scale }
}

pub fn __getnewargs__(&self, py: Python) -> Py<PyAny> {
(self.weight, self.scale).into_py(py)
}

pub fn __eq__(&self, py: Python, other: Py<PyAny>) -> bool {
if let Ok(other) = other.extract::<Self>(py) {
self == &other
} else {
false
}
}

pub fn __repr__(&self, py: Python) -> PyResult<Py<PyAny>> {
let fmt = "BasicHeuristic(weight={!r}, scale={!r})";
Ok(PyString::new_bound(py, fmt)
.call_method1("format", (self.weight, self.scale))?
.into_py(py))
}
}

/// Define the characteristics of the lookahead heuristic. This is a sum of the physical distances
/// of every gate in the lookahead set, which is gates immediately after the front layer.
#[pyclass]
#[pyo3(module = "qiskit._accelerate.sabre", frozen)]
#[derive(Clone, Copy, PartialEq)]
pub struct LookaheadHeuristic {
/// The relative weight of this heuristic. Typically this is defined relative to the
/// :class:`.BasicHeuristic`, which generally has its weight set to 1.0.
pub weight: f64,
/// Number of gates to consider in the heuristic.
pub size: usize,
/// Dynamic scaling of the heuristic weight depending on the lookahead set.
pub scale: SetScaling,
}
#[pymethods]
impl LookaheadHeuristic {
#[new]
pub fn new(weight: f64, size: usize, scale: SetScaling) -> Self {
Self {
weight,
size,
scale,
}
}

pub fn __getnewargs__(&self, py: Python) -> Py<PyAny> {
(self.weight, self.size, self.scale).into_py(py)
}

pub fn __eq__(&self, py: Python, other: Py<PyAny>) -> bool {
if let Ok(other) = other.extract::<Self>(py) {
self == &other
} else {
false
}
}

pub fn __repr__(&self, py: Python) -> PyResult<Py<PyAny>> {
let fmt = "LookaheadHeuristic(weight={!r}, size={!r}, scale={!r})";
Ok(PyString::new_bound(py, fmt)
.call_method1("format", (self.weight, self.size, self.scale))?
.into_py(py))
}
}

/// Define the characteristics of the "decay" heuristic. In this, each physical qubit has a
/// multiplier associated with it, beginning at 1.0, and has :attr:`increment` added to it each time
/// the qubit is involved in a swap. The final heuristic is calculated by multiplying all other
/// components by the maximum multiplier involved in a given swap.
#[pyclass]
#[pyo3(module = "qiskit._accelerate.sabre", frozen)]
#[derive(Clone, Copy, PartialEq)]
pub struct DecayHeuristic {
/// The amount to add onto the multiplier of a physical qubit when it is used.
pub increment: f64,
/// How frequently (in terms of swaps in the layer) to reset all qubit multipliers back to 1.0.
pub reset: usize,
}
#[pymethods]
impl DecayHeuristic {
#[new]
pub fn new(increment: f64, reset: usize) -> Self {
Self { increment, reset }
}

pub fn __getnewargs__(&self, py: Python) -> Py<PyAny> {
(self.increment, self.reset).into_py(py)
}

pub fn __eq__(&self, py: Python, other: Py<PyAny>) -> bool {
if let Ok(other) = other.extract::<Self>(py) {
self == &other
} else {
false
}
}

pub fn __repr__(&self, py: Python) -> PyResult<Py<PyAny>> {
let fmt = "DecayHeuristic(increment={!r}, reset={!r})";
Ok(PyString::new_bound(py, fmt)
.call_method1("format", (self.increment, self.reset))?
.into_py(py))
}
}

/// A complete description of the heuristic that Sabre will use. See the individual elements for a
/// greater description.
#[pyclass]
#[pyo3(module = "qiskit._accelerate.sabre", frozen)]
#[derive(Clone, PartialEq)]
pub struct Heuristic {
pub basic: Option<BasicHeuristic>,
pub lookahead: Option<LookaheadHeuristic>,
pub decay: Option<DecayHeuristic>,
pub best_epsilon: f64,
pub attempt_limit: usize,
}

#[pymethods]
impl Heuristic {
/// Construct a new Sabre heuristic. This can either be made directly of the desired
/// components, or you can make an empty heuristic and use the ``with_*`` methods to add
/// components to it.
///
/// Args:
/// attempt_limit (int): the maximum number of swaps to attempt before using a fallback
/// "escape" mechanism to forcibly route a gate. Set this to ``None`` to entirely
/// disable the mechanism, but beware that it's possible (on large coupling maps with a
/// lookahead heuristic component) for Sabre to get stuck in an inescapable arbitrarily
/// deep local minimum of the heuristic. If this happens, and the escape mechanism is
/// disabled entirely, Sabre will enter an infinite loop.
/// best_epsilon (float): the floating-point epsilon to use when comparing scores to find
/// the best value.
#[new]
#[pyo3(signature = (basic=None, lookahead=None, decay=None, attempt_limit=1000, best_epsilon=1e-10))]
pub fn new(
basic: Option<BasicHeuristic>,
lookahead: Option<LookaheadHeuristic>,
decay: Option<DecayHeuristic>,
attempt_limit: Option<usize>,
best_epsilon: f64,
) -> Self {
Self {
basic,
lookahead,
decay,
best_epsilon,
attempt_limit: attempt_limit.unwrap_or(usize::MAX),
}
}

pub fn __getnewargs__(&self, py: Python) -> Py<PyAny> {
(
self.basic,
self.lookahead,
self.decay,
self.attempt_limit,
self.best_epsilon,
)
.into_py(py)
}

/// Set the weight of the ``basic`` heuristic (the sum of distances of gates in the front
/// layer). This is often set to ``1.0``. You almost certainly should enable this part of the
/// heuristic, or it's highly unlikely that Sabre will be able to make any progress.
pub fn with_basic(&self, weight: f64, scale: SetScaling) -> Self {
Self {
basic: Some(BasicHeuristic { weight, scale }),
..self.clone()
}
}

/// Set the weight and extended-set size of the ``lookahead`` heuristic. The weight here
/// should typically be less than that of ``basic``.
pub fn with_lookahead(&self, weight: f64, size: usize, scale: SetScaling) -> Self {
Self {
lookahead: Some(LookaheadHeuristic {
weight,
size,
scale,
}),
..self.clone()
}
}

/// Set the multiplier increment and reset interval of the decay heuristic. The reset interval
/// must be non-zero.
pub fn with_decay(&self, increment: f64, reset: usize) -> PyResult<Self> {
if reset == 0 {
Err(PyValueError::new_err("decay reset interval cannot be zero"))
} else {
Ok(Self {
decay: Some(DecayHeuristic { increment, reset }),
..self.clone()
})
}
}

pub fn __eq__(&self, py: Python, other: Py<PyAny>) -> bool {
if let Ok(other) = other.extract::<Self>(py) {
self == &other
} else {
false
}
}

pub fn __repr__(&self, py: Python) -> PyResult<Py<PyAny>> {
let fmt = "Heuristic(basic={!r}, lookahead={!r}, decay={!r}, attempt_limit={!r}, best_epsilon={!r})";
Ok(PyString::new_bound(py, fmt)
.call_method1(
"format",
(
self.basic,
self.lookahead,
self.decay,
self.attempt_limit,
self.best_epsilon,
),
)?
.into_py(py))
}
}
Loading

0 comments on commit ea676ca

Please sign in to comment.