spark git commit: [SPARK-16127][ML][PYPSARK] Audit @Since annotations related to ml.linalg
Repository: spark Updated Branches: refs/heads/master ea3a12b01 -> 18faa588c [SPARK-16127][ML][PYPSARK] Audit @Since annotations related to ml.linalg [SPARK-14615](https://issues.apache.org/jira/browse/SPARK-14615) and #12627 changed `spark.ml` pipelines to use the new `ml.linalg` classes for `Vector`/`Matrix`. Some `Since` annotations for public methods/vals have not been updated accordingly to be `2.0.0`. This PR updates them. ## How was this patch tested? Existing unit tests. Author: Nick Pentreath Closes #13840 from MLnick/SPARK-16127-ml-linalg-since. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/18faa588 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/18faa588 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/18faa588 Branch: refs/heads/master Commit: 18faa588ca11190890d2eb569d7497fbb25eee5c Parents: ea3a12b Author: Nick Pentreath Authored: Wed Jun 22 10:05:25 2016 -0700 Committer: Xiangrui Meng Committed: Wed Jun 22 10:05:25 2016 -0700 -- .../spark/ml/classification/LogisticRegression.scala| 2 +- .../classification/MultilayerPerceptronClassifier.scala | 2 +- .../org/apache/spark/ml/classification/NaiveBayes.scala | 4 ++-- .../scala/org/apache/spark/ml/clustering/KMeans.scala | 2 +- .../main/scala/org/apache/spark/ml/clustering/LDA.scala | 4 ++-- .../apache/spark/ml/feature/ElementwiseProduct.scala| 6 +++--- .../scala/org/apache/spark/ml/feature/Normalizer.scala | 12 ++-- .../apache/spark/ml/feature/PolynomialExpansion.scala | 12 ++-- .../scala/org/apache/spark/ml/feature/Word2Vec.scala| 2 +- .../spark/ml/regression/AFTSurvivalRegression.scala | 6 +++--- .../apache/spark/ml/regression/IsotonicRegression.scala | 4 ++-- .../apache/spark/ml/regression/LinearRegression.scala | 6 +++--- python/pyspark/ml/classification.py | 8 python/pyspark/ml/regression.py | 8 ++-- 14 files changed, 41 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/18faa588/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala -- diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala index 2fa8fbc..be69d46 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala @@ -482,7 +482,7 @@ object LogisticRegression extends DefaultParamsReadable[LogisticRegression] { @Experimental class LogisticRegressionModel private[spark] ( @Since("1.4.0") override val uid: String, -@Since("1.6.0") val coefficients: Vector, +@Since("2.0.0") val coefficients: Vector, @Since("1.3.0") val intercept: Double) extends ProbabilisticClassificationModel[Vector, LogisticRegressionModel] with LogisticRegressionParams with MLWritable { http://git-wip-us.apache.org/repos/asf/spark/blob/18faa588/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala -- diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala index 7005421..76ef32a 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala @@ -296,7 +296,7 @@ object MultilayerPerceptronClassifier class MultilayerPerceptronClassificationModel private[ml] ( @Since("1.5.0") override val uid: String, @Since("1.5.0") val layers: Array[Int], -@Since("1.5.0") val weights: Vector) +@Since("2.0.0") val weights: Vector) extends PredictionModel[Vector, MultilayerPerceptronClassificationModel] with Serializable with MLWritable { http://git-wip-us.apache.org/repos/asf/spark/blob/18faa588/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala -- diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala index a9d4930..7c34031 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala @@ -130,8 +130,8 @@ object NaiveBayes extends DefaultParamsReadable[NaiveBayes] {
spark git commit: [SPARK-16127][ML][PYPSARK] Audit @Since annotations related to ml.linalg
Repository: spark Updated Branches: refs/heads/branch-2.0 1cfdd25fd -> 0cde3ad6d [SPARK-16127][ML][PYPSARK] Audit @Since annotations related to ml.linalg [SPARK-14615](https://issues.apache.org/jira/browse/SPARK-14615) and #12627 changed `spark.ml` pipelines to use the new `ml.linalg` classes for `Vector`/`Matrix`. Some `Since` annotations for public methods/vals have not been updated accordingly to be `2.0.0`. This PR updates them. ## How was this patch tested? Existing unit tests. Author: Nick Pentreath Closes #13840 from MLnick/SPARK-16127-ml-linalg-since. (cherry picked from commit 18faa588ca11190890d2eb569d7497fbb25eee5c) Signed-off-by: Xiangrui Meng Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0cde3ad6 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0cde3ad6 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0cde3ad6 Branch: refs/heads/branch-2.0 Commit: 0cde3ad6d8ac822b73f42b8158ba09f7be00a2c9 Parents: 1cfdd25 Author: Nick Pentreath Authored: Wed Jun 22 10:05:25 2016 -0700 Committer: Xiangrui Meng Committed: Wed Jun 22 10:05:31 2016 -0700 -- .../spark/ml/classification/LogisticRegression.scala| 2 +- .../classification/MultilayerPerceptronClassifier.scala | 2 +- .../org/apache/spark/ml/classification/NaiveBayes.scala | 4 ++-- .../scala/org/apache/spark/ml/clustering/KMeans.scala | 2 +- .../main/scala/org/apache/spark/ml/clustering/LDA.scala | 4 ++-- .../apache/spark/ml/feature/ElementwiseProduct.scala| 6 +++--- .../scala/org/apache/spark/ml/feature/Normalizer.scala | 12 ++-- .../apache/spark/ml/feature/PolynomialExpansion.scala | 12 ++-- .../scala/org/apache/spark/ml/feature/Word2Vec.scala| 2 +- .../spark/ml/regression/AFTSurvivalRegression.scala | 6 +++--- .../apache/spark/ml/regression/IsotonicRegression.scala | 4 ++-- .../apache/spark/ml/regression/LinearRegression.scala | 6 +++--- python/pyspark/ml/classification.py | 8 python/pyspark/ml/regression.py | 8 ++-- 14 files changed, 41 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/0cde3ad6/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala -- diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala index 2fa8fbc..be69d46 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala @@ -482,7 +482,7 @@ object LogisticRegression extends DefaultParamsReadable[LogisticRegression] { @Experimental class LogisticRegressionModel private[spark] ( @Since("1.4.0") override val uid: String, -@Since("1.6.0") val coefficients: Vector, +@Since("2.0.0") val coefficients: Vector, @Since("1.3.0") val intercept: Double) extends ProbabilisticClassificationModel[Vector, LogisticRegressionModel] with LogisticRegressionParams with MLWritable { http://git-wip-us.apache.org/repos/asf/spark/blob/0cde3ad6/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala -- diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala index 7005421..76ef32a 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/classification/MultilayerPerceptronClassifier.scala @@ -296,7 +296,7 @@ object MultilayerPerceptronClassifier class MultilayerPerceptronClassificationModel private[ml] ( @Since("1.5.0") override val uid: String, @Since("1.5.0") val layers: Array[Int], -@Since("1.5.0") val weights: Vector) +@Since("2.0.0") val weights: Vector) extends PredictionModel[Vector, MultilayerPerceptronClassificationModel] with Serializable with MLWritable { http://git-wip-us.apache.org/repos/asf/spark/blob/0cde3ad6/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala -- diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala index a9d4930..7c34031 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/classification/NaiveBayes.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/classif