further integrated wall time

Author: janvanrijn

openml/extensions/sklearn/extension.py

@@ -1220,7 +1220,7 @@ def _prediction_to_probabilities(
             if can_measure_cputime:
                 modelfit_duration_cputime = (time.process_time() - modelfit_start_cputime) * 1000
                 user_defined_measures['usercpu_time_millis_training'] = modelfit_duration_cputime
-            elif can_measure_wallclocktime:
+            if can_measure_wallclocktime:
                 modelfit_duration_walltime = (time.time() - modelfit_start_walltime) * 1000
                 user_defined_measures['wall_clock_time_millis_training'] = modelfit_duration_walltime
 

tests/test_runs/test_run_functions.py

@@ -286,10 +286,13 @@ def _check_sample_evaluations(self, sample_evaluations, num_repeats,
         # a dict mapping from openml measure to a tuple with the minimum and
         # maximum allowed value
         check_measures = {
+            # should take at least one millisecond (?)
             'usercpu_time_millis_testing': (0, max_time_allowed),
             'usercpu_time_millis_training': (0, max_time_allowed),
-            # should take at least one millisecond (?)
             'usercpu_time_millis': (0, max_time_allowed),
+            'wall_clock_time_millis_training': (0, max_time_allowed),
+            'wall_clock_time_millis_testing': (0, max_time_allowed),
+            'wall_clock_time_millis': (0, max_time_allowed),
             'predictive_accuracy': (0, 1)}
 
         self.assertIsInstance(sample_evaluations, dict)