From 77f64c736d07a44f64393910d092091e8ba6047a Mon Sep 17 00:00:00 2001 From: Xiangrui Meng Date: Tue, 12 May 2015 17:15:39 -0700 Subject: [SPARK-7572] [MLLIB] do not import Param/Params under pyspark.ml Remove `Param` and `Params` from `pyspark.ml` and add a section in the doc. brkyvz Author: Xiangrui Meng Closes #6094 from mengxr/SPARK-7572 and squashes the following commits: 022abd6 [Xiangrui Meng] do not import Param/Params under spark.ml --- python/docs/pyspark.ml.rst | 10 +++++++++- python/pyspark/ml/__init__.py | 5 ++--- python/pyspark/ml/pipeline.py | 3 --- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'python') diff --git a/python/docs/pyspark.ml.rst b/python/docs/pyspark.ml.rst index a42217a4ae..8379b8fc8a 100644 --- a/python/docs/pyspark.ml.rst +++ b/python/docs/pyspark.ml.rst @@ -1,7 +1,7 @@ pyspark.ml package ===================== -Module Context +ML Pipeline APIs -------------- .. automodule:: pyspark.ml @@ -9,6 +9,14 @@ Module Context :undoc-members: :inherited-members: +pyspark.ml.param module +------------------------- + +.. automodule:: pyspark.ml.param + :members: + :undoc-members: + :inherited-members: + pyspark.ml.feature module ------------------------- diff --git a/python/pyspark/ml/__init__.py b/python/pyspark/ml/__init__.py index 47fed80f42..da793d9db7 100644 --- a/python/pyspark/ml/__init__.py +++ b/python/pyspark/ml/__init__.py @@ -15,7 +15,6 @@ # limitations under the License. # -from pyspark.ml.param import * -from pyspark.ml.pipeline import * +from pyspark.ml.pipeline import Transformer, Estimator, Model, Pipeline, PipelineModel, Evaluator -__all__ = ["Param", "Params", "Transformer", "Estimator", "Pipeline"] +__all__ = ["Transformer", "Estimator", "Model", "Pipeline", "PipelineModel", "Evaluator"] diff --git a/python/pyspark/ml/pipeline.py b/python/pyspark/ml/pipeline.py index fdbae06405..a328bcf84a 100644 --- a/python/pyspark/ml/pipeline.py +++ b/python/pyspark/ml/pipeline.py @@ -22,9 +22,6 @@ from pyspark.ml.util import keyword_only from pyspark.mllib.common import inherit_doc -__all__ = ['Estimator', 'Transformer', 'Pipeline', 'PipelineModel', 'Evaluator', 'Model'] - - @inherit_doc class Estimator(Params): """ -- cgit v1.2.3