Skip to content

allow repeating parameters #911

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

Closed
hhorii wants to merge 3 commits into from
Closed

allow repeating parameters #911

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e966a1c
allow repeating parameters
hhorii Aug 29, 2020
ef5c9d2
change circuit ordering to align with Aqua usecases
hhorii Sep 20, 2020
d37708a
Merge remote-tracking branch 'upstream/master' into repeated_parameters
hhorii Sep 20, 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
72 changes: 40 additions & 32 deletions src/framework/qobj.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,45 +97,53 @@ Qobj::Qobj(const json_t &js) {
std::vector<exp_params_t> param_table;
JSON::get_value(param_table, "parameterizations", config);

// Validate parameterizations for number of circuis
if (!param_table.empty() && param_table.size() != num_circs) {
// Validate parameterizations for number of circuits
if (!param_table.empty() && param_table.size() < num_circs) {
throw std::invalid_argument(
R"(Invalid parameterized qobj: "parameterizations" length does not match number of circuits.)");
R"(Invalid parameterized qobj: "parameterizations" length is less than a number of circuits.)");
}
if (param_table.size() % num_circs != 0) {
throw std::invalid_argument(
R"(Invalid parameterized qobj: "parameterizations" length must be divisible with a number of circuits.)");
}

const size_t num_exps = param_table.empty()? num_circs : param_table.size();
const size_t num_repeats = param_table.empty()? 1 : param_table.size() / num_circs;
// Load circuits
for (size_t i=0; i<num_circs; i++) {
// Get base circuit from qobj
for (size_t i = 0; i < num_circs; ++i) {
Circuit circuit(circs[i], config);
if (param_table.empty() || param_table[i].empty()) {
// Non parameterized circuit
circuits.push_back(circuit);
} else {
// Load different parameterizations of the initial circuit
const auto circ_params = param_table[i];
const size_t num_params = circ_params[0].second.size();
const size_t num_instr = circuit.ops.size();
for (size_t j=0; j<num_params; j++) {
// Make a copy of the initial circuit
Circuit param_circuit = circuit;
for (const auto &params : circ_params) {
const auto instr_pos = params.first.first;
const auto param_pos = params.first.second;
// Validation
if (instr_pos >= num_instr) {
throw std::invalid_argument(R"(Invalid parameterized qobj: instruction position out of range)");
}
auto &op = param_circuit.ops[instr_pos];
if (param_pos >= op.params.size()) {
throw std::invalid_argument(R"(Invalid parameterized qobj: instruction param position out of range)");
}
if (j >= params.second.size()) {
throw std::invalid_argument(R"(Invalid parameterized qobj: parameterization value out of range)");
for (size_t j = 0; j < num_repeats; ++j) {
size_t param_idx = i * num_repeats + j;
if (param_table.empty() || param_table[param_idx].empty()) {
// Non parameterized circuit
circuits.push_back(circuit);
} else {
// Load different parameterizations of the initial circuit
const auto circ_params = param_table[param_idx];
const size_t num_params = circ_params[0].second.size();
const size_t num_instr = circuit.ops.size();
for (size_t k=0; k<num_params; k++) {
// Make a copy of the initial circuit
Circuit param_circuit = circuit;
for (const auto &params : circ_params) {
const auto instr_pos = params.first.first;
const auto param_pos = params.first.second;
// Validation
if (instr_pos >= num_instr) {
throw std::invalid_argument(R"(Invalid parameterized qobj: instruction position out of range)");
}
auto &op = param_circuit.ops[instr_pos];
if (param_pos >= op.params.size()) {
throw std::invalid_argument(R"(Invalid parameterized qobj: instruction param position out of range)");
}
if (k >= params.second.size()) {
throw std::invalid_argument(R"(Invalid parameterized qobj: parameterization value out of range)");
}
// Update the param
op.params[param_pos] = params.second[k];
}
// Update the param
op.params[param_pos] = params.second[j];
circuits.push_back(param_circuit);
}
circuits.push_back(param_circuit);
}
}
}
Expand Down