Fix issue with colring enabled + styling
This commit is contained in:
		| @@ -7,7 +7,6 @@ This module contains the hyperopt logic | ||||
| import locale | ||||
| import logging | ||||
| import random | ||||
| import sys | ||||
| import warnings | ||||
| from math import ceil | ||||
| from collections import OrderedDict | ||||
| @@ -18,7 +17,6 @@ from typing import Any, Dict, List, Optional | ||||
|  | ||||
| import rapidjson | ||||
| from colorama import Fore, Style | ||||
| from colorama import init as colorama_init | ||||
| from joblib import (Parallel, cpu_count, delayed, dump, load, | ||||
|                     wrap_non_picklable_objects) | ||||
| from pandas import DataFrame, json_normalize, isna | ||||
| @@ -268,17 +266,10 @@ class Hyperopt: | ||||
|         Log results if it is better than any previous evaluation | ||||
|         """ | ||||
|         is_best = results['is_best'] | ||||
|         if not self.print_all: | ||||
|             # Print '\n' after each 100th epoch to separate dots from the log messages. | ||||
|             # Otherwise output is messy on a terminal. | ||||
|             print('.', end='' if results['current_epoch'] % 100 != 0 else None)  # type: ignore | ||||
|             sys.stdout.flush() | ||||
|  | ||||
|         if self.print_all or is_best: | ||||
|             if not self.print_all: | ||||
|                 # Separate the results explanation string from dots | ||||
|                 print("\n") | ||||
|             print(self.get_result_table( | ||||
|             print( | ||||
|                 self.get_result_table( | ||||
|                     self.config, results, self.total_epochs, | ||||
|                     self.print_all, self.print_colorized, | ||||
|                     self.hyperopt_table_header | ||||
| @@ -675,9 +666,6 @@ class Hyperopt: | ||||
|         self.dimensions: List[Dimension] = self.hyperopt_space() | ||||
|         self.opt = self.get_optimizer(self.dimensions, config_jobs) | ||||
|  | ||||
|         if self.print_colorized: | ||||
|             colorama_init(autoreset=True) | ||||
|  | ||||
|         try: | ||||
|             with Parallel(n_jobs=config_jobs) as parallel: | ||||
|                 jobs = parallel._effective_n_jobs() | ||||
| @@ -690,15 +678,18 @@ class Hyperopt: | ||||
|                         ' (', progressbar.Percentage(), ')] ', | ||||
|                         progressbar.Bar(marker=progressbar.AnimatedMarker( | ||||
|                             fill='█', | ||||
|                             fill_wrap='\x1b[32m{}\x1b[39m', | ||||
|                             marker_wrap='\x1b[31m{}\x1b[39m', | ||||
|                             fill_wrap=Fore.GREEN + '{}' + Fore.RESET, | ||||
|                             marker_wrap=Style.BRIGHT + '{}' + Style.RESET_ALL, | ||||
|                         )), | ||||
|                         ' [', progressbar.ETA(), ', ', progressbar.Timer(), ']', | ||||
|                     ] | ||||
|                 else: | ||||
|                     widgets = [ | ||||
|                         ' [Epoch ', progressbar.Counter(), ' of ', str(self.total_epochs), '] ', | ||||
|                         progressbar.Bar(marker='█'), | ||||
|                         ' [Epoch ', progressbar.Counter(), ' of ', str(self.total_epochs), | ||||
|                         ' (', progressbar.Percentage(), ')] ', | ||||
|                         progressbar.Bar(marker=progressbar.AnimatedMarker( | ||||
|                             fill='█', | ||||
|                         )), | ||||
|                         ' [', progressbar.ETA(), ', ', progressbar.Timer(), ']', | ||||
|                     ] | ||||
|                 with progressbar.ProgressBar( | ||||
|   | ||||
		Reference in New Issue
	
	Block a user