Skip to content

Commit dd94fb9

Browse files
committed
update timing info
1 parent 6d74188 commit dd94fb9

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

pyxtal/optimize/DFS.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ def load(cls, filename):
286286
args = dict(zip(param_names, load_xml(filename)))
287287
return cls(**args)
288288

289-
290289
if __name__ == "__main__":
291290
import argparse
292291
import os
@@ -379,4 +378,4 @@ def load(cls, filename):
379378
strs = "Final {:8s} [{:2d}]{:10s} ".format(name, sum(xtal.numMols), spg)
380379
strs += "{:3d}m {:2d} {:6.1f}".format(t1, N_torsion, wt)
381380
strs += "{:12.3f} {:20s} {:s}".format(eng, mytag, smile)
382-
print(strs)
381+
print(strs)

pyxtal/optimize/WFS.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,4 +367,4 @@ def load(cls, filename):
367367
strs = "Final {:8s} [{:2d}]{:10s} ".format(name, sum(xtal.numMols), spg)
368368
strs += "{:3d}m {:2d} {:6.1f}".format(t1, N_torsion, wt)
369369
strs += "{:12.3f} {:20s} {:s}".format(eng, mytag, smile)
370-
print(strs)
370+
print(strs)

pyxtal/optimize/base.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def run(self, ref_pmg=None, ref_pxrd=None):
373373
if self.ncpu > 1:
374374
pool = Pool(processes=self.ncpu,
375375
initializer=setup_worker_logger,
376-
initargs=(self.log_file,))
376+
initargs=(self.log_file))
377377
else:
378378
pool = None
379379

@@ -385,8 +385,7 @@ def run(self, ref_pmg=None, ref_pxrd=None):
385385
strs += f"in {t:.1f} mins {self.N_struc:d} strucs."
386386
print(strs)
387387

388-
if self.use_mpi:
389-
self.comm.Barrier()
388+
if self.use_mpi: self.comm.Barrier()
390389
return results
391390

392391
def select_xtals(self, ref_xtals, ids, N_max):
@@ -528,7 +527,7 @@ def export_references(self, xtals, engs, N_min=50, dE=2.5, FMSE=2.5):
528527
aug_dics = self.parameters.augment_references(_ref_dics)
529528
ref_dics.extend(aug_dics)
530529
t1 = (time() - t0) / 60
531-
print(f"Add {len(_ref_dics)} references in {t1:.2f} min")
530+
print(f"Ref. update usage: {len(_ref_dics)}/{len(aug_dics)} strucs in {t1:.2f} min")
532531

533532
# Adjust the offset if the current one is 0
534533
offset = self.parameters.params_init[-1]

0 commit comments

Comments
 (0)