Skip to content

[SPARK-7329][MLLIB] simplify ParamGridBuilder impl #5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-7329][MLLIB] simplify ParamGridBuilder impl #5873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7a7b9b
simplify grid build
mengxr May 3, 2015
d08f9cf
simplify tests
mengxr May 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions python/pyspark/ml/tuning.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# limitations under the License.
#

import itertools

__all__ = ['ParamGridBuilder']


Expand All @@ -37,14 +39,10 @@ class ParamGridBuilder(object):
{lr.regParam: 1.0, lr.featuresCol: 'f', lr.maxIter: 5, lr.labelCol: 'l', lr.predictionCol: 'p'}, \
{lr.regParam: 2.0, lr.featuresCol: 'f', lr.maxIter: 5, lr.labelCol: 'l', lr.predictionCol: 'p'}, \
{lr.regParam: 3.0, lr.featuresCol: 'f', lr.maxIter: 5, lr.labelCol: 'l', lr.predictionCol: 'p'}]
>>> fail_count = 0
>>> for e in expected:
... if e not in output:
... fail_count += 1
>>> if len(expected) != len(output):
... fail_count += 1
>>> fail_count
0
>>> len(output) == len(expected)
True
>>> all([m in expected for m in output])
True
"""

def __init__(self):
Expand Down Expand Up @@ -76,17 +74,9 @@ def build(self):
Builds and returns all combinations of parameters specified
by the param grid.
"""
param_maps = [{}]
for (param, values) in self._param_grid.items():
new_param_maps = []
for value in values:
for old_map in param_maps:
copied_map = old_map.copy()
copied_map[param] = value
new_param_maps.append(copied_map)
param_maps = new_param_maps

return param_maps
keys = self._param_grid.keys()
grid_values = self._param_grid.values()
return [dict(zip(keys, prod)) for prod in itertools.product(*grid_values)]


if __name__ == "__main__":
Expand Down