Use None for combination of parameters that are irrelevant rather tha…

…n ''
soda-inria · Oct 18, 2023 · 5ca6c70 · 5ca6c70
1 parent 827452a
commit 5ca6c70
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/benchmarks/pca/objective.py b/benchmarks/pca/objective.py
@@ -16,7 +16,6 @@ class Objective(BaseObjective):
     parameters = dict(
         n_components=[10],
         tol=[0.0],
-        iterated_power=[15],
         n_oversamples=[10],
         random_state=[123],
         verbose=[False],

diff --git a/benchmarks/pca/solvers/scikit_learn.py b/benchmarks/pca/solvers/scikit_learn.py
@@ -13,9 +13,9 @@ class Solver(BaseSolver):
 
     parameters = {
         "svd_solver, power_iteration_normalizer": [
-            ("full", ""),
+            ("full", None),
             ("randomized", "LU"),
-            ("arpack", ""),
+            ("arpack", None),
         ],
         "iterated_power": ["auto"],
     }
@@ -34,11 +34,11 @@ def set_objective(
     ):
         if (
             self.svd_solver in {"full", "arpack"}
-            and self.power_iteration_normalizer != ""
+            and self.power_iteration_normalizer is not None
         ):
             raise ValueError(
                 f"svd_solver {self.svd_solver} can only run if "
-                "power_iteration_normalizer parameter is set to 0, but got "
+                "power_iteration_normalizer parameter is set to None, but got "
                 f"power_iteration_normalizer={self.power_iteration_normalizer}"
             )
 
@@ -55,7 +55,7 @@ def set_objective(
 
     def run(self, _):
         power_iteration_normalizer = self.power_iteration_normalizer
-        if power_iteration_normalizer == "":
+        if power_iteration_normalizer is None:
             power_iteration_normalizer = "auto"
 
         estimator = PCA(

diff --git a/benchmarks/pca/solvers/scikit_learn_intelex.py b/benchmarks/pca/solvers/scikit_learn_intelex.py
@@ -27,9 +27,9 @@ class Solver(BaseSolver):
             ("gpu", "level_zero"),
         ],
         "svd_solver, power_iteration_normalizer": [
-            ("full", ""),
+            ("full", None),
             ("randomized", "LU"),
-            ("arpack", ""),
+            ("arpack", None),
         ],
         "iterated_power": ["auto"],
     }
@@ -66,11 +66,11 @@ def set_objective(
     ):
         if (
             self.svd_solver in {"full", "arpack"}
-            and self.power_iteration_normalizer != ""
+            and self.power_iteration_normalizer is not None
         ):
             raise ValueError(
                 f"svd_solver {self.svd_solver} can only run if "
-                "power_iteration_normalizer parameter is set to 0, but got "
+                "power_iteration_normalizer parameter is set to None, but got "
                 f"power_iteration_normalizer={self.power_iteration_normalizer}"
             )
 
@@ -92,7 +92,7 @@ def set_objective(
 
     def run(self, _):
         power_iteration_normalizer = self.power_iteration_normalizer
-        if power_iteration_normalizer == "":
+        if power_iteration_normalizer is None:
             power_iteration_normalizer = "auto"
 
         estimator = PCA(

diff --git a/benchmarks/pca/solvers/sklearn_torch_dispatch.py b/benchmarks/pca/solvers/sklearn_torch_dispatch.py
@@ -26,7 +26,7 @@ class Solver(BaseSolver):
 
     parameters = {
         "svd_solver, power_iteration_normalizer": [
-            ("full", ""),
+            ("full", None),
             ("randomized", "QR"),
         ],
         "device": ["cpu", "xpu", "cuda", "mps"],
@@ -61,11 +61,11 @@ def set_objective(
     ):
         if (
             self.svd_solver in {"full", "arpack"}
-            and self.power_iteration_normalizer != ""
+            and self.power_iteration_normalizer is not None
         ):
             raise ValueError(
                 f"svd_solver {self.svd_solver} can only run if "
-                "power_iteration_normalizer parameter is set to 0, but got "
+                "power_iteration_normalizer parameter is set to None, but got "
                 f"power_iteration_normalizer={self.power_iteration_normalizer}"
             )
 
@@ -82,7 +82,7 @@ def set_objective(
 
     def run(self, _):
         power_iteration_normalizer = self.power_iteration_normalizer
-        if power_iteration_normalizer == "":
+        if power_iteration_normalizer is None:
             power_iteration_normalizer = "auto"
 
         with config_context(array_api_dispatch=True):