Merge remote-tracking branch 'ibm/main' into fix-qpy-control-_define

qiskit/qpy/binary_io/circuits.py

@@ -953,12 +953,12 @@ def read_circuit(file_obj, version, metadata_deserializer=None):
             qubits = [Qubit() for _ in range(num_qubits - len(circ.qubits))]
             circ.add_bits(qubits)
         if len(circ.clbits) < num_clbits:
-            clbits = [Clbit() for _ in range(num_qubits - len(circ.clbits))]
+            clbits = [Clbit() for _ in range(num_clbits - len(circ.clbits))]
             circ.add_bits(clbits)
     else:
         circ = QuantumCircuit(
-            num_qubits,
-            num_clbits,
+            [Qubit() for _ in [None] * num_qubits],
+            [Clbit() for _ in [None] * num_clbits],
             name=name,
             global_phase=global_phase,
             metadata=metadata,

releasenotes/notes/fix-qpy-loose-bits-5283dc4ad3823ce3.yaml

@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    QPY deserialisation will no longer add extra :class:`.Clbit` instances to the
+    circuit if there are both loose :class:`.Clbit`\ s in the circuit and more
+    :class:`.Qubit`\ s than :class:`.Clbit`\ s.
+  - |
+    QPY deserialisation will no longer add registers named `q` and `c` if the
+    input circuit contained only loose bits.

test/python/circuit/test_circuit_load_from_qpy.py

@@ -1083,3 +1083,23 @@ def _define(self) -> None:
         new_circ = load(qpy_file)[0]
         self.assertEqual(qc, new_circ)
         self.assertEqual(qc.decompose(), new_circ.decompose())
+
+    def test_load_with_loose_bits(self):
+        """Test that loading from a circuit with loose bits works."""
+        qc = QuantumCircuit([Qubit(), Qubit(), Clbit()])
+        qpy_file = io.BytesIO()
+        dump(qc, qpy_file)
+        qpy_file.seek(0)
+        new_circuit = load(qpy_file)[0]
+        self.assertEqual(tuple(new_circuit.qregs), ())
+        self.assertEqual(tuple(new_circuit.cregs), ())
+        self.assertEqual(qc, new_circuit)
+
+    def test_load_with_loose_bits_and_registers(self):
+        """Test that loading from a circuit with loose bits and registers works."""
+        qc = QuantumCircuit(QuantumRegister(3), ClassicalRegister(1), [Clbit()])
+        qpy_file = io.BytesIO()
+        dump(qc, qpy_file)
+        qpy_file.seek(0)
+        new_circuit = load(qpy_file)[0]
+        self.assertEqual(qc, new_circuit)