You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by yl...@apache.org on 2016/08/23 00:09:15 UTC
spark git commit: [SPARK-17090][FOLLOW-UP][ML] Add expert param
support to SharedParamsCodeGen
Repository: spark
Updated Branches:
refs/heads/master 6d93f9e02 -> 37f0ab70d
[SPARK-17090][FOLLOW-UP][ML] Add expert param support to SharedParamsCodeGen
## What changes were proposed in this pull request?
Add expert param support to SharedParamsCodeGen where aggregationDepth a expert param is added.
Author: hqzizania <hq...@gmail.com>
Closes #14738 from hqzizania/SPARK-17090-minor.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/37f0ab70
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/37f0ab70
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/37f0ab70
Branch: refs/heads/master
Commit: 37f0ab70d25802b609317bc93421d2fe3ee9db6e
Parents: 6d93f9e
Author: hqzizania <hq...@gmail.com>
Authored: Mon Aug 22 17:09:08 2016 -0700
Committer: Yanbo Liang <yb...@gmail.com>
Committed: Mon Aug 22 17:09:08 2016 -0700
----------------------------------------------------------------------
.../spark/ml/param/shared/SharedParamsCodeGen.scala | 14 ++++++++++----
.../apache/spark/ml/param/shared/sharedParams.scala | 4 ++--
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/37f0ab70/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamsCodeGen.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamsCodeGen.scala b/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamsCodeGen.scala
index 0f48a16..480b03d 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamsCodeGen.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamsCodeGen.scala
@@ -80,7 +80,7 @@ private[shared] object SharedParamsCodeGen {
ParamDesc[String]("solver", "the solver algorithm for optimization. If this is not set or " +
"empty, default value is 'auto'", Some("\"auto\"")),
ParamDesc[Int]("aggregationDepth", "suggested depth for treeAggregate (>= 2)", Some("2"),
- isValid = "ParamValidators.gtEq(2)"))
+ isValid = "ParamValidators.gtEq(2)", isExpertParam = true))
val code = genSharedParams(params)
val file = "src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala"
@@ -95,7 +95,8 @@ private[shared] object SharedParamsCodeGen {
doc: String,
defaultValueStr: Option[String] = None,
isValid: String = "",
- finalMethods: Boolean = true) {
+ finalMethods: Boolean = true,
+ isExpertParam: Boolean = false) {
require(name.matches("[a-z][a-zA-Z0-9]*"), s"Param name $name is invalid.")
require(doc.nonEmpty) // TODO: more rigorous on doc
@@ -153,6 +154,11 @@ private[shared] object SharedParamsCodeGen {
} else {
""
}
+ val groupStr = if (param.isExpertParam) {
+ Array("expertParam", "expertGetParam")
+ } else {
+ Array("param", "getParam")
+ }
val methodStr = if (param.finalMethods) {
"final def"
} else {
@@ -167,11 +173,11 @@ private[shared] object SharedParamsCodeGen {
|
| /**
| * Param for $doc.
- | * @group param
+ | * @group ${groupStr(0)}
| */
| final val $name: $Param = new $Param(this, "$name", "$doc"$isValid)
|$setDefault
- | /** @group getParam */
+ | /** @group ${groupStr(1)} */
| $methodStr get$Name: $T = $$($name)
|}
|""".stripMargin
http://git-wip-us.apache.org/repos/asf/spark/blob/37f0ab70/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala b/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala
index 6803772..9125d9e 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala
@@ -397,13 +397,13 @@ private[ml] trait HasAggregationDepth extends Params {
/**
* Param for suggested depth for treeAggregate (>= 2).
- * @group param
+ * @group expertParam
*/
final val aggregationDepth: IntParam = new IntParam(this, "aggregationDepth", "suggested depth for treeAggregate (>= 2)", ParamValidators.gtEq(2))
setDefault(aggregationDepth, 2)
- /** @group getParam */
+ /** @group expertGetParam */
final def getAggregationDepth: Int = $(aggregationDepth)
}
// scalastyle:on
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org