fix qasm_simulator

doichanj · Aug 9, 2024 · b60220f · b60220f
1 parent 5141dc3
commit b60220f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 32 deletions.
diff --git a/qiskit_aer/backends/qasm_simulator.py b/qiskit_aer/backends/qasm_simulator.py
@@ -595,7 +595,7 @@ def configuration(self):
         """
         config = self._configuration.copy()
         for key, val in self._options_configuration.items():
-            setattr(config, key, val)
+            config[key] = val
         # Update basis gates based on custom options, config, method,
         # and noise model
         config["custom_instructions"] = self._custom_instructions()

diff --git a/qiskit_aer/noise/errors/quantum_error.py b/qiskit_aer/noise/errors/quantum_error.py
@@ -312,9 +312,16 @@ def to_dict(self):
         for circ in self._circs:
             circ_inst = []
             for inst in circ.data:
-                qobj_inst = inst.operation.assemble()
-                qobj_inst.qubits = [circ.find_bit(q).index for q in inst.qubits]
-                circ_inst.append(qobj_inst.to_dict())
+                inst_dict = {}
+                inst_dict["name"] = inst.operation.name
+                inst_dict["qubits"] = [circ.find_bit(q).index for q in inst.qubits]
+                if inst.operation.params:
+                    inst_dict["params"] = inst.operation.params
+                if inst.operation.label:
+                    inst_dict["label"] = inst.operation.label
+                if inst.operation.condition:
+                    inst_dict["condition"] = inst.operation.condition
+                circ_inst.append(inst_dict)
             instructions.append(circ_inst)
         # Construct error dict
         error = {

diff --git a/test/terra/backends/aer_simulator/test_circuit.py b/test/terra/backends/aer_simulator/test_circuit.py
@@ -193,29 +193,6 @@ def test_metadata_protected(self):
 
         deepcopy(job.result())
 
-    def test_run_qobj(self):
-        """Test qobj run"""
-
-        qubits = QuantumRegister(3)
-        clbits = ClassicalRegister(3)
-
-        circuit = QuantumCircuit(qubits, clbits)
-        circuit.h(qubits[0])
-        circuit.cx(qubits[0], qubits[1])
-        circuit.cx(qubits[0], qubits[2])
-
-        for q, c in zip(qubits, clbits):
-            circuit.measure(q, c)
-
-        backend = self.backend()
-
-        shots = 1000
-        with self.assertWarns(DeprecationWarning):
-            result = backend.run(assemble(circuit), shots=shots).result()
-
-        self.assertSuccess(result)
-        self.compare_counts(result, [circuit], [{"0x0": 500, "0x7": 500}], delta=0.05 * shots)
-
     def test_numpy_integer_shots(self):
         """Test implicit cast of shot option from np.int_ to int."""
 

diff --git a/test/terra/backends/aer_simulator/test_truncate.py b/test/terra/backends/aer_simulator/test_truncate.py
@@ -13,10 +13,7 @@
 import qiskit
 from qiskit import transpile, QuantumCircuit
 
-if qiskit.__version__.startswith("0."):
-    from qiskit.providers.fake_provider import FakeQuito as Fake5QV1
-else:
-    from qiskit.providers.fake_provider import Fake5QV1
+from qiskit.providers.fake_provider import GenericBackendV2
 
 from qiskit_aer.noise import NoiseModel
 from test.terra.backends.simulator_test_case import SimulatorTestCase, supported_methods
@@ -53,7 +50,7 @@ def create_circuit_for_truncate(self):
         return circuit
 
     def device_backend(self):
-        return Fake5QV1()
+        return GenericBackendV2(num_qubits=5)
 
     def test_truncate_ideal_sparse_circuit(self):
         """Test qubit truncation for large circuit with unused qubits."""