Skip to content

Commit 20cd0b0

Browse files
shortend step message and changed some levels
1 parent 63d1956 commit 20cd0b0

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

varipeps/config.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,23 +236,26 @@ class VariPEPS_Config:
236236
slurm_restart_mode (:obj:`Slurm_Restart_Mode`):
237237
Mode of operation to restart slurm job if maximal runtime is reached.
238238
log_level_global (:obj:`LogLevel`):
239-
Global logging level.
239+
Global logging level for the 'varipeps' package logger.
240240
log_level_optimizer (:obj:`LogLevel`):
241-
Logging level for optimizer module.
241+
Logging level for 'varipeps.optimizer'.
242242
log_level_ctmrg (:obj:`LogLevel`):
243-
Logging level for CTMRG module.
243+
Logging level for 'varipeps.ctmrg'.
244244
log_level_line_search (:obj:`LogLevel`):
245-
Logging level for line search module.
245+
Logging level for 'varipeps.line_search'.
246246
log_level_expectation (:obj:`LogLevel`):
247-
Logging level for expectation value calculations.
247+
Logging level for 'varipeps.expectation'.
248248
log_to_console (:obj:`bool`):
249-
Enable logging to console.
249+
Enable standard console logging (StreamHandler).
250+
Ignored when :obj:`VariPEPS_Config.log_tqdm` is True.
250251
log_to_file (:obj:`bool`):
251252
Enable logging to file.
252253
log_file (:obj:`str`):
253-
Filename for logging to file.
254+
Filename for logging to file (used when :obj:`VariPEPS_Config.log_to_file` is True).
254255
log_tqdm (:obj:`bool`):
255-
Enable tqdm-based console logging.
256+
Enable tqdm-based console logging. If True, messages from
257+
'varipeps.optimizer' update a tqdm progress bar, while other modules
258+
log via tqdm.write. File logging settings still apply.
256259
"""
257260

258261
# AD config
@@ -347,7 +350,6 @@ class VariPEPS_Config:
347350
log_to_console: bool = True
348351
log_to_file: bool = False
349352
log_file: str = "varipeps.log"
350-
log_step_summary_every_n: int = 1
351353
log_tqdm: bool = False #: Enable tqdm-based console logging
352354

353355
def update(self, name: str, value: Any) -> NoReturn:

varipeps/ctmrg/routine.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,8 @@ def calc_ctmrg_env(
766766
working_unitcell = working_unitcell.change_chi(new_chi)
767767
initial_unitcell = initial_unitcell.change_chi(new_chi)
768768

769-
if logger.isEnabledFor(logging.WARNING):
770-
logger.warning(
769+
if logger.isEnabledFor(logging.INFO):
770+
logger.info(
771771
"Increasing chi to %d since smallest SVD Norm was %.3e.",
772772
new_chi,
773773
norm_smallest_S,
@@ -800,8 +800,8 @@ def calc_ctmrg_env(
800800
if not new_chi in already_tried_chi:
801801
working_unitcell = working_unitcell.change_chi(new_chi)
802802

803-
if logger.isEnabledFor(logging.WARNING):
804-
logger.warning(
803+
if logger.isEnabledFor(logging.info):
804+
logger.info(
805805
"Decreasing chi to %d since smallest SVD Norm was %.3e or routine did not converge.",
806806
new_chi,
807807
norm_smallest_S,
@@ -824,8 +824,8 @@ def calc_ctmrg_env(
824824
new_truncation_eps
825825
<= varipeps_config.ctmrg_increase_truncation_eps_max_value
826826
):
827-
if logger.isEnabledFor(logging.WARNING):
828-
logger.warning(
827+
if logger.isEnabledFor(logging.INFO):
828+
logger.info(
829829
"Increasing SVD truncation eps to %.1e.",
830830
new_truncation_eps,
831831
)

varipeps/optimization/optimizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ def random_noise(a):
10231023

10241024
step_str = f"{float(linesearch_step):0.3f}" if linesearch_step is not None else "None"
10251025
logger.info(
1026-
"📉 Step %d | Energy: %.8f Δ: %.2e | Retries: %d | Conv: %.3e | Line search step: %s | Max. trunc. err.: %.1e χ: %d | Runtime: %.0f sec",
1026+
"📉 %4d | E=%.8f ΔE=%.2e | r=%d | |∇ψ|=%.2e | ls=%s | ε_tr=%.1e | χ=%d | t=%.0fs",
10271027
int(count),
10281028
float(working_value),
10291029
-float(working_value - step_energies[random_noise_retries][-2]) if len(step_energies[random_noise_retries]) > 1 else 0.0,

0 commit comments

Comments
 (0)