Skip to content

Avoid to_dict() when possible in pulse system model #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chriseclectic merged 4 commits into from
Apr 14, 2020
Merged

Avoid to_dict() when possible in pulse system model #695

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8fa61f
Avoid to_dict() when possible in pulse system model
mtreinish Apr 14, 2020
15a565c
Update qiskit/providers/aer/pulse/pulse_system_model.py
chriseclectic Apr 14, 2020
643dd06
Update qiskit/providers/aer/pulse/pulse_system_model.py
chriseclectic Apr 14, 2020
04737a0
Update qiskit/providers/aer/pulse/pulse_system_model.py
chriseclectic Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions qiskit/providers/aer/pulse/pulse_system_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,23 +110,23 @@ def from_backend(cls, backend, subsystem_list=None):
raise AerError("{} is not a Qiskit backend".format(backend))

# get relevant information from backend
defaults = backend.defaults().to_dict()
config = backend.configuration().to_dict()
defaults = backend.defaults()
config = backend.configuration()

if not config['open_pulse']:
if not config.open_pulse:
raise AerError('{} is not an open pulse backend'.format(backend))

# draw defaults
qubit_freq_est = defaults.get('qubit_freq_est', None)
meas_freq_est = defaults.get('meas_freq_est', None)
qubit_freq_est = getattr(defaults, 'qubit_freq_est', None)
meas_freq_est = getattr(defaults, 'meas_freq_est', None)

# draw from configuration
# if no subsystem_list, use all for device
subsystem_list = subsystem_list or list(range(config['n_qubits']))
ham_string = config['hamiltonian']
subsystem_list = subsystem_list or list(range(config.n_qubits))
ham_string = config.hamiltonian
hamiltonian = HamiltonianModel.from_dict(ham_string, subsystem_list)
u_channel_lo = config.get('u_channel_lo', None)
dt = config.get('dt', None)
u_channel_lo = getattr(config, 'u_channel_lo', None)
dt = getattr(config, 'dt', None)

control_channel_labels = [None] * len(u_channel_lo)
# populate control_channel_dict
Expand All @@ -152,11 +152,14 @@ def from_backend(cls, backend, subsystem_list=None):
# construct string for u channel
u_string = ''
for u_term_dict in u_lo:
scale = u_term_dict.get('scale', [1.0, 0])
q_idx = u_term_dict.get('q')
scale = getattr(u_term_dict, 'scale', [1.0, 0])
q_idx = getattr(u_term_dict, 'q')
if len(u_string) > 0:
u_string += ' + '
u_string += str(scale[0] + scale[1] * 1j) + 'q' + str(q_idx)
if isinstance(scale, complex):
u_string += str(scale) + 'q' + str(q_idx)
else:
u_string += str(scale[0] + scale[1] * 1j) + 'q' + str(q_idx)
control_channel_labels[u_idx] = {'driven_q': drive_idx, 'freq': u_string}

return cls(hamiltonian=hamiltonian,
Expand Down