From 5ff8b6fa6cc73c3cc378925098b2244e8142b124 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 31 Aug 2020 12:13:46 +0200
Subject: [PATCH 1/3] Revert "Merge branch 'supervised' into 'master'"

This reverts merge request !36
---
 bob/pipelines/wrappers.py | 2 +-
 doc/checkpoint.rst        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bob/pipelines/wrappers.py b/bob/pipelines/wrappers.py
index 885acfa..45d3786 100644
--- a/bob/pipelines/wrappers.py
+++ b/bob/pipelines/wrappers.py
@@ -163,7 +163,7 @@ class SampleWrapper(BaseWrapper, TransformerMixin):
 
         X = SampleBatch(samples)
 
-        self.estimator = self.estimator.fit(X, y=y, **kwargs)
+        self.estimator = self.estimator.fit(X, **kwargs)
         copy_learned_attributes(self.estimator, self)
         return self
 
diff --git a/doc/checkpoint.rst b/doc/checkpoint.rst
index 0646c7b..2f3ed31 100644
--- a/doc/checkpoint.rst
+++ b/doc/checkpoint.rst
@@ -40,7 +40,7 @@ transformer.
    ...         print(f"Transforming {len(X)} samples ...")
    ...         return np.array(X) + np.array(sample_specific_offsets)
    ...
-   ...     def fit(self, X, y=None):
+   ...     def fit(self, X):
    ...         print("Fit was called!")
    ...         return self
 
-- 
GitLab


From 53e83a447190255c7c6e1d4f3992f531bb38104d Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Wed, 2 Sep 2020 12:24:35 +0200
Subject: [PATCH 2/3] Raise an error if y is not None

---
 bob/pipelines/wrappers.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bob/pipelines/wrappers.py b/bob/pipelines/wrappers.py
index 45d3786..0297c78 100644
--- a/bob/pipelines/wrappers.py
+++ b/bob/pipelines/wrappers.py
@@ -153,6 +153,12 @@ class SampleWrapper(BaseWrapper, TransformerMixin):
         return self._samples_transform(samples, "score")
 
     def fit(self, samples, y=None):
+        if y is not None:
+            raise TypeError(
+                "We don't accept `y` in fit arguments because "
+                "`y` should be part of the sample. To pass `y` "
+                "to the wrapped estimator, use `fit_extra_arguments`."
+            )
 
         if is_estimator_stateless(self.estimator):
             return self
-- 
GitLab


From 0dfd922a600b2ebb722cb2280322d8cf800b8404 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Wed, 2 Sep 2020 12:24:50 +0200
Subject: [PATCH 3/3] relax test threshold

---
 doc/xarray.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/xarray.rst b/doc/xarray.rst
index c6fd4bd..53cd961 100644
--- a/doc/xarray.rst
+++ b/doc/xarray.rst
@@ -445,7 +445,7 @@ provide dask-ml estimators, set ``input_dask_array`` as ``True``.
    >>> ds = pipeline.fit(dataset).predict(dataset)
    >>> ds = ds.compute()
    >>> correct_classification = np.array(ds.data == ds.target).sum()
-   >>> correct_classification > 90
+   >>> correct_classification > 85
    True
    >>> ds.dims == {"sample": 150}
    True
-- 
GitLab