Merge pull request Qiskit#93 from nonhermitian/coupling_map

Add coupling_map to backends
dcmckayibm · Mar 19, 2019 · 6542359 · 6542359
2 parents 66c8b87 + 1312103
commit 6542359
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/qiskit/providers/aer/backends/qasm_simulator.py b/qiskit/providers/aer/backends/qasm_simulator.py
@@ -90,7 +90,7 @@ class QasmSimulator(AerBackend):
             cores. For systems with a small number of cores it enabling
             can reduce performance (Default: False).
 
-        * "ch_approximation_error" (double): Set the error in the 
+        * "ch_approximation_error" (double): Set the error in the
             approximation for the ch method. A smaller error needs more
             memory and computational time. (Default: 0.05)
 
@@ -129,7 +129,8 @@ class QasmSimulator(AerBackend):
         'open_pulse': False,
         'memory': True,
         'max_shots': 100000,
-        'description': 'A C++ simulator with realistic for qobj files',
+        'description': 'A C++ simulator with realistic noise for qobj files',
+        'coupling_map': None,
         'basis_gates': ['u1', 'u2', 'u3', 'cx', 'cz', 'id', 'x', 'y', 'z',
                         'h', 's', 'sdg', 't', 'tdg', 'ccx', 'swap',
                         'snapshot', 'unitary'],
@@ -217,13 +218,12 @@ def _validate(self, qobj, backend_options, noise_model):
                     else:
                         if n_qubits > 63:
                             raise AerError(err_string + ', and has too many ' +
-                                           'qubits to fall back to the ' + 
+                                           'qubits to fall back to the ' +
                                            'CH simulator.')
                         if not ch_supported:
                             raise AerError(err_string + ', and contains ' +
-                                           'instructions not supported by ' + 
+                                           'instructions not supported by ' +
                                            'the CH simulator.')
                         logger.info('The QasmSimulator will automatically '
                                     'switch to the CH backend, based on '
                                     'the memory requirements.')
-
diff --git a/qiskit/providers/aer/backends/statevector_simulator.py b/qiskit/providers/aer/backends/statevector_simulator.py
@@ -80,6 +80,7 @@ class StatevectorSimulator(AerBackend):
         'memory': True,
         'max_shots': 1,
         'description': 'A C++ statevector simulator for qobj files',
+        'coupling_map': None,
         'basis_gates': ['u1', 'u2', 'u3', 'cx', 'cz', 'id', 'x', 'y', 'z',
                         'h', 's', 'sdg', 't', 'tdg', 'ccx', 'swap',
                         'snapshot', 'unitary'],

diff --git a/qiskit/providers/aer/backends/unitary_simulator.py b/qiskit/providers/aer/backends/unitary_simulator.py
@@ -60,12 +60,12 @@ class UnitarySimulator(AerBackend):
             (Default: 6).
     """
 
-    MAX_QUBITS_MEMORY = int(log2(sqrt(local_hardware_info()['memory'] * (1024 ** 3) / 16)))
+    MAX_QUBIT_MEMORY = int(log2(sqrt(local_hardware_info()['memory'] * (1024 ** 3) / 16)))
 
     DEFAULT_CONFIGURATION = {
         'backend_name': 'unitary_simulator',
         'backend_version': __version__,
-        'n_qubits': MAX_QUBITS_MEMORY,
+        'n_qubits': MAX_QUBIT_MEMORY,
         'url': 'https://github.com/Qiskit/qiskit-aer',
         'simulator': True,
         'local': True,
@@ -74,7 +74,8 @@ class UnitarySimulator(AerBackend):
         'memory': False,
         'max_shots': 1,
         'description': 'A Python simulator for computing the unitary' +
-                        'matrix for experiments in qobj files',
+                       'matrix for experiments in qobj files',
+        'coupling_map': None,
         'basis_gates': ['u1', 'u2', 'u3', 'cx', 'cz', 'id', 'x', 'y', 'z',
                         'h', 's', 'sdg', 't', 'tdg', 'ccx', 'swap',
                         'snapshot', 'unitary'],