Skip to content

Saving optim points in human format. #140

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
merged 5 commits into from
Nov 10, 2021
Merged

Saving optim points in human format. #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32b0d93
Saving optim points in human format.
nwittler Sep 7, 2021
151da06
Made gradient optional in log reader.
nwittler Sep 7, 2021
44a9569
Replaced ast call with hjson to load log.
nwittler Sep 8, 2021
ddce04d
Fixed typo
nwittler Sep 8, 2021
72b7621
Simplified generation of table
nwittler Sep 9, 2021
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
2 changes: 1 addition & 1 deletion c3/optimizers/optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def log_parameters(self) -> None:
"units": self.pmap.get_opt_units(),
"optim_status": self.optim_status,
}
best_point.write(hjson.dumpsJSON(best_dict, default=hjson_encode))
best_point.write(hjson.dumps(best_dict, default=hjson_encode))
best_point.write("\n")
if self.store_unitaries:
self.exp.store_Udict(self.optim_status["goal"])
Expand Down
48 changes: 23 additions & 25 deletions c3/utils/log_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,31 @@ def show_table(log: Dict[str, Any], console: Console) -> None:
console : Console
Rich console for output.
"""
if log:
opt_map = log["opt_map"]
optim_status = log["optim_status"]
units = log["units"]
params = optim_status["params"]
opt_map = log["opt_map"]
optim_status = log["optim_status"]
units = log["units"]
params = optim_status["params"]
if "gradient" not in optim_status:
grads = [0] * len(params)
else:
grads = optim_status["gradient"]
table = Table(show_header=True, header_style="bold magenta")
table.add_column("Parameter")
table.add_column("Value", justify="right")
table.add_column("Gradient", justify="right")
for ii, equiv_ids in enumerate(opt_map):
par = params[ii]
par = num3str(par)
par_id = equiv_ids[0]
table.add_row(par_id, par + units[ii], num3str(grads[ii]) + units[ii])
for par_id in equiv_ids[1:]:
table.add_row(par_id, "''", "''")

table = Table(show_header=True, header_style="bold magenta")
table.add_column("Parameter")
table.add_column("Value", justify="right")
table.add_column("Gradient", justify="right")
for ii, equiv_ids in enumerate(opt_map):
par = params[ii]
grad = grads[ii]
par = num3str(par)
grad = num3str(grad)
par_id = equiv_ids[0]
table.add_row(par_id, par + units[ii], grad + units[ii])
if len(equiv_ids) > 1:
for par_id in equiv_ids[1:]:
table.add_row(par_id, "''", "''")

console.clear()
print(
f"Optimization reached {optim_status['goal']:0.3g} at {optim_status['time']}\n"
)
console.print(table)
console.clear()
print(
f"Optimization reached {optim_status['goal']:0.3g} at {optim_status['time']}\n"
)
console.print(table)


if __name__ == "__main__":
Expand Down
Loading