Skip to content

Commit

Permalink
better log for disk mode: input, params, and time
Browse files Browse the repository at this point in the history
  • Loading branch information
RodenLuo committed Oct 18, 2024
1 parent 377412a commit 2e9a03e
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 6 deletions.
3 changes: 0 additions & 3 deletions src/DiffAtomComp.py
Original file line number Diff line number Diff line change
Expand Up @@ -986,9 +986,6 @@ def diff_atom_comp(target_vol_path: str,
log_idx = 0
os.makedirs(out_dir, exist_ok=out_dir_exist_ok)

with open(f"{out_dir}/log.log", "a") as log_file:
log_file.write(f"Wall clock time: {datetime.now()}\n")

# Create the optimizer with different learning rates
optimizer = torch.optim.Adam([
{'params': [e_shifts], 'lr': target_size.mean() * 0.01},
Expand Down
39 changes: 36 additions & 3 deletions src/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -1559,16 +1559,37 @@ def run_button_clicked(self):
"and then launch DiffFit again to run the fitting in Disk mode.")
return

_out_dir_exist_ok = self.settings.out_dir_exist_ok
_out_dir = self.settings.output_directory
os.makedirs(_out_dir, exist_ok=_out_dir_exist_ok)
with open(f"{_out_dir}/log.log", "a") as log_file:
log_file.write(f"=======\n"
f"Wall clock time: {datetime.now()}\n"
f"-------\n"
f"Disk mode\n"
f"Target Volume: {self.settings.target_vol_path}\n"
f"Structures Folder: {self.settings.structures_directory}\n"
f"Sim-map Folder: {self.settings.structures_sim_map_dir}\n"
f"Target Surface Threshold: {self.settings.target_surface_threshold}\n"
f"-------\n"
f"# shifts: {self.settings.N_shifts}\n"
f"# quaternions: {self.settings.N_quaternions}\n"
f"Gaussian mode: {self.Gaussian_mode}\n"
f"Conv. loops: {self.settings.conv_loops}\n"
f"Conv. kernel sizes: {self.settings.conv_kernel_sizes}\n"
f"Conv. weights: {self.settings.conv_weights}\n"
f"-------\n")


self.disable_spheres_clicked()
disk_fit_timer_start = datetime.now()

print("Running the computation...")

#target_vol_path = "D:\\GIT\\DiffFit\dev_data\input\domain_fit_demo_3domains\density2.mrc"
#output_folder = "D:\\GIT\\DiffFit\dev_data\output"
with open(f"{_out_dir}/log.log", "a") as log_file:
log_file.write(f"DiffFit optimization starts: {disk_fit_timer_start}\n")

timer_start = datetime.now()

mol_centers, e_sqd_log = diff_atom_comp(
target_vol_path=self.settings.target_vol_path,
target_surface_threshold=self.settings.target_surface_threshold,
Expand All @@ -1593,6 +1614,10 @@ def run_button_clicked(self):
timer_stop = datetime.now()
print(f"\nDiffFit optimization time elapsed: {timer_stop - timer_start}\n\n")

with open(f"{_out_dir}/log.log", "a") as log_file:
log_file.write(f"-------\n"
f"DiffFit optimization time elapsed: {timer_stop - timer_start}\n")

# copy the directories
self.target_vol.setText(self.settings.target_vol_path)
self.structures_folder.setText(self.settings.structures_directory)
Expand All @@ -1607,6 +1632,14 @@ def run_button_clicked(self):
timer_stop = datetime.now()
print(f"\nDiffFit total time elapsed: {timer_stop - disk_fit_timer_start}\n\n")

metric_json = self.return_cluster_metric_json(0)
with open(f"{_out_dir}/log.log", "a") as log_file:
log_file.write(f"DiffFit total time elapsed: {timer_stop - disk_fit_timer_start}\n"
f"-------\n"
f"DiffFit top fit metric:\n"
f"{metric_json}\n"
f"=======\n\n")

def load_button_clicked(self):
if self.fit_input_mode == "interactive":
if self.interactive_fit_result_ready:
Expand Down

0 comments on commit 2e9a03e

Please sign in to comment.