Skip to content

[SPARK-4431][MLlib] Implement efficient foreachActive for dense and sparse vector #3288

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
dbtsai wants to merge 6 commits into from
Closed

[SPARK-4431][MLlib] Implement efficient foreachActive for dense and sparse vector #3288

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6441f92
Finished SPARK-4431
Nov 13, 2014
c0cbd5a
fix a bug
Nov 17, 2014
98448bb
Made the override final, and had a local copy of variables which made…
Nov 18, 2014
1907ae1
address feedback
Nov 20, 2014
03dd693
futher performance tunning.
Nov 21, 2014
844b0e6
formating
Nov 21, 2014
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
Prev Previous commit
Next Next commit
Made the override final, and had a local copy of variables which made… 
… the accessing a single step operation.
  • Loading branch information
DB Tsai committed Nov 20, 2014
commit 98448bbcbbab628c2722496fed065229ca984640
53 changes: 29 additions & 24 deletions mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,38 +292,40 @@ class DenseVector(val values: Array[Double]) extends Vector {

private[spark] override def activeIterator(skippingZeros: Boolean) = new Iterator[(Int, Double)] {
private var i = 0
private val valuesSize = values.size

// If zeros are asked to be explicitly skipped, the parent `size` method is called to count
// the number of nonzero elements using `hasNext` and `next` methods.
override lazy val size: Int = if (skippingZeros) super.size else valuesSize
final override lazy val size: Int = if (skippingZeros) super.size else values.size

override def hasNext = {
final override def hasNext = {
if (skippingZeros) {
var found = false
while (!found && i < valuesSize) if (values(i) != 0.0) found = true else i += 1
while (!found && i < values.size) if (values(i) != 0.0) found = true else i += 1
}
i < valuesSize
i < values.size
}

override def next = {
final override def next = {
val result = (i, values(i))
i += 1
result
}

override def foreach[@specialized(Unit) U](f: ((Int, Double)) => U) {
final override def foreach[@specialized(Unit) U](f: ((Int, Double)) => U) {
var i = 0
val localValuesSize = values.size
val localValues = values

if (skippingZeros) {
while (i < valuesSize) {
if (values(i) != 0.0) {
f(i, values(i))
while (i < localValuesSize) {
if (localValues(i) != 0.0) {
f(i, localValues(i))
}
i += 1
}
} else {
while (i < valuesSize) {
f(i, values(i))
while (i < localValuesSize) {
f(i, localValues(i))
i += 1
}
}
Expand Down Expand Up @@ -369,38 +371,41 @@ class SparseVector(

private[spark] override def activeIterator(skippingZeros: Boolean) = new Iterator[(Int, Double)] {
private var i = 0
private val valuesSize = values.size

// If zeros are asked to be explicitly skipped, the parent `size` method is called to count
// the number of nonzero elements using `hasNext` and `next` methods.
override lazy val size: Int = if (skippingZeros) super.size else valuesSize
final override lazy val size: Int = if (skippingZeros) super.size else values.size

def hasNext = {
final override def hasNext = {
if (skippingZeros) {
var found = false
while (!found && i < valuesSize) if (values(i) != 0.0) found = true else i += 1
while (!found && i < values.size) if (values(i) != 0.0) found = true else i += 1
}
i < valuesSize
i < values.size
}

def next = {
final override def next = {
val result = (indices(i), values(i))
i += 1
result
}

override def foreach[@specialized(Unit) U](f: ((Int, Double)) => U) {
final override def foreach[@specialized(Unit) U](f: ((Int, Double)) => U) {
var i = 0
val localValuesSize = values.size
val localIndices = indices
val localValues = values

if (skippingZeros) {
while (i < valuesSize) {
if (values(i) != 0.0) {
f(indices(i), values(i))
while (i < localValuesSize) {
if (localValues(i) != 0.0) {
f(localIndices(i), localValues(i))
}
i += 1
}
} else {
while (i < valuesSize) {
f(indices(i), values(i))
while (i < localValuesSize) {
f(localIndices(i), localValues(i))
i += 1
}
}
Expand Down