Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
15 changes: 15 additions & 0 deletions mllib/src/main/scala/org/apache/spark/ml/feature/Word2Vec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ private[feature] trait Word2VecBase extends Params
/** @group getParam */
def getVectorSize: Int = $(vectorSize)

/**
* The window size (context words from [-window, window])

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: end line with "."

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.

Unrelated to this PR, but we should also have the defaults documented in the scaladocs

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.

Should we maybe make a cleanup JIRA to do this for all the params?

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.

Yes, that would be great!

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.

* @group param

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.

I'd use group expertParam, expertSetParam, expertGetParam

*/
final val windowSize = new IntParam(
this, "windowSize", "the window size (context words from [-window, window])")
setDefault(windowSize -> 5)

/** @group getParam */
def getWindowSize: Int = $(windowSize)

/**
* Number of partitions for sentences of words.
* @group param
Expand Down Expand Up @@ -102,6 +113,9 @@ final class Word2Vec(override val uid: String) extends Estimator[Word2VecModel]
/** @group setParam */
def setVectorSize(value: Int): this.type = set(vectorSize, value)

/** @group setParam */
def setWindowSize(value: Int): this.type = set(windowSize, value)

/** @group setParam */
def setStepSize(value: Double): this.type = set(stepSize, value)

Expand All @@ -127,6 +141,7 @@ final class Word2Vec(override val uid: String) extends Estimator[Word2VecModel]
.setNumPartitions($(numPartitions))
.setSeed($(seed))
.setVectorSize($(vectorSize))
.setWindowSize($(windowSize))
.fit(input)
copyValues(new Word2VecModel(uid, wordVectors).setParent(this))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,15 @@ class Word2Vec extends Serializable with Logging {
this
}

/**
* Sets the window of words (default: 5)
*/
@Since("1.6.0")
def setWindowSize(window: Int): this.type = {
this.window = window
this
}

/**
* Sets minCount, the minimum number of times a token must appear to be included in the word2vec
* model's vocabulary (default: 5).
Expand All @@ -144,7 +153,7 @@ class Word2Vec extends Serializable with Logging {
private val MAX_SENTENCE_LENGTH = 1000

/** context words from [-window, window] */
private val window = 5
private var window = 5

private var trainWordsCount = 0
private var vocabSize = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,42 @@ class Word2VecSuite extends SparkFunSuite with MLlibTestSparkContext {
expectedSimilarity.zip(similarity).map {
case (expected, actual) => assert(math.abs((expected - actual) / expected) < 1E-5)
}
}

test("window size") {

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.

why removing this final line? i think this would fail style checker.

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'm not sure why this show up this way in the github diff viewer, there is a newline after the windowsize test (I'll remerge in master and see if fixes the diff view)

val sqlContext = new SQLContext(sc)

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.

Use context from MLlibTestSparkContext

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.

Good point, all of the other tests in this suite also construct the SQLContext at the start this way I'll factor it out.

import sqlContext.implicits._

val sentence = "a q s t q s t b b b s t m s t m q " * 100 + "a c " * 10
val doc = sc.parallelize(Seq(sentence, sentence)).map(line => line.split(" "))
val docDF = doc.zip(doc).toDF("text", "alsotext")

val model = new Word2Vec()
.setVectorSize(3)
.setWindowSize(2)
.setInputCol("text")
.setOutputCol("result")
.setSeed(42L)
.fit(docDF)

val (synonyms, similarity) = model.findSynonyms("a", 6).map {
case Row(w: String, sim: Double) => (w, sim)
}.collect().unzip

// Increase the window size
val biggerModel = new Word2Vec()
.setVectorSize(3)
.setInputCol("text")
.setOutputCol("result")
.setSeed(42L)
.setWindowSize(10)
.fit(docDF)

val (synonymsLarger, similarityLarger) = model.findSynonyms("a", 6).map {
case Row(w: String, sim: Double) => (w, sim)
}.collect().unzip
// The similarity score should be very different with the larger window
assert(math.abs(similarity(5) - similarityLarger(5) / similarity(5)) > 1E-5)
}
}