renamed qiskit_simulator extensions to qasm_simulator_cpp, added basi…

…c tests

qiskit/backends/_qasm_simulator_cpp.py

@@ -141,6 +141,8 @@ class QASMSimulatorEncoder(json.JSONEncoder):
         complex numbers z as lists [z.real, z.imag]
         ndarrays as nested lists.
     """
+
+    # pylint: disable=method-hidden,arguments-differ
     def default(self, obj):
         if isinstance(obj, np.ndarray):
             return obj.tolist()
@@ -159,7 +161,10 @@ class QASMSimulatorDecoder(json.JSONDecoder):
     def __init__(self, *args, **kwargs):
         json.JSONDecoder.__init__(self, object_hook=self.object_hook, *args, **kwargs)
 
+    # pylint: disable=method-hidden
     def object_hook(self, obj):
+        """Special decoding rules for simulator output."""
+
         for key in ['U_error', 'density_matrix']:
             # JSON is a complex matrix
             if key in obj and isinstance(obj[key], list):

qiskit/extensions/qiskit_simulator/__init__.py → qiskit/extensions/qasm_simulator_cpp/__init__.py

@@ -19,5 +19,6 @@
 from .load import load
 from .noise import noise
 from .save import save
-from .uzz import uzz
+from .snapshot import snapshot
+from .rzz import rzz
 from .wait import wait

qiskit/extensions/qiskit_simulator/rzz.py → qiskit/extensions/qasm_simulator_cpp/rzz.py

@@ -28,6 +28,7 @@
 
 
 class RZZGate(Gate):
+    """Two-qubit ZZ-rotation gate."""
 
     def __init__(self, theta, ctl, tgt, circ=None):
         """Create new rzz gate."""

setup.py.in

@@ -43,7 +43,7 @@ packages = ["qiskit",
             "qiskit.dagcircuit",
             "qiskit.extensions",
             "qiskit.extensions.standard",
-            "qiskit.extensions.qiskit_simulator",
+            "qiskit.extensions.qasm_simulator_cpp",
             "qiskit.extensions.quantum_initializer",
             "qiskit.mapper",
             "qiskit.qasm",

test/python/test_local_qasm_simulator_cpp.py

@@ -24,14 +24,13 @@
 from numpy.linalg import norm
 
 import qiskit
-import qiskit.backends._qasm_simulator_cpp as QasmSimulatorCpp
-import numpy as np
-from numpy.linalg import norm
 from qiskit import ClassicalRegister
 from qiskit import QuantumCircuit
 from qiskit import QuantumJob
 from qiskit import QuantumRegister
 from qiskit import _openquantumcompiler as openquantumcompiler
+from qiskit.backends import _qasm_simulator_cpp as QasmSimulatorCpp
+
 from .common import QiskitTestCase
 
 
@@ -190,7 +189,7 @@ def test_qobj_measure_opt(self):
                 'quantum_state': np.array([1 / np.sqrt(2), 0, 0, 1 / np.sqrt(2)])}
         }
 
-        for name in expected_data.keys():
+        for name in expected_data:
             # Check counts:
             counts = result.get_counts(name)
             expected_counts = expected_data[name]['counts']
@@ -227,7 +226,7 @@ def test_qobj_reset(self):
             'y reset': {'quantum_state': np.array([1, 0])},
             'h reset': {'quantum_state': np.array([1, 0])}
         }
-        for name in expected_data.keys():
+        for name in expected_data:
             # Check snapshot is |0> state
             snapshots = result.get_data(name).get('snapshots', {})
             self.assertEqual(set(snapshots), {'0'},
@@ -350,7 +349,7 @@ def test_qobj_single_qubit_gates(self):
                 'quantum_state': np.array([1 / np.sqrt(2), 0.5 - 0.5j])}
         }
 
-        for name in expected_data.keys():
+        for name in expected_data:
             # Check snapshot
             snapshots = result.get_data(name).get('snapshots', {})
             self.assertEqual(set(snapshots), {'0'},
@@ -399,9 +398,9 @@ def test_qobj_two_qubit_gates(self):
             'h0 h1 cz01': {'quantum_state': np.array([0.5, 0.5, 0.5, -0.5])},
             'h0 h1 cz10': {'quantum_state': np.array([0.5, 0.5, 0.5, -0.5])},
             'h0 rzz01': {
-                'quantum_state': np.array([1 / np.sqrt(2), 1j / np.sqrt(2), 0 , 0])},
+                'quantum_state': np.array([1 / np.sqrt(2), 1j / np.sqrt(2), 0, 0])},
             'h0 rzz10': {
-                'quantum_state': np.array([1 / np.sqrt(2), 1j / np.sqrt(2), 0 , 0])},
+                'quantum_state': np.array([1 / np.sqrt(2), 1j / np.sqrt(2), 0, 0])},
             'h1 rzz01': {
                 'quantum_state': np.array([1 / np.sqrt(2), 0, 1j / np.sqrt(2), 0])},
             'h1 rzz10': {
@@ -410,7 +409,7 @@ def test_qobj_two_qubit_gates(self):
             'h0 h1 rzz10': {'quantum_state': np.array([0.5, 0.5j, 0.5j, 0.5])}
         }
 
-        for name in expected_data.keys():
+        for name in expected_data:
             # Check snapshot
             snapshots = result.get_data(name).get('snapshots', {})
             self.assertEqual(set(snapshots), {'0'},