Base Version

MrinalTyagi · MrinalTyagi · commit b6abb1209f3c · 2021-12-05T01:27:28.000+05:30
diff --git a/sklearn/model_selection/_search.py b/sklearn/model_selection/_search.py
@@ -1385,10 +1385,10 @@ def __init__(
             return_train_score=return_train_score,
         )
         self.param_grid = param_grid
-        _check_param_grid(param_grid)
 
     def _run_search(self, evaluate_candidates):
         """Search all candidates in param_grid"""
+        _check_param_grid(self.param_grid)
         evaluate_candidates(ParameterGrid(self.param_grid))
 
 
diff --git a/sklearn/model_selection/_search_successive_halving.py b/sklearn/model_selection/_search_successive_halving.py
@@ -714,9 +714,9 @@ def __init__(
             aggressive_elimination=aggressive_elimination,
         )
         self.param_grid = param_grid
-        _check_param_grid(self.param_grid)
 
     def _generate_candidate_params(self):
+        _check_param_grid(self.param_grid)
         return ParameterGrid(self.param_grid)
 
 
diff --git a/sklearn/tests/test_common.py b/sklearn/tests/test_common.py
@@ -426,8 +426,6 @@ def test_transformers_get_feature_names_out(transformer):
     "ColumnTransformer",
     "FeatureHasher",
     "FeatureUnion",
-    "GridSearchCV",
-    "HalvingGridSearchCV",
     "Pipeline",
     "SGDOneClassSVM",
     "TheilSenRegressor",

Original file line number	Diff line number	Diff line change
`@@ -1385,10 +1385,10 @@ def __init__(`
`1385`	`1385`	`return_train_score=return_train_score,`
`1386`	`1386`	`)`
`1387`	`1387`	`self.param_grid = param_grid`
`1388`		`- _check_param_grid(param_grid)`
`1389`	`1388`
`1390`	`1389`	`def _run_search(self, evaluate_candidates):`
`1391`	`1390`	`"""Search all candidates in param_grid"""`
	`1391`	`+ _check_param_grid(self.param_grid)`
`1392`	`1392`	`evaluate_candidates(ParameterGrid(self.param_grid))`
`1393`	`1393`
`1394`	`1394`
Original file line number	Diff line number	Diff line change
`@@ -714,9 +714,9 @@ def __init__(`
`714`	`714`	`aggressive_elimination=aggressive_elimination,`
`715`	`715`	`)`
`716`	`716`	`self.param_grid = param_grid`
`717`		`- _check_param_grid(self.param_grid)`
`718`	`717`
`719`	`718`	`def _generate_candidate_params(self):`
	`719`	`+ _check_param_grid(self.param_grid)`
`720`	`720`	`return ParameterGrid(self.param_grid)`
`721`	`721`
`722`	`722`