Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SW-1259] Unify ratio param across pipeline api #1211

Merged
merged 4 commits into from
May 22, 2019
Merged

[SW-1259] Unify ratio param across pipeline api #1211

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45d17b3
[SW-1259] Unify ratio param across pipeline api
jakubhava May 22, 2019
0359cbd
splitRatio on PySparkling side
jakubhava May 22, 2019
badc882
remove ratio from H2OALgoParams
jakubhava May 22, 2019
de8a55f
fix comment
jakubhava May 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions ml/src/main/scala/org/apache/spark/ml/h2o/algos/H2OAutoML.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ trait H2OAutoMLParams extends H2OCommonParams with DeprecatableParams {
setDefault(
allStringColumnsToCategorical -> true,
columnsToCategorical -> Array.empty[String],
ratio -> 1.0, // 1.0 means use whole frame as training frame,
ignoredCols -> Array.empty[String],
includeAlgos -> null,
excludeAlgos -> null,
Expand Down Expand Up @@ -212,7 +211,8 @@ trait H2OAutoMLParams extends H2OCommonParams with DeprecatableParams {

def getColumnsToCategorical(): Array[String] = $(columnsToCategorical)

def getRatio(): Double = $(ratio)
@DeprecatedMethod("getSplitRatio")
def getRatio(): Double = getSplitRatio()

@DeprecatedMethod("getFoldCol")
def getFoldColumn() = getFoldCol()
Expand Down Expand Up @@ -271,7 +271,8 @@ trait H2OAutoMLParams extends H2OCommonParams with DeprecatableParams {

def setColumnsToCategorical(columns: Array[String]): this.type = set(columnsToCategorical, columns)

def setRatio(value: Double): this.type = set(ratio, value)
@DeprecatedMethod("setSplitRatio")
def setRatio(value: Double): this.type = setSplitRatio(value)

@DeprecatedMethod("setFoldCol")
def setFoldColumn(value: String): this.type = setFoldCol(value)
Expand Down
14 changes: 6 additions & 8 deletions ml/src/main/scala/org/apache/spark/ml/h2o/param/H2OAlgoParams.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,13 @@ import water.util.DeprecatedMethod
trait H2OAlgoParams[P <: Parameters] extends H2OAlgoParamsHelper[P] with H2OCommonParams with DeprecatableParams {

override protected def renamingMap: Map[String, String] = Map(
"predictionCol" -> "labelCol"
"predictionCol" -> "labelCol",
"splitRatio" -> "ratio"
)

//
// Param definitions
//
private val ratio = doubleParam(
"ratio",
"Determines in which ratios split the dataset")

private val allStringColumnsToCategorical = booleanParam(
"allStringColumnsToCategorical",
"Transform all strings columns to categorical")
Expand All @@ -60,7 +57,6 @@ trait H2OAlgoParams[P <: Parameters] extends H2OAlgoParamsHelper[P] with H2OComm
// Default values
//
setDefault(
ratio -> 1.0, // 1.0 means use whole frame as training frame
nfolds -> parameters._nfolds,
allStringColumnsToCategorical -> true,
columnsToCategorical -> Array.empty[String],
Expand All @@ -75,7 +71,8 @@ trait H2OAlgoParams[P <: Parameters] extends H2OAlgoParamsHelper[P] with H2OComm
//
// Getters
//
def getTrainRatio(): Double = $(ratio)
@DeprecatedMethod("getSplitRatio")
def getTrainRatio(): Double = getSplitRatio()

@DeprecatedMethod("getLabelCol")
def getPredictionCol(): String = getLabelCol()
Expand All @@ -101,7 +98,8 @@ trait H2OAlgoParams[P <: Parameters] extends H2OAlgoParamsHelper[P] with H2OComm
//
// Setters
//
def setTrainRatio(value: Double): this.type = set(ratio, value)
@DeprecatedMethod("setSplitRatio")
def setTrainRatio(value: Double): this.type = setSplitRatio(value)

@DeprecatedMethod("setLabelCol")
def setPredictionCol(value: String): this.type = setLabelCol(value)
Expand Down
9 changes: 7 additions & 2 deletions ml/src/main/scala/org/apache/spark/ml/h2o/param/H2OCommonParams.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.apache.spark.ml.h2o.param

import org.apache.spark.internal.Logging
import org.apache.spark.ml.param.{Param, Params, StringArrayParam}
import org.apache.spark.ml.param.{DoubleParam, Param, Params, StringArrayParam}

/**
* This trait contains parameters that are shared across all algorithms.
Expand All @@ -28,6 +28,8 @@ trait H2OCommonParams extends Params with Logging {
private val labelCol = new Param[String](this, "labelCol", "Label column name")
private val foldCol = new NullableStringParam(this, "foldCol", "Fold column name")
private val weightCol = new NullableStringParam(this, "weightCol", "Weight column name")
private val splitRatio = new DoubleParam(this, "splitRatio",
"Accepts value from 0 to 1.0 and determine how large part of dataset will be used for training and for validation")
jakubhava marked this conversation as resolved.
Show resolved Hide resolved

//
// Default values
Expand All @@ -36,7 +38,8 @@ trait H2OCommonParams extends Params with Logging {
featuresCols -> Array.empty[String],
labelCol -> "label",
foldCol -> null,
weightCol -> null
weightCol -> null,
splitRatio -> 1.0 // Use whole frame as training frame
)

//
Expand All @@ -53,6 +56,7 @@ trait H2OCommonParams extends Params with Logging {

def getWeightCol(): String = $(weightCol)

def getSplitRatio(): Double = $(splitRatio)
//
// Setters
//
Expand All @@ -71,6 +75,7 @@ trait H2OCommonParams extends Params with Logging {

def setWeightCol(columnName: String): this.type = set(weightCol, columnName)

def setSplitRatio(ratio: Double): this.type = set(splitRatio, ratio)
//
// Other methods
//
Expand Down