Skip to content

Commit

Permalink
Remove pulse defaults required parameters (#2101)
Browse files Browse the repository at this point in the history
* Removed required default parameters.

* Update changelog. Update defaults model validation to add nonetypes.

* Update changelog.

* Readd parameters to be required.

* Update changelog and defaults required parameters.
  • Loading branch information
taalexander authored and diego-plan9 committed Apr 11, 2019
1 parent 4256cf5 commit 4c482ab
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ The format is based on `Keep a Changelog`_.

Added
-----

- Introduced the backend defaults model and endpoint for pulse backends (#2101).
- `meas_level` to result schema (#2085).
- Core StochasticSwap routine implemented in Cython (#1789).
- New EnlargeWithAncilla pass for adding ancilla qubits after a Layout
Expand Down
22 changes: 9 additions & 13 deletions qiskit/providers/models/pulsedefaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,15 @@ class PulseDefaultsSchema(BaseSchema):
"""Schema for PulseDefaults."""

# Required properties.
qubit_freq_est = List(Number(), required=True,
validate=Length(min=1))
meas_freq_est = List(Number(), required=True,
validate=Length(min=1))
qubit_freq_est = List(Number(), required=True, validate=Length(min=1))
meas_freq_est = List(Number(), required=True, validate=Length(min=1))
buffer = Integer(required=True, validate=Range(min=0))
pulse_library = Nested(PulseLibraryItemSchema, required=True, many=True)
meas_kernel = Nested(MeasurementKernelSchema, required=True)
discriminator = Nested(DiscriminatorSchema, required=True)
cmd_def = Nested(PulseCommandSchema, many=True, required=True)

# Optional properties.
cmd_def = Nested(PulseCommandSchema, many=True)
meas_kernel = Nested(MeasurementKernelSchema)
discriminator = Nested(DiscriminatorSchema)


@bind_schema(PulseLibraryItemSchema)
Expand Down Expand Up @@ -136,17 +134,15 @@ class PulseDefaults(BaseModel):
in GHz.
buffer (int): Default buffer time (in units of dt) between pulses.
pulse_library (list[PulseLibraryItem]): Backend pulse library.
meas_kernel (MeasurementKernel): Default measurement kernel.
discriminator (Discriminator): Default discriminator.
cmd_def (list[PulseCommand]): Backend command definition.
"""

def __init__(self, qubit_freq_est, meas_freq_est, buffer, pulse_library,
meas_kernel, discriminator, **kwargs):
def __init__(self, qubit_freq_est, meas_freq_est, buffer,
pulse_library, cmd_def, **kwargs):
self.qubit_freq_est = qubit_freq_est
self.meas_freq_est = meas_freq_est
self.buffer = buffer
self.pulse_library = pulse_library
self.meas_kernel = meas_kernel
self.discriminator = discriminator
self.cmd_def = cmd_def

super().__init__(**kwargs)
2 changes: 0 additions & 2 deletions qiskit/schemas/default_pulse_configuration_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@
"qubit_freq_est",
"meas_freq_est",
"pulse_library",
"meas_kernel",
"discriminator",
"buffer"
],
"type": "object"
Expand Down

0 comments on commit 4c482ab

Please sign in to comment.