Remove marshmallow from Qobj

qiskit/assembler/assemble_circuits.py

@@ -116,8 +116,7 @@ def assemble_circuits(circuits, run_config, qobj_id, qobj_header):
                                                        mask="0x%X" % mask,
                                                        relation='==',
                                                        val="0x%X" % val,
-                                                       register=conditional_reg_idx,
-                                                       validate=False)
+                                                       register=conditional_reg_idx)
                 instructions.append(conversion_bfunc)
                 instruction.conditional = conditional_reg_idx
                 max_conditional_idx += 1

qiskit/circuit/instruction.py

@@ -42,7 +42,7 @@
 from qiskit.circuit.exceptions import CircuitError
 from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit.circuit.classicalregister import ClassicalRegister
-from qiskit.qobj.models.qasm import QasmQobjInstruction
+from qiskit.qobj.qasm_qobj import QasmQobjInstruction
 from qiskit.circuit.parameter import ParameterExpression
 
 _CUTOFF_PRECISION = 1E-10
@@ -222,7 +222,7 @@ def definition(self, array):
 
     def assemble(self):
         """Assemble a QasmQobjInstruction"""
-        instruction = QasmQobjInstruction(name=self.name, validate=False)
+        instruction = QasmQobjInstruction(name=self.name)
         # Evaluate parameters
         if self.params:
             params = [

qiskit/providers/models/pulsedefaults.py

@@ -12,6 +12,8 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
+# pylint: disable=missing-type-doc
+
 """Model and schema for pulse defaults."""
 import warnings
 
@@ -20,7 +22,8 @@
 
 from qiskit.validation import BaseModel, BaseSchema, bind_schema, fields
 from qiskit.validation.base import ObjSchema
-from qiskit.qobj import PulseLibraryItemSchema, PulseQobjInstructionSchema, PulseLibraryItem
+from qiskit.qobj.models.pulse import PulseLibraryItemSchema, PulseQobjInstructionSchema
+from qiskit.qobj import PulseLibraryItem
 from qiskit.qobj.converters import QobjToInstructionConverter
 from qiskit.pulse.instruction_schedule_map import InstructionScheduleMap
 from qiskit.pulse.schedule import ParameterizedSchedule

qiskit/qobj/__init__.py

@@ -70,17 +70,34 @@
    validate_qobj_against_schema
 """
 
-from .models.base import (QobjInstruction, QobjExperimentHeader, QobjExperimentConfig,
-                          QobjExperiment, QobjConfig, QobjHeader)
+import warnings
+
+from qiskit.qobj.pulse_qobj import PulseQobj
+from qiskit.qobj.pulse_qobj import PulseQobjInstruction
+from qiskit.qobj.pulse_qobj import PulseQobjExperimentConfig
+from qiskit.qobj.pulse_qobj import PulseQobjExperiment
+from qiskit.qobj.pulse_qobj import PulseQobjConfig
+from qiskit.qobj.pulse_qobj import QobjMeasurementOption
+from qiskit.qobj.pulse_qobj import PulseLibraryItem
+
+from qiskit.qobj.qasm_qobj import QasmQobj
+from qiskit.qobj.qasm_qobj import QasmQobjInstruction
+from qiskit.qobj.qasm_qobj import QasmQobjExperiment
+from qiskit.qobj.qasm_qobj import QasmQobjConfig
+from qiskit.qobj.qasm_qobj import QobjExperimentHeader
+from qiskit.qobj.qasm_qobj import QasmQobjExperimentConfig
+from qiskit.qobj.qasm_qobj import QobjHeader
 
-from .models.pulse import (PulseQobjInstruction, PulseQobjExperimentConfig,
-                           PulseQobjExperiment, PulseQobjConfig,
-                           QobjMeasurementOption, PulseLibraryItem,
-                           PulseLibraryItemSchema, PulseQobjInstructionSchema)
+from .utils import validate_qobj_against_schema
 
-from .models.qasm import (QasmQobjInstruction, QasmQobjExperimentConfig,
-                          QasmQobjExperiment, QasmQobjConfig)
 
-from .qobj import Qobj, QasmQobj, PulseQobj
+class Qobj(QasmQobj):
+    """A backwards compat alias for QasmQobj."""
 
-from .utils import validate_qobj_against_schema
+    def __init__(self, qobj_id=None, config=None, experiments=None,
+                 header=None):
+        """Initialize a Qobj object."""
+        warnings.warn('qiskit.qobj.Qobj is deprecated use either QasmQobj or '
+                      'PulseQobj depending on your application instead.',
+                      DeprecationWarning, stacklevel=2)
+        super(Qobj, self).__init__()

qiskit/qobj/models/pulse.py

@@ -14,15 +14,12 @@
 
 """The pulse qobj models."""
 
-from marshmallow.validate import Range, Regexp, Length, OneOf
+from marshmallow.validate import Range, Regexp, Length
 
-from qiskit.qobj.utils import MeasReturnType, MeasLevel
-from qiskit.validation import BaseSchema, bind_schema, BaseModel
-from qiskit.validation.fields import (Integer, String, Number, Float, Complex, List,
+from qiskit.validation import BaseSchema
+from qiskit.validation.fields import (Integer, String, Float, Complex, List,
                                       Nested, DictParameters, ByType)
-from .base import (QobjInstructionSchema, QobjExperimentConfigSchema, QobjExperimentSchema,
-                   QobjConfigSchema, QobjInstruction, QobjExperimentConfig,
-                   QobjExperiment, QobjConfig)
+from .base import QobjInstructionSchema
 
 
 class QobjMeasurementOptionSchema(BaseSchema):
@@ -63,153 +60,3 @@ class PulseQobjInstructionSchema(QobjInstructionSchema):
     label = String()
     type = String()
     parameters = DictParameters(valid_value_types=(int, float, bool, complex))
-
-
-class PulseQobjExperimentConfigSchema(QobjExperimentConfigSchema):
-    """Schema for PulseQobjExperimentConfig."""
-
-    # Optional properties.
-    qubit_lo_freq = List(Number())
-    meas_lo_freq = List(Number())
-
-
-class PulseQobjExperimentSchema(QobjExperimentSchema):
-    """Schema for PulseQobjExperiment."""
-
-    # Required properties.
-    instructions = Nested(PulseQobjInstructionSchema, required=True, many=True,
-                          validate=Length(min=1))
-
-    # Optional properties.
-    config = Nested(PulseQobjExperimentConfigSchema)
-
-
-class PulseQobjConfigSchema(QobjConfigSchema):
-    """Schema for PulseQobjConfig of device backend."""
-
-    # Required properties.
-    meas_level = Integer(required=True, validate=OneOf(choices=(MeasLevel.RAW,
-                                                                MeasLevel.KERNELED,
-                                                                MeasLevel.CLASSIFIED)))
-    meas_return = String(required=True, validate=OneOf(choices=(MeasReturnType.AVERAGE,
-                                                                MeasReturnType.SINGLE)))
-    pulse_library = Nested(PulseLibraryItemSchema, required=True, many=True)
-    qubit_lo_freq = List(Number(validate=Range(min=0)), required=True)
-    meas_lo_freq = List(Number(validate=Range(min=0)), required=True)
-
-    # Optional properties.
-    memory_slot_size = Integer(validate=Range(min=1))
-    rep_time = Integer(validate=Range(min=0))
-
-
-@bind_schema(QobjMeasurementOptionSchema)
-class QobjMeasurementOption(BaseModel):
-    """Model for QobjMeasurementOption.
-
-    Please note that this class only describes the required fields. For the
-    full description of the model, please check ``QobjMeasurementOptionSchema``.
-
-    Attributes:
-        name (str): name of option specified in the backend
-        params (dict): measurement parameter
-    """
-    def __init__(self, name, params, **kwargs):
-        self.name = name
-        self.params = params
-
-        super().__init__(**kwargs)
-
-
-@bind_schema(PulseLibraryItemSchema)
-class PulseLibraryItem(BaseModel):
-    """Model for PulseLibraryItem.
-
-    Please note that this class only describes the required fields. For the
-    full description of the model, please check ``PulseLibraryItemSchema``.
-
-    Attributes:
-        name (str): name of pulse
-        samples (list[complex]]): list of complex values defining pulse shape
-    """
-
-    def __init__(self, name, samples, **kwargs):
-        self.name = name
-        self.samples = samples
-
-        super().__init__(**kwargs)
-
-
-@bind_schema(PulseQobjInstructionSchema)
-class PulseQobjInstruction(QobjInstruction):
-    """Model for PulseQobjInstruction inherit from QobjInstruction.
-
-    Please note that this class only describes the required fields. For the
-    full description of the model, please check ``PulseQobjInstructionSchema``.
-
-    Attributes:
-        name (str): name of the instruction
-        t0 (int): timing of executing the instruction
-    """
-    def __init__(self, name, t0, **kwargs):
-        # pylint: disable=invalid-name
-        self.t0 = t0
-
-        super().__init__(name=name,
-                         t0=t0,
-                         **kwargs)
-
-
-@bind_schema(PulseQobjExperimentConfigSchema)
-class PulseQobjExperimentConfig(QobjExperimentConfig):
-    """Model for PulseQobjExperimentConfig inherit from QobjExperimentConfig.
-
-    Please note that this class only describes the required fields. For the
-    full description of the model, please check ``PulseQobjExperimentConfigSchema``.
-    """
-    pass
-
-
-@bind_schema(PulseQobjExperimentSchema)
-class PulseQobjExperiment(QobjExperiment):
-    """Model for PulseQobjExperiment inherit from QobjExperiment.
-
-    Please note that this class only describes the required fields. For the
-    full description of the model, please check ``PulseQobjExperimentSchema``.
-
-    Attributes:
-        instructions (list[PulseQobjInstruction]): list of instructions.
-    """
-    def __init__(self, instructions, **kwargs):
-
-        super().__init__(instructions=instructions,
-                         **kwargs)
-
-
-@bind_schema(PulseQobjConfigSchema)
-class PulseQobjConfig(QobjConfig):
-    """Model for PulseQobjConfig inherit from QobjConfig.
-
-    Please note that this class only describes the required fields. For the
-    full description of the model, please check ``PulseQobjConfigSchema``.
-
-    Attributes:
-        meas_level (int or MeasLevel): a value represents the level of measurement.
-        meas_lo_freq (list[float]): local oscillator frequency of measurement pulse.
-        meas_return (str or MeasReturn): a level of measurement information.
-        pulse_library (list[qiskit.qobj.PulseLibraryItem]): a pulse library.
-        qubit_lo_freq (list[float]): local oscillator frequency of driving pulse.
-    """
-    def __init__(self, meas_level, meas_return, pulse_library,
-                 qubit_lo_freq, meas_lo_freq, **kwargs):
-        self.meas_level = meas_level
-        self.meas_return = meas_return
-        self.pulse_library = pulse_library
-        self.qubit_lo_freq = qubit_lo_freq
-        self.meas_lo_freq = meas_lo_freq
-
-        super().__init__(meas_level=meas_level,
-                         meas_return=meas_return,
-                         pulse_library=pulse_library,
-                         qubit_lo_freq=qubit_lo_freq,
-                         meas_lo_freq=meas_lo_freq,
-                         **kwargs)