MAINT make all loggers module + classname

smac/epm/random_epm.py

@@ -22,7 +22,7 @@ def __init__(self, rng):
         ----------
         rng : np.random.RandomState
         '''
-        self.logger = logging.getLogger("smac.epm.RandomEPM")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.rng = rng
 
     def train(self, X, Y, **kwargs):

smac/epm/rf_with_instances.py

@@ -87,7 +87,7 @@ def __init__(self, types,
                        min_samples_leaf, max_depth, eps_purity, seed]
         self.seed = seed
 
-        self.logger = logging.getLogger("smac.epm.RF_with_instances")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
         # Never use a lower variance than this
         self.var_threshold = 10 ** -5

smac/epm/rfr_imputator.py

@@ -43,7 +43,7 @@ def __init__(self, rs, cutoff, threshold,
         """
 
         super(RFRImputator, self).__init__()
-        self.logger = logging.getLogger("smac.epm.RFRImputor")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.max_iter = max_iter
         self.change_threshold = change_threshold
         self.cutoff = cutoff

smac/facade/func_facade.py

@@ -79,7 +79,7 @@ def fmin_smac(func: callable,
     scenario = Scenario(scenario_dict)
 
     smac = SMAC(scenario=scenario, tae_runner=ta, rng=rng)
-    smac.logger = logging.getLogger("smac.facade.fmin_smac")
+    smac.logger = logging.getLogger(smac.__module__ + "." + smac.__class__.__name__)
     incumbent = smac.optimize()
 
     config_id = smac.solver.runhistory.config_ids[incumbent]

smac/facade/roar_facade.py

@@ -57,7 +57,7 @@ def __init__(self,
         rng: np.random.RandomState
             Random number generator
         '''
-        self.logger = logging.getLogger("smac.facade.ROAR")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
         # initial random number generator
         num_run, rng = self._get_rng(rng=rng)

smac/facade/smac_facade.py

@@ -90,7 +90,7 @@ def __init__(self,
         rng: np.random.RandomState
             Random number generator
         '''
-        self.logger = logging.getLogger("smac.facade.SMAC")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
         aggregate_func = average_cost
 

smac/initial_design/initial_design.py

@@ -44,7 +44,7 @@ def __init__(self,
         self.stats = stats
         self.traj_logger = traj_logger
         self.rng = rng
-        self.logger = logging.getLogger("smac.initial_design.InitialDesign")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def run(self):
         '''

smac/intensification/intensification.py

@@ -68,7 +68,7 @@ def __init__(self, tae_runner, stats, traj_logger, rng, instances,
             self.instance_specifics = {}
         else:
             self.instance_specifics = instance_specifics
-        self.logger = logging.getLogger("smac.intensification.Intensifier")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.run_limit = run_limit
         self.maxR = maxR
         self.minR = minR

smac/runhistory/runhistory2epm.py

@@ -61,7 +61,7 @@ def __init__(self, scenario, num_params,
         rs : numpy.random.RandomState
             only used for reshuffling data after imputation
         '''
-        self.logger = logging.getLogger("smac.runhistory.runhistory2epm")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
         # General arguments
         self.scenario = scenario

smac/scenario/scenario.py

@@ -44,7 +44,7 @@ def __init__(self, scenario, cmd_args=None):
             command line arguments that were not processed by argparse
 
         """
-        self.logger = logging.getLogger("smac.scenario.Scenario")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.PCA_DIM = 7
 
         self.in_reader = InputReader()
@@ -352,4 +352,4 @@ def __getstate__(self):
 
     def __setstate__(self, d):
         self.__dict__.update(d)
-        self.logger = logging.getLogger("smac.scenario.Scenario")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)

smac/smac_cli.py

@@ -30,7 +30,7 @@ def __init__(self):
         '''
             constructor
         '''
-        self.logger = logging.getLogger("smac.SMAC_cli")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def main_cli(self):
         '''

smac/smbo/acquisition.py

@@ -31,7 +31,7 @@ def __init__(self, model, **kwargs):
         """
         self.model = model
 
-        self.logger = logging.getLogger("smac.smbo.AcquisitionFunction")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def update(self, **kwargs):
         """Update the acquisition functions values.

smac/smbo/base_solver.py

@@ -30,7 +30,7 @@ def __init__(self, acquisition_func=None, model=None,
         if self.save_dir is not None:
             self.create_save_dir()
 
-        self.logger = logging.getLogger("smac.smbo.BaseSolver")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def init_last_iteration(self):
         """

smac/smbo/local_search.py

@@ -43,7 +43,7 @@ def __init__(self, acquisition_function, config_space,
         else:
             self.rng = rng
 
-        self.logger = logging.getLogger("smac.smbo.LocalSearch")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def maximize(self, start_point, *args):
         """

smac/smbo/smbo.py

@@ -71,7 +71,7 @@ def __init__(self,
         rng: np.random.RandomState
             Random number generator
         '''
-        self.logger = logging.getLogger("smac.smbo.SMBO")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.incumbent = None
 
         self.scenario = scenario

smac/stats/stats.py

@@ -32,7 +32,7 @@ def __init__(self, scenario):
         self._EMA_ALPHA = 0.2
 
         self._start_time = None
-        self._logger = logging.getLogger("smac.stats.Stats")
+        self._logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def start_timing(self):
         '''

smac/utils/io/cmd_reader.py

@@ -25,7 +25,7 @@ def __init__(self):
         """
         Constructor
         """
-        self.logger = logging.getLogger("CMDReader")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         pass
 
     def read_cmd(self):

smac/utils/io/traj_logging.py

@@ -36,7 +36,7 @@ def __init__(self, output_dir, stats):
             Stats object
         """
         self.stats = stats
-        self.logger = logging.getLogger("TrajLogger")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
         self.output_dir = output_dir
         if output_dir is None:

test/test_intensify/test_intensify.py

@@ -49,7 +49,7 @@ def setUp(self):
         self.stats = Stats(scenario=self.scen)
         self.stats.start_timing()
 
-        self.logger = logging.getLogger("test.test_intensify.TestIntensify")
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
 
     def test_compare_configs_no_joint_set(self):
         intensifier = Intensifier(

test/test_scenario/test_scenario.py

@@ -33,7 +33,7 @@ class ScenarioTest(unittest.TestCase):
 
     def setUp(self):
         logging.basicConfig()
-        self.logger = logging.getLogger('test.test_scenario.ScenarioTest')
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.logger.setLevel(logging.DEBUG)
 
         base_directory = os.path.split(__file__)[0]

test/test_utils/io/test_CMDReader.py

@@ -21,7 +21,7 @@ class CMDReaderTest(unittest.TestCase):
 
     def setUp(self):
         logging.basicConfig()
-        self.logger = logging.getLogger('test.test_utils.io.CMDReaderTest')
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.logger.setLevel(logging.DEBUG)
         self.cr = CMDReader()
         self.current_dir = os.getcwd()

test/test_utils/io/test_traj_logging.py

@@ -27,7 +27,7 @@ def mocked_get_used_wallclock_time(self):
 
     def setUp(self):
         logging.basicConfig()
-        self.logger = logging.getLogger('test.test_utils.io.TrajLoggerTest')
+        self.logger = logging.getLogger(self.__module__ + "." + self.__class__.__name__)
         self.logger.setLevel(logging.DEBUG)
         self.value = 0
         self.cs = ConfigurationSpace()