simplify the extension interface even more

Author: mfeurer

openml/extensions/extension_interface.py

@@ -155,8 +155,6 @@ def _run_model_on_fold(
         y_train: np.ndarray,
         rep_no: int,
         fold_no: int,
-        sample_no: int,
-        add_local_measures: bool,
         X_test: Optional[Union[np.ndarray, scipy.sparse.spmatrix, pd.DataFrame]] = None,
         n_classes: Optional[int] = None,
     ) -> Tuple[List[List], List[List], 'OrderedDict[str, float]', Optional['OpenMLRunTrace']]:

openml/extensions/sklearn/extension.py

@@ -1102,8 +1102,6 @@ def _run_model_on_fold(
         y_train: np.ndarray,
         rep_no: int,
         fold_no: int,
-        sample_no: int,
-        add_local_measures: bool,
         X_test: Optional[Union[np.ndarray, scipy.sparse.spmatrix, pd.DataFrame]] = None,
         n_classes: Optional[int] = None,
     ) -> Tuple[np.ndarray, np.ndarray, 'OrderedDict[str, float]', Any]:
@@ -1269,10 +1267,11 @@ def _prediction_to_probabilities(
             proba_y = proba_y_new
 
             if proba_y.shape[1] != len(task.class_labels):
-                warnings.warn(
-                    "Repeat %d fold %d sample %d: estimator only predicted for %d/%d classes!"
-                    % (rep_no, fold_no, sample_no, proba_y.shape[1], len(task.class_labels))
-                )
+                message = "Estimator only predicted for {}/{} classes!".format(
+                        proba_y.shape[1], len(task.class_labels),
+                    )
+                warnings.warn(message)
+                openml.config.logger.warn(message)
 
         elif isinstance(task, OpenMLRegressionTask):
             proba_y = None

openml/runs/functions.py

@@ -209,6 +209,7 @@ def run_flow_on_task(
 
     # execute the run
     res = _run_task_get_arffcontent(
+        flow=flow,
         model=flow.model,
         task=task,
         extension=flow.extension,
@@ -369,6 +370,7 @@ def run_exists(task_id: int, setup_id: int) -> Set[int]:
 
 
 def _run_task_get_arffcontent(
+    flow: OpenMLFlow,
     model: Any,
     task: OpenMLTask,
     extension: 'Extension',
@@ -421,6 +423,11 @@ def _run_task_get_arffcontent(
                 else:
                     raise NotImplementedError(task.task_type)
 
+                config.logger.info(
+                    "Going to execute flow '%s' on task %d for repeat %d fold %d sample %d.",
+                    flow.name, task.task_id, rep_no, fold_no, sample_no,
+                )
+
                 (
                     pred_y,
                     proba_y,
@@ -433,8 +440,6 @@ def _run_task_get_arffcontent(
                     y_train=train_y,
                     rep_no=rep_no,
                     fold_no=fold_no,
-                    sample_no=sample_no,
-                    add_local_measures=add_local_measures,
                     X_test=test_x,
                     n_classes=n_classes,
                 )