Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
25 changes: 25 additions & 0 deletions docs/ml-clustering.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
layout: global
title: Clustering - ML
displayTitle: <a href="ml-guide.html">ML</a> - Clustering
---

In `spark.ml`, we implement the corresponding pipeline API for

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: The pipelines API is only a subset of mllib.clustering (at least the documentation certainly is), so I found this language a bit confusing. Can we omit it altogether at least until we have implemented/documented more than a single feature?

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.

How about, "In this section, we introduce the pipeline API for clustering in mllib" ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sgtm

On Thu, Nov 19, 2015, 01:56 Yuhao Yang notifications@github.com wrote:

In docs/ml-clustering.md
#9722 (comment):

@@ -0,0 +1,25 @@
+---
+layout: global
+title: Clustering - ML
+displayTitle: ML - Clustering
+---
+
+In spark.ml, we implement the corresponding pipeline API for

How about, "In this section, we introduce the pipeline API for clustering
in mllib http://mllib-clustering.html" ?


Reply to this email directly or view it on GitHub
https://github.com/apache/spark/pull/9722/files#r45290684.

[clustering in mllib](mllib-clustering.html).

## Latent Dirichlet allocation (LDA)

`LDA` is implemented as an Estimator that supports both `EMLDAOptimizer` and `OnlineLDAOptimizer`,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Estimator

and generates `LocalLDAModel` and `DistributedLDAModel` respectively, as the base models.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This isn't true; LDA generates a LDAModel which is the superclass of wrappers to the two mllib classes. I would just say "generates a LDAModel".

We can also mention that expert users may cast a LDAModel generated by EMLDAOptimizer to a DistributedLDAModel if needed.


<div class="codetabs">

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please link API docs for each language in code tab before example

<div data-lang="scala" markdown="1">
{% include_example scala/org/apache/spark/examples/ml/LDAExample.scala %}
</div>

<div data-lang="java" markdown="1">
{% include_example java/org/apache/spark/examples/ml/JavaLDAExample.java %}
</div>

</div>
1 change: 1 addition & 0 deletions docs/ml-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ provide class probabilities, and linear models provide model summaries.
* [Linear methods with elastic net regularization](ml-linear-methods.html)
* [Multilayer perceptron classifier](ml-ann.html)
* [Survival Regression](ml-survival-regression.html)
* [Clustering](ml-clustering.html)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The other links in this section are sorted alphabetically



# Main concepts in Pipelines
Expand Down
1 change: 1 addition & 0 deletions docs/mllib-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ concepts. It also contains sections on using algorithms within the Pipelines API
* [Ensembles](ml-ensembles.html)
* [Linear methods with elastic net regularization](ml-linear-methods.html)
* [Multilayer perceptron classifier](ml-ann.html)
* [Clustering](ml-clustering.html)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ditto on sorting

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actually, do we even need to link it here? I read this section as examples of items in ml but not mllib


# Dependencies

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.examples.ml;

import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.api.java.function.Function;
import org.apache.spark.ml.clustering.LDA;
import org.apache.spark.ml.clustering.LDAModel;
import org.apache.spark.mllib.linalg.Vector;
import org.apache.spark.mllib.linalg.VectorUDT;
import org.apache.spark.mllib.linalg.Vectors;
import org.apache.spark.sql.DataFrame;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.sql.catalyst.expressions.GenericRow;
import org.apache.spark.sql.types.Metadata;
import org.apache.spark.sql.types.StructField;
import org.apache.spark.sql.types.StructType;

import java.util.regex.Pattern;

/**
* An example demonstrating LDA
* Run with
* <pre>
* bin/run-example ml.JavaLDAExample <file> <k>
* </pre>
*/
public class JavaLDAExample {

private static class ParseVector implements Function<String, Row> {
private static final Pattern separator = Pattern.compile(" ");

@Override
public Row call(String line) {
String[] tok = separator.split(line);
double[] point = new double[tok.length];
for (int i = 0; i < tok.length; ++i) {
point[i] = Double.parseDouble(tok[i]);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We're expecting a text file containing count vectors here? Seems a bit odd. IMO an example taking a document of text and using pipelines to generate the features would be more natural, e.g. https://gist.github.com/feynmanliang/3b6555758a27adcb527d

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.

I changed the scala one. For the java example I keep it as it is in the mllib model.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think it might be confusing when a reader of the docs gets two different examples after flipping between languages. I'm really sorry, but do you mind changing it back so that they match (we can keep the examples using count vectors).

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.

Sure.

}
Vector[] points = {Vectors.dense(point)};
return new GenericRow(points);
}
}

public static void main(String[] args) {
if (args.length != 2) {
System.err.println("Usage: ml.JavaLDAExample <file> <k>");
System.exit(1);
}
String inputFile = args[0];
int k = Integer.parseInt(args[1]);

// Parses the arguments
SparkConf conf = new SparkConf().setAppName("JavaLDAExample");
JavaSparkContext jsc = new JavaSparkContext(conf);
SQLContext sqlContext = new SQLContext(jsc);

// Loads data
JavaRDD<Row> points = jsc.textFile(inputFile).map(new ParseVector());
StructField[] fields = {new StructField("features", new VectorUDT(), false, Metadata.empty())};
StructType schema = new StructType(fields);
DataFrame dataset = sqlContext.createDataFrame(points, schema);

// Trains a LDA model
LDA lda = new LDA()
.setK(k)
.setMaxIter(10);
LDAModel model = lda.fit(dataset);

System.out.println(model.logLikelihood(dataset));
System.out.println(model.logPerplexity(dataset));

// Shows the result
DataFrame topics = model.describeTopics(3);
topics.show(false);

jsc.stop();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.examples.ml

import org.apache.spark.{SparkContext, SparkConf}
import org.apache.spark.mllib.linalg.{VectorUDT, Vectors}
// $example on$
import org.apache.spark.ml.clustering.LDA
import org.apache.spark.sql.{Row, SQLContext}
import org.apache.spark.sql.types.{StructField, StructType}
// $example off$

/**
* An example demonstrating a LDA of ML pipeline.
* Run with
* {{{
* bin/run-example ml.LDAExample <file> <k>
* }}}
*/
object LDAExample {

final val FEATURES_COL = "features"

def main(args: Array[String]): Unit = {
if (args.length != 2) {
// scalastyle:off println
System.err.println("Usage: ml.LDAExample <file> <k>")
// scalastyle:on println
System.exit(1)
}
val input = args(0)
val k = args(1).toInt

// Creates a Spark context and a SQL context
val conf = new SparkConf().setAppName(s"${this.getClass.getSimpleName}")
val sc = new SparkContext(conf)
val sqlContext = new SQLContext(sc)

// $example on$
// Loads data
val rowRDD = sc.textFile(input).filter(_.nonEmpty)
.map(_.split(" ").map(_.toDouble)).map(Vectors.dense).map(Row(_))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ditto about input format being a text file of count vectors

val schema = StructType(Array(StructField(FEATURES_COL, new VectorUDT, false)))
val dataset = sqlContext.createDataFrame(rowRDD, schema)

// Trains a LDA model
val lda = new LDA()
.setK(k)
.setMaxIter(10)
.setFeaturesCol(FEATURES_COL)
val model = lda.fit(dataset)
val transformed = model.transform(dataset)

val ll = model.logLikelihood(dataset)
val lp = model.logPerplexity(dataset)

// describeTopics
val topics = model.describeTopics(3)

// Shows the result
topics.show(false)
transformed.show(false)

// $example off$
sc.stop()
}
}