From 854794405324300c7999b17ef0f390fdbabd759d Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 15 Aug 2023 14:18:22 -0700 Subject: [PATCH 1/4] updated function call to the new selectors call --- tpot2/evolvers/base_evolver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpot2/evolvers/base_evolver.py b/tpot2/evolvers/base_evolver.py index 6654044f..f6fe1c77 100644 --- a/tpot2/evolvers/base_evolver.py +++ b/tpot2/evolvers/base_evolver.py @@ -645,7 +645,7 @@ def get_unevaluated_individuals(self, column_names, budget=None, individual_list def evaluate_population_selection_early_stop(self,survival_counts, thresholds=None, budget=None): - survival_selector = tpot2.parent_selectors.survival_select_NSGA2 + survival_selector = tpot2.selectors.survival_select_NSGA2 ################ From 987b1b641fd1799b6bdf03ac3af28d2ce456e26f Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 15 Aug 2023 14:32:13 -0700 Subject: [PATCH 2/4] forgot to include pop_size and generations in class arguments, this broke tutorial 7 --- tpot2/tpot_estimator/templates/tpottemplates.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tpot2/tpot_estimator/templates/tpottemplates.py b/tpot2/tpot_estimator/templates/tpottemplates.py index e972953f..a3a2f3ca 100644 --- a/tpot2/tpot_estimator/templates/tpottemplates.py +++ b/tpot2/tpot_estimator/templates/tpottemplates.py @@ -32,6 +32,8 @@ def __init__( self, warm_start = False, periodic_checkpoint_folder = None, verbose = 0, + population_size = 50, + generations = 50 ): """ See TPOTEstimator for documentation @@ -64,6 +66,8 @@ def __init__( self, periodic_checkpoint_folder = periodic_checkpoint_folder, verbose = verbose, classification=False, + population_size = population_size, + generations = generations ) @@ -94,6 +98,8 @@ def __init__( self, warm_start = False, periodic_checkpoint_folder = None, verbose = 0, + population_size = 50, + generations = 50 ): """ See TPOTEstimator for documentation @@ -126,6 +132,8 @@ def __init__( self, periodic_checkpoint_folder = periodic_checkpoint_folder, verbose = verbose, classification=True, + population_size = population_size, + generations = generations ) From 865f8c4cd73f765dc318cbe9c69a9240f5f686f7 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 15 Aug 2023 15:26:54 -0700 Subject: [PATCH 3/4] arguments missing for tutorials to work --- tpot2/tpot_estimator/templates/tpottemplates.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tpot2/tpot_estimator/templates/tpottemplates.py b/tpot2/tpot_estimator/templates/tpottemplates.py index a3a2f3ca..dd30ca62 100644 --- a/tpot2/tpot_estimator/templates/tpottemplates.py +++ b/tpot2/tpot_estimator/templates/tpottemplates.py @@ -33,7 +33,9 @@ def __init__( self, periodic_checkpoint_folder = None, verbose = 0, population_size = 50, - generations = 50 + generations = 50, + memory_limit = "4GB", + client = None ): """ See TPOTEstimator for documentation @@ -67,7 +69,9 @@ def __init__( self, verbose = verbose, classification=False, population_size = population_size, - generations = generations + generations = generations, + memory_limit = memory_limit, + client = client ) @@ -99,7 +103,10 @@ def __init__( self, periodic_checkpoint_folder = None, verbose = 0, population_size = 50, - generations = 50 + generations = 50, + memory_limit = "4GB", + client = None + ): """ See TPOTEstimator for documentation @@ -133,7 +140,9 @@ def __init__( self, verbose = verbose, classification=True, population_size = population_size, - generations = generations + generations = generations, + memory_limit = memory_limit, + client = client ) From e7209b678326162711cc20971aae4cb57355b8c6 Mon Sep 17 00:00:00 2001 From: Pedro Ribeiro Date: Wed, 16 Aug 2023 10:33:06 -0700 Subject: [PATCH 4/4] Update tpottemplates.py Removed population size and generations - want these classes to be simplified and abstract away the evolutionary algorithm stuff. --- tpot2/tpot_estimator/templates/tpottemplates.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tpot2/tpot_estimator/templates/tpottemplates.py b/tpot2/tpot_estimator/templates/tpottemplates.py index dd30ca62..2b85d6fe 100644 --- a/tpot2/tpot_estimator/templates/tpottemplates.py +++ b/tpot2/tpot_estimator/templates/tpottemplates.py @@ -32,8 +32,6 @@ def __init__( self, warm_start = False, periodic_checkpoint_folder = None, verbose = 0, - population_size = 50, - generations = 50, memory_limit = "4GB", client = None ): @@ -68,8 +66,6 @@ def __init__( self, periodic_checkpoint_folder = periodic_checkpoint_folder, verbose = verbose, classification=False, - population_size = population_size, - generations = generations, memory_limit = memory_limit, client = client ) @@ -102,8 +98,6 @@ def __init__( self, warm_start = False, periodic_checkpoint_folder = None, verbose = 0, - population_size = 50, - generations = 50, memory_limit = "4GB", client = None @@ -139,8 +133,6 @@ def __init__( self, periodic_checkpoint_folder = periodic_checkpoint_folder, verbose = verbose, classification=True, - population_size = population_size, - generations = generations, memory_limit = memory_limit, client = client ) @@ -149,4 +141,4 @@ def __init__( self, def predict(self, X, **predict_params): check_is_fitted(self) #X=check_array(X) - return self.fitted_pipeline_.predict(X,**predict_params) \ No newline at end of file + return self.fitted_pipeline_.predict(X,**predict_params)