You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by me...@apache.org on 2015/05/09 06:55:58 UTC
spark git commit: [SPARK-7498] [ML] removed varargs annotation from
Params.setDefaults
Repository: spark
Updated Branches:
refs/heads/master 86ef4cfd4 -> 299262384
[SPARK-7498] [ML] removed varargs annotation from Params.setDefaults
In SPARK-7429 and PR https://github.com/apache/spark/pull/5960, I added the varargs annotation to Params.setDefault which takes a variable number of ParamPairs. It worked locally and on Jenkins for me.
However, mengxr reported issues compiling on his machine. So I'm reverting the change introduced in https://github.com/apache/spark/pull/5960 by removing varargs.
Author: Joseph K. Bradley <jo...@databricks.com>
Closes #6021 from jkbradley/revert-varargs and squashes the following commits:
098ed39 [Joseph K. Bradley] removed varargs annotation from Params.setDefaults taking multiple ParamPairs
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/29926238
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/29926238
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/29926238
Branch: refs/heads/master
Commit: 29926238418223b0888d418d163feebf0217b35e
Parents: 86ef4cf
Author: Joseph K. Bradley <jo...@databricks.com>
Authored: Fri May 8 21:55:54 2015 -0700
Committer: Xiangrui Meng <me...@databricks.com>
Committed: Fri May 8 21:55:54 2015 -0700
----------------------------------------------------------------------
mllib/src/main/scala/org/apache/spark/ml/param/params.scala | 3 ++-
mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/29926238/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/params.scala b/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
index 0e1b60d..7ebbf10 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
@@ -387,11 +387,12 @@ trait Params extends Identifiable with Serializable {
/**
* Sets default values for a list of params.
*
+ * Note: Java developers should use the single-parameter [[setDefault()]].
+ * Annotating this with varargs causes compilation failures. See SPARK-7498.
* @param paramPairs a list of param pairs that specify params and their default values to set
* respectively. Make sure that the params are initialized before this method
* gets called.
*/
- @varargs
protected final def setDefault(paramPairs: ParamPair[_]*): this.type = {
paramPairs.foreach { p =>
setDefault(p.param.asInstanceOf[Param[Any]], p.value)
http://git-wip-us.apache.org/repos/asf/spark/blob/29926238/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
----------------------------------------------------------------------
diff --git a/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java b/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
index 532eca4..8abe575 100644
--- a/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
+++ b/mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java
@@ -59,6 +59,5 @@ public class JavaTestParams extends JavaParams {
ParamValidators.inArray(validStrings));
setDefault(myIntParam, 1);
setDefault(myDoubleParam, 0.5);
- setDefault(myIntParam.w(1), myDoubleParam.w(0.5));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org