diff options
| author | Joseph K. Bradley <joseph@databricks.com> | 2015-05-10 13:29:27 -0700 |
|---|---|---|
| committer | Joseph K. Bradley <joseph@databricks.com> | 2015-05-10 13:29:27 -0700 |
| commit | 3038443e58b9320c56f7785d9e36d4f85a563e6b (patch) | |
| tree | 14cc2d4fd78334d9ce6c1ea1cf7704715bd79b31 /python | |
| parent | 6bf9352fa5d740d01ffdafbbb23d9732752a8d87 (diff) | |
| download | spark-3038443e58b9320c56f7785d9e36d4f85a563e6b.tar.gz spark-3038443e58b9320c56f7785d9e36d4f85a563e6b.tar.bz2 spark-3038443e58b9320c56f7785d9e36d4f85a563e6b.zip | |
[SPARK-7431] [ML] [PYTHON] Made CrossValidatorModel call parent init in PySpark
Fixes bug with PySpark cvModel not having UID
Also made small PySpark fixes: Evaluator should inherit from Params. MockModel should inherit from Model.
CC: mengxr
Author: Joseph K. Bradley <joseph@databricks.com>
Closes #5968 from jkbradley/pyspark-cv-uid and squashes the following commits:
57f13cd [Joseph K. Bradley] Made CrossValidatorModel call parent init in PySpark
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/ml/pipeline.py | 2 | ||||
| -rw-r--r-- | python/pyspark/ml/tests.py | 4 | ||||
| -rw-r--r-- | python/pyspark/ml/tuning.py | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/python/pyspark/ml/pipeline.py b/python/pyspark/ml/pipeline.py index c1b2077c98..fdbae06405 100644 --- a/python/pyspark/ml/pipeline.py +++ b/python/pyspark/ml/pipeline.py @@ -179,7 +179,7 @@ class PipelineModel(Model): return dataset -class Evaluator(object): +class Evaluator(Params): """ Base class for evaluators that compute metrics from predictions. """ diff --git a/python/pyspark/ml/tests.py b/python/pyspark/ml/tests.py index 3a42bcf723..75bb5d749c 100644 --- a/python/pyspark/ml/tests.py +++ b/python/pyspark/ml/tests.py @@ -34,7 +34,7 @@ from pyspark.tests import ReusedPySparkTestCase as PySparkTestCase from pyspark.sql import DataFrame from pyspark.ml.param import Param from pyspark.ml.param.shared import HasMaxIter, HasInputCol -from pyspark.ml.pipeline import Transformer, Estimator, Pipeline +from pyspark.ml.pipeline import Estimator, Model, Pipeline, Transformer class MockDataset(DataFrame): @@ -77,7 +77,7 @@ class MockEstimator(Estimator): return model -class MockModel(MockTransformer, Transformer): +class MockModel(MockTransformer, Model): def __init__(self): super(MockModel, self).__init__() diff --git a/python/pyspark/ml/tuning.py b/python/pyspark/ml/tuning.py index 28e3727f2c..86f4dc7368 100644 --- a/python/pyspark/ml/tuning.py +++ b/python/pyspark/ml/tuning.py @@ -236,6 +236,7 @@ class CrossValidatorModel(Model): """ def __init__(self, bestModel): + super(CrossValidatorModel, self).__init__() #: best model from cross validation self.bestModel = bestModel |