From 9292cb088c9972114785524708f17e1704520620 Mon Sep 17 00:00:00 2001 From: mhead Date: Mon, 23 Aug 2021 19:36:03 +0530 Subject: [PATCH 1/2] Compute predictions from selected model --- supervised/automl.py | 4 ++-- supervised/base_automl.py | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/supervised/automl.py b/supervised/automl.py index 61425cee..ebc03bd0 100644 --- a/supervised/automl.py +++ b/supervised/automl.py @@ -336,7 +336,7 @@ def fit(self, X, y, sample_weight=None, cv=None): """ return self._fit(X, y, sample_weight, cv) - def predict(self, X): + def predict(self, X, model=None): """ Computes predictions from AutoML best model. @@ -353,7 +353,7 @@ def predict(self, X): Raises: AutoMLException: Model has not yet been fitted. """ - return self._predict(X) + return self._predict(X, model) def predict_proba(self, X): """ diff --git a/supervised/base_automl.py b/supervised/base_automl.py index e57f344c..d7185ac8 100644 --- a/supervised/base_automl.py +++ b/supervised/base_automl.py @@ -1301,9 +1301,19 @@ def _base_predict(self, X, model=None): else: return predictions - def _predict(self, X): + def _predict(self, X, modelname=None): - predictions = self._base_predict(X) + model = None + if modelname != None: + for i in self._models: + if modelname == i.get_name(): + model = i + + + if modelname != None and model == None: + raise AutoMLException("invaild model") + + predictions = self._base_predict(X, model) # Return predictions # If classification task the result is in column 'label' # If regression task the result is in column 'prediction' From 991463707bfad3e7268ae0125233e56727e1f374 Mon Sep 17 00:00:00 2001 From: mhead Date: Fri, 27 Aug 2021 15:38:43 +0530 Subject: [PATCH 2/2] Compute predictions from selected model --- supervised/automl.py | 4 ++-- supervised/base_automl.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/supervised/automl.py b/supervised/automl.py index 61425cee..ebc03bd0 100644 --- a/supervised/automl.py +++ b/supervised/automl.py @@ -336,7 +336,7 @@ def fit(self, X, y, sample_weight=None, cv=None): """ return self._fit(X, y, sample_weight, cv) - def predict(self, X): + def predict(self, X, model=None): """ Computes predictions from AutoML best model. @@ -353,7 +353,7 @@ def predict(self, X): Raises: AutoMLException: Model has not yet been fitted. """ - return self._predict(X) + return self._predict(X, model) def predict_proba(self, X): """ diff --git a/supervised/base_automl.py b/supervised/base_automl.py index e57f344c..d7db67e1 100644 --- a/supervised/base_automl.py +++ b/supervised/base_automl.py @@ -1301,9 +1301,21 @@ def _base_predict(self, X, model=None): else: return predictions - def _predict(self, X): + def _predict(self, X, modelname=None): - predictions = self._base_predict(X) + model = None + if not self._models: + self.load(self.results_path) + if modelname != None: + for i in self._models: + if modelname == i.get_name(): + model = i + + + if modelname != None and model == None: + raise AutoMLException("invaild model") + + predictions = self._base_predict(X, model) # Return predictions # If classification task the result is in column 'label' # If regression task the result is in column 'prediction'