Skip to content

[SPARK-30418][ML] Make FM call super class method extractLabeledPoints #27093

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

Closed
huaxingao wants to merge 2 commits into from
Closed

[SPARK-30418][ML] Make FM call super class method extractLabeledPoints #27093

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6895c67
[SPARK-30418][ML] Make FM call super class method extractLabeledPoints
huaxingao Jan 3, 2020
b0c01c4
remove extra space
huaxingao Jan 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions mllib/src/main/scala/org/apache/spark/ml/classification/FMClassifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,8 @@ class FMClassifier @Since("3.0.0") (
instr.logNumFeatures(numFeatures)

val handlePersistence = dataset.storageLevel == StorageLevel.NONE
val data: RDD[(Double, OldVector)] =
dataset.select(col($(labelCol)), col($(featuresCol))).rdd.map {
case Row(label: Double, features: Vector) =>
require(label == 0 || label == 1, s"FMClassifier was given" +
s" dataset with invalid label $label. Labels must be in {0,1}; note that" +
s" FMClassifier currently only supports binary classification.")
(label, features)
}
val labeledPoint = extractLabeledPoints (dataset, numClasses)

@srowen srowen Jan 5, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: remove extra space before method call

@huaxingao huaxingao Jan 5, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed. Thanks!

val data: RDD[(Double, OldVector)] = labeledPoint.map(x => (x.label, x.features))

if (handlePersistence) data.persist(StorageLevel.MEMORY_AND_DISK)

Expand Down
7 changes: 2 additions & 5 deletions mllib/src/main/scala/org/apache/spark/ml/regression/FMRegressor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,8 @@ class FMRegressor @Since("3.0.0") (
instr.logNumFeatures(numFeatures)

val handlePersistence = dataset.storageLevel == StorageLevel.NONE
val data: RDD[(Double, OldVector)] =
dataset.select(col($(labelCol)), col($(featuresCol))).rdd.map {
case Row(label: Double, features: Vector) =>
(label, features)
}
val labeledPoint = extractLabeledPoints (dataset)
val data: RDD[(Double, OldVector)] = labeledPoint.map(x => (x.label, x.features))

if (handlePersistence) data.persist(StorageLevel.MEMORY_AND_DISK)

Expand Down