Merge branch 'main' into move-target

raynelfss · May 29, 2024 · 05ddc79 · 05ddc79
2 parents 31cc1f1 + 473c3c2
commit 05ddc79
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 35 deletions.
diff --git a/.github/workflows/miri.yml b/.github/workflows/miri.yml
@@ -14,14 +14,15 @@ jobs:
     name: Miri
     runs-on: ubuntu-latest
     env:
-      RUSTUP_TOOLCHAIN: nightly
+      RUSTUP_TOOLCHAIN: nightly-2024-05-24
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@master
         with:
+          toolchain:  nightly-2024-05-24
           components: miri
 
       - name: Prepare Miri

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/accelerate/Cargo.toml b/crates/accelerate/Cargo.toml
@@ -20,7 +20,7 @@ num-traits = "0.2"
 num-complex = "0.4"
 num-bigint = "0.4"
 rustworkx-core = "0.14"
-faer = "0.18.2"
+faer = "0.19.0"
 itertools = "0.13.0"
 qiskit-circuit.workspace = true
 
@@ -49,9 +49,9 @@ workspace = true
 features = ["rayon"]
 
 [dependencies.faer-ext]
-version = "0.1.0"
+version = "0.2.0"
 features = ["ndarray"]
 
 [dependencies.pulp]
-version = "0.18.12"
+version = "0.18.21"
 features = ["macro"]
diff --git a/crates/accelerate/src/isometry.rs b/crates/accelerate/src/isometry.rs
@@ -212,7 +212,6 @@ fn construct_basis_states(
         } else if i == target_label {
             e2 += 1;
         } else {
-            assert!(j <= 1);
             e1 += state_free[j] as usize;
             e2 += state_free[j] as usize;
             j += 1

diff --git a/releasenotes/notes/fix-isometry-rust-adf0eed09c6611f1.yaml b/releasenotes/notes/fix-isometry-rust-adf0eed09c6611f1.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix a bug in :class:`~.library.Isometry` due to an unnecessary assertion,
+    that led to an error in :meth:`.UnitaryGate.control`
+    when :class:`~.library.UnitaryGate` had more that two qubits.
diff --git a/test/python/circuit/test_controlled_gate.py b/test/python/circuit/test_controlled_gate.py
@@ -852,10 +852,9 @@ def test_controlled_unitary(self, num_ctrl_qubits):
         self.assertTrue(is_unitary_matrix(base_mat))
         self.assertTrue(matrix_equal(cop_mat, test_op.data))
 
-    @data(1, 2, 3, 4, 5)
-    def test_controlled_random_unitary(self, num_ctrl_qubits):
+    @combine(num_ctrl_qubits=(1, 2, 3, 4, 5), num_target=(2, 3))
+    def test_controlled_random_unitary(self, num_ctrl_qubits, num_target):
         """Test the matrix data of an Operator based on a random UnitaryGate."""
-        num_target = 2
         base_gate = random_unitary(2**num_target).to_instruction()
         base_mat = base_gate.to_matrix()
         cgate = base_gate.control(num_ctrl_qubits)