Merge remote-tracking branch 'origin/main' into layout_and_route_disjoint_coupling_maps

Author: mtreinish

.azure/lint-linux.yml

@@ -21,10 +21,11 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/bin/activate
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -U -c constraints.txt -e .
-          pip install -U "qiskit-aer" -c constraints.txt
-          pip install -e .
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            -e .
         displayName: 'Install dependencies'
         env:
           SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"

.azure/test-linux.yml

@@ -60,27 +60,37 @@ jobs:
             # Use stable Rust, rather than MSRV, to spot-check that stable builds properly.
             rustup override set stable
             source test-job/bin/activate
-            pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
             # Install setuptools-rust for building sdist
             pip install -U -c constraints.txt setuptools-rust
             python setup.py sdist
-            pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz
+            pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              -r requirements-dev.txt \
+              dist/qiskit-terra*.tar.gz
           displayName: "Install Terra from sdist"
 
       - ${{ if eq(parameters.installFromSdist, false) }}:
         - bash: |
             set -e
             source test-job/bin/activate
-            pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-            pip install -U -c constraints.txt -e .
+            pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              -r requirements-dev.txt \
+              -e .
           displayName: "Install Terra directly"
           env:
             SETUPTOOLS_ENABLE_FEATURES: "legacy-editable"
 
       - bash: |
           set -e
           source test-job/bin/activate
-          pip install -U "cplex;python_version < '3.11'" "qiskit-aer" "z3-solver" -c constraints.txt
+          pip install -U \
+            -c constraints.txt \
+            "cplex;python_version < '3.11'" \
+            "qiskit-aer" \
+            "z3-solver"
           mkdir -p /tmp/terra-tests
           cp -r test /tmp/terra-tests/.
           cp .stestr.conf /tmp/terra-tests/.
@@ -162,8 +172,10 @@ jobs:
         - bash: |
             set -e
             virtualenv image_tests
-            image_tests/bin/pip install -U -r requirements.txt -c constraints.txt
-            image_tests/bin/pip install -U -c constraints.txt -e ".[visualization]"
+            image_tests/bin/pip install -U \
+              -c constraints.txt \
+              -r requirements.txt \
+              -e ".[visualization]"
             sudo apt-get update
             sudo apt-get install -y graphviz pandoc
             image_tests/bin/pip check

.azure/test-macos.yml

@@ -34,8 +34,11 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/bin/activate
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -U -c constraints.txt -e .
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            -e .
           pip check
         displayName: 'Install dependencies'
         env:

.azure/test-windows.yml

@@ -33,9 +33,12 @@ jobs:
           python -m pip install --upgrade pip setuptools wheel virtualenv
           virtualenv test-job
           source test-job/Scripts/activate
-          pip install -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -c constraints.txt -e .
-          pip install "z3-solver" -c constraints.txt
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            "z3-solver" \
+            -e .
           pip check
         displayName: 'Install dependencies'
         env:

.azure/tutorials-linux.yml

@@ -22,9 +22,20 @@ jobs:
           set -e
           git clone https://github.com/Qiskit/qiskit-tutorials --depth=1
           python -m pip install --upgrade pip
-          pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
-          pip install -c constraints.txt -e .
-          pip install "qiskit-ibmq-provider" "qiskit-aer" "z3-solver" "networkx" "matplotlib>=3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt
+          pip install -U \
+            -c constraints.txt \
+            -r requirements.txt \
+            -r requirements-dev.txt \
+            "qiskit-ibmq-provider" \
+            "qiskit-aer" \
+            "z3-solver" \
+            "networkx" \
+            "matplotlib>=3.3.0" \
+            sphinx \
+            nbsphinx \
+            sphinx_rtd_theme \
+            cvxpy \
+            -e .
           sudo apt-get update
           sudo apt-get install -y graphviz pandoc
           pip check

.mergify.yml

@@ -1,19 +1,5 @@
-queue_rules:
-  - name: automerge
-    conditions:
-      - check-success=Qiskit.qiskit-terra
-
+---
 pull_request_rules:
-  - name: automatic merge on CI success and review
-    conditions:
-      - check-success=Qiskit.qiskit-terra
-      - "#approved-reviews-by>=1"
-      - label=automerge
-      - label!=on hold
-    actions:
-      queue:
-        name: automerge
-        method: squash
   - name: backport
     conditions:
       - label=stable backport potential

azure-pipelines.yml

@@ -8,6 +8,7 @@ trigger:
     include:
       - 'main'
       - 'stable/*'
+      - 'gh-readonly-queue/*'
   tags:
     include:
       - '*'
@@ -126,8 +127,10 @@ stages:
                 id: 7864
                 comment: Nightly test job failed at commit $(Build.SourceVersion).  View the logs at $(System.TeamFoundationCollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId).
 
-  # Full PR suite.
-  - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+  # Full PR suite.  This also needs to apply to the merge queue, which appears
+  # as a push event.  The queue won't get cron triggered because the schedule
+  # trigger doesn't have it as a target.
+  - ${{ if or(eq(variables['Build.Reason'], 'PullRequest'), contains(variables['Build.SourceBranch'], 'gh-readonly-queue')) }}:
     # The preliminary stage should be small in both total runtime (including
     # provisioning) and resources required.  About half of PR commits result in
     # a CI failure, and over 90% of these are in linting, documention or a test
@@ -188,9 +191,9 @@ stages:
           parameters:
             pythonVersion: ${{ parameters.maximumPythonVersion }}
 
-  # Push to main or the stable branches.  The triggering branches are set in the
-  # triggers at the top of this file.
-  - ${{ if and(eq(variables['Build.Reason'], 'IndividualCI'), startsWith(variables['Build.SourceBranch'], 'refs/heads/')) }}:
+  # Push to main or the stable branches.  The triggering branches also need to
+  # be in the triggers at the top of this file.
+  - ${{ if and(eq(variables['Build.Reason'], 'IndividualCI'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/stable/'))) }}:
     - stage: "Push"
       jobs:
         - template: ".azure/test-linux.yml"

crates/accelerate/src/dense_layout.rs

@@ -198,7 +198,6 @@ pub fn best_subset(
             .reduce(reduce_identity_fn, reduce_fn)
     } else {
         (0..coupling_shape[0])
-            .into_iter()
             .map(map_fn)
             .reduce(reduce_fn)
             .unwrap()

crates/accelerate/src/euler_one_qubit_decomposer.rs

@@ -155,7 +155,7 @@ fn circuit_kak(
         // NOTE: The following normalization is safe, because the gphase correction below
         // fixes a particular diagonal entry to 1, which prevents any potential phase
         // slippage coming from _mod_2pi injecting multiples of 2pi.
-        lam = mod_2pi(lam);
+        lam = mod_2pi(lam, atol);
         if lam.abs() > atol {
             circuit.push((String::from(k_gate), vec![lam]));
             global_phase += lam / 2.;
@@ -170,18 +170,18 @@ fn circuit_kak(
         lam -= phi;
         phi = 0.;
     }
-    if mod_2pi(lam + PI).abs() < atol || mod_2pi(phi + PI).abs() < atol {
+    if mod_2pi(lam + PI, atol).abs() < atol || mod_2pi(phi + PI, atol).abs() < atol {
         lam += PI;
         theta = -theta;
         phi += PI;
     }
-    lam = mod_2pi(lam);
+    lam = mod_2pi(lam, atol);
     if lam.abs() > atol {
         global_phase += lam / 2.;
         circuit.push((String::from(k_gate), vec![lam]));
     }
     circuit.push((String::from(a_gate), vec![theta]));
-    phi = mod_2pi(phi);
+    phi = mod_2pi(phi, atol);
     if phi.abs() > atol {
         global_phase += phi / 2.;
         circuit.push((String::from(k_gate), vec![phi]));
@@ -201,12 +201,12 @@ fn circuit_u3(
     atol: Option<f64>,
 ) -> OneQubitGateSequence {
     let mut circuit = Vec::new();
-    let phi = mod_2pi(phi);
-    let lam = mod_2pi(lam);
     let atol = match atol {
         Some(atol) => atol,
         None => DEFAULT_ATOL,
     };
+    let phi = mod_2pi(phi, atol);
+    let lam = mod_2pi(lam, atol);
     if !simplify || theta.abs() > atol || phi.abs() > atol || lam.abs() > atol {
         circuit.push((String::from("u3"), vec![theta, phi, lam]));
     }
@@ -233,14 +233,20 @@ fn circuit_u321(
         atol = -1.0;
     }
     if theta.abs() < atol {
-        let tot = mod_2pi(phi + lam);
+        let tot = mod_2pi(phi + lam, atol);
         if tot.abs() > atol {
             circuit.push((String::from("u1"), vec![tot]));
         }
     } else if (theta - PI / 2.).abs() < atol {
-        circuit.push((String::from("u2"), vec![mod_2pi(phi), mod_2pi(lam)]));
+        circuit.push((
+            String::from("u2"),
+            vec![mod_2pi(phi, atol), mod_2pi(lam, atol)],
+        ));
     } else {
-        circuit.push((String::from("u3"), vec![theta, mod_2pi(phi), mod_2pi(lam)]));
+        circuit.push((
+            String::from("u3"),
+            vec![theta, mod_2pi(phi, atol), mod_2pi(lam, atol)],
+        ));
     }
     OneQubitGateSequence {
         gates: circuit,
@@ -264,8 +270,8 @@ fn circuit_u(
     if !simplify {
         atol = -1.0;
     }
-    let phi = mod_2pi(phi);
-    let lam = mod_2pi(lam);
+    let phi = mod_2pi(phi, atol);
+    let lam = mod_2pi(lam, atol);
     if theta.abs() > atol || phi.abs() > atol || lam.abs() > atol {
         circuit.push((String::from("u"), vec![theta, phi, lam]));
     }
@@ -323,7 +329,7 @@ where
         phi -= lam;
         lam = 0.;
     }
-    if mod_2pi(lam + PI).abs() < atol || mod_2pi(phi).abs() < atol {
+    if mod_2pi(lam + PI, atol).abs() < atol || mod_2pi(phi, atol).abs() < atol {
         lam += PI;
         theta = -theta;
         phi += PI;
@@ -338,7 +344,7 @@ where
     // emit circuit
     pfun(&mut circuit, lam);
     match xpifun {
-        Some(xpifun) if mod_2pi(theta).abs() < atol => xpifun(&mut circuit),
+        Some(xpifun) if mod_2pi(theta, atol).abs() < atol => xpifun(&mut circuit),
         _ => {
             xfun(&mut circuit);
             pfun(&mut circuit, theta);
@@ -372,9 +378,15 @@ fn circuit_rr(
         };
     }
     if (theta - PI).abs() > atol {
-        circuit.push((String::from("r"), vec![theta - PI, mod_2pi(PI / 2. - lam)]));
-    }
-    circuit.push((String::from("r"), vec![PI, mod_2pi(0.5 * (phi - lam + PI))]));
+        circuit.push((
+            String::from("r"),
+            vec![theta - PI, mod_2pi(PI / 2. - lam, atol)],
+        ));
+    }
+    circuit.push((
+        String::from("r"),
+        vec![PI, mod_2pi(0.5 * (phi - lam + PI), atol)],
+    ));
     OneQubitGateSequence {
         gates: circuit,
         global_phase: phase,
@@ -408,7 +420,7 @@ pub fn generate_circuit(
                 inner_atol = -1.0;
             }
             let fnz = |circuit: &mut OneQubitGateSequence, phi: f64| {
-                let phi = mod_2pi(phi);
+                let phi = mod_2pi(phi, inner_atol);
                 if phi.abs() > inner_atol {
                     circuit.gates.push((String::from("p"), vec![phi]));
                 }
@@ -438,7 +450,7 @@ pub fn generate_circuit(
                 inner_atol = -1.0;
             }
             let fnz = |circuit: &mut OneQubitGateSequence, phi: f64| {
-                let phi = mod_2pi(phi);
+                let phi = mod_2pi(phi, inner_atol);
                 if phi.abs() > inner_atol {
                     circuit.gates.push((String::from("rz"), vec![phi]));
                     circuit.global_phase += phi / 2.;
@@ -468,7 +480,7 @@ pub fn generate_circuit(
                 inner_atol = -1.0;
             }
             let fnz = |circuit: &mut OneQubitGateSequence, phi: f64| {
-                let phi = mod_2pi(phi);
+                let phi = mod_2pi(phi, inner_atol);
                 if phi.abs() > inner_atol {
                     circuit.gates.push((String::from("u1"), vec![phi]));
                 }
@@ -498,7 +510,7 @@ pub fn generate_circuit(
                 inner_atol = -1.0;
             }
             let fnz = |circuit: &mut OneQubitGateSequence, phi: f64| {
-                let phi = mod_2pi(phi);
+                let phi = mod_2pi(phi, inner_atol);
                 if phi.abs() > inner_atol {
                     circuit.gates.push((String::from("rz"), vec![phi]));
                     circuit.global_phase += phi / 2.;
@@ -608,11 +620,14 @@ pub fn compute_error_list(
 }
 
 #[pyfunction]
+#[pyo3(signature = (unitary, target_basis_list, qubit, error_map=None, simplify=true, atol=None))]
 pub fn unitary_to_gate_sequence(
     unitary: PyReadonlyArray2<Complex64>,
     target_basis_list: Vec<&str>,
     qubit: usize,
     error_map: Option<&OneQubitGateErrorMap>,
+    simplify: bool,
+    atol: Option<f64>,
 ) -> PyResult<Option<OneQubitGateSequence>> {
     const VALID_BASES: [&str; 12] = [
         "U321", "U3", "U", "PSX", "ZSX", "ZSXX", "U1X", "RR", "ZYZ", "ZXZ", "XYX", "XZX",
@@ -629,7 +644,7 @@ pub fn unitary_to_gate_sequence(
         .iter()
         .map(|target_basis| {
             let [theta, phi, lam, phase] = angles_from_unitary(unitary_mat, target_basis);
-            generate_circuit(target_basis, theta, phi, lam, phase, true, None).unwrap()
+            generate_circuit(target_basis, theta, phi, lam, phase, simplify, atol).unwrap()
         })
         .min_by(|a, b| {
             let error_a = compare_error_fn(a, &error_map, qubit);
@@ -649,12 +664,18 @@ fn complex_phase(x: Complex64) -> f64 {
     x.im.atan2(x.re)
 }
 
+/// Wrap angle into interval [-π,π). If within atol of the endpoint, clamp to -π
 #[inline]
-fn mod_2pi(angle: f64) -> f64 {
+fn mod_2pi(angle: f64, atol: f64) -> f64 {
     // f64::rem_euclid() isn't exactly the same as Python's % operator, but because
     // the RHS here is a constant and positive it is effectively equivalent for
     // this case
-    (angle + PI).rem_euclid(2. * PI) - PI
+    let wrapped = (angle + PI).rem_euclid(2. * PI) - PI;
+    if (wrapped - PI).abs() < atol {
+        -PI
+    } else {
+        wrapped
+    }
 }
 
 fn params_zyz_inner(mat: ArrayView2<Complex64>) -> [f64; 4] {
@@ -722,8 +743,8 @@ fn params_xyx_inner(mat: ArrayView2<Complex64>) -> [f64; 4] {
         ],
     ]);
     let [theta, phi, lam, phase] = params_zyz_inner(mat_zyz.view());
-    let new_phi = mod_2pi(phi + PI);
-    let new_lam = mod_2pi(lam + PI);
+    let new_phi = mod_2pi(phi + PI, 0.);
+    let new_lam = mod_2pi(lam + PI, 0.);
     [
         theta,
         new_phi,