Skip to content
Closed
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
85d22c3
Locality Sensitive Hashing (LSH) Python API.
yanboliang Nov 4, 2016
cdeca1c
Fix typos.
yanboliang Nov 4, 2016
66d308b
Merge branch 'spark-18080' of https://github.com/yanboliang/spark int…
Jan 25, 2017
d62a2d0
Merge branch 'master' of https://github.com/apache/spark into spark-1…
Jan 26, 2017
dafc4d1
Changes to fix LSH Python API
Jan 26, 2017
ac1f4f7
Merge branch 'spark-18080' of https://github.com/Yunni/spark into spa…
Yunni Jan 26, 2017
3a21f26
Fix examples and class definition
Yunni Jan 26, 2017
65dab3e
Add python examples and updated the user guide
Jan 26, 2017
3d3bcf0
Fix lint issues
Jan 26, 2017
69dccde
Fix python doc issues
Jan 26, 2017
e7542d0
Fix 'Definition list ends without a blank line'
Jan 26, 2017
5cfc9c5
Fix python unit tests
Jan 26, 2017
ccabbf4
Merge branch 'master' of https://github.com/apache/spark into spark-1…
Feb 7, 2017
2508a2f
Code Review Comments
Feb 8, 2017
2dd6aad
Merge branch 'master' of https://github.com/apache/spark into spark-1…
Feb 8, 2017
8e5468f
Add printing messages for the LSH Scala/Java/Python exmaples
Feb 8, 2017
6e85e1a
(1) Rename 'keys''values' to 'features''hashes' (2) Printing the ids …
Feb 8, 2017
4bc670c
Fix jenkins build
Feb 9, 2017
b45ec0a
Fix failed jenkins test
Feb 9, 2017
1b70b91
Fix Jenkins test
Feb 9, 2017
b1da01e
Code Review Comments for the LSH examples
Feb 10, 2017
8f1d708
Add alias for similarity join examples
Feb 10, 2017
49edc93
Merge branch 'master' of https://github.com/apache/spark into spark-1…
Feb 14, 2017
c64d50b
Code Review Comments
Feb 14, 2017
5d55752
Code Review Comments: Some minor fixes
Feb 14, 2017
d849c3a
Code Review Comment
Feb 15, 2017
36fd9bc
Merge branch 'master' of https://github.com/apache/spark into spark-1…
Feb 15, 2017
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
17 changes: 17 additions & 0 deletions docs/ml-features.md
Original file line number Diff line number Diff line change
Expand Up @@ -1558,6 +1558,15 @@ for more details on the API.

{% include_example java/org/apache/spark/examples/ml/JavaBucketedRandomProjectionLSHExample.java %}
</div>

<div data-lang="python" markdown="1">

Refer to the [BucketedRandomProjectionLSH Python docs](api/python/pyspark.ml.html#pyspark.ml.feature.BucketedRandomProjectionLSH)
for more details on the API.

{% include_example python/ml/bucketed_random_projection_lsh.py %}
Copy link
Contributor

Choose a reason for hiding this comment

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

These are not correct and the docs don't build because of it. In the future, can you check that the docs build when you make changes?

cd docs; SKIP_API=1 jekyll serve --watch

More detailed instructions here. Also you can build the python docs by cd python/docs; make html

Copy link
Contributor

Choose a reason for hiding this comment

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

Yup, should be bucketed_random_projection_lsh_example.py (and similarly for minhash include_example below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry I forgot to retest after renaming the python examples. Thanks for the in formation.

</div>

</div>

### MinHash for Jaccard Distance
Expand Down Expand Up @@ -1590,4 +1599,12 @@ for more details on the API.

{% include_example java/org/apache/spark/examples/ml/JavaMinHashLSHExample.java %}
</div>

<div data-lang="python" markdown="1">

Refer to the [MinHashLSH Python docs](api/python/pyspark.ml.html#pyspark.ml.feature.MinHashLSH)
for more details on the API.

{% include_example python/ml/min_hash_lsh.py %}
</div>
</div>
76 changes: 76 additions & 0 deletions examples/src/main/python/ml/bucketed_random_projection_lsh.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#
# 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.
#


from __future__ import print_function

# $example on$
from pyspark.ml.feature import BucketedRandomProjectionLSH
from pyspark.ml.linalg import Vectors
# $example off$
from pyspark.sql import SparkSession

"""
An example demonstrating BucketedRandomProjectionLSH.
Run with:
bin/spark-submit examples/src/main/python/ml/bucketed_random_projection_lsh.py
Copy link
Contributor

Choose a reason for hiding this comment

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

the file names usually end with "_example". Have we not done that here because of how long the name is already? I slightly prefer to stick with the convention.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That was a mistake. Sorry about it!

"""

if __name__ == "__main__":
spark = SparkSession \
.builder \
.appName("BucketedRandomProjectionLSHExample") \
.getOrCreate()

# $example on$
dataA = [(0, Vectors.dense([1.0, 1.0]),),
(1, Vectors.dense([1.0, -1.0]),),
(2, Vectors.dense([-1.0, -1.0]),),
(3, Vectors.dense([-1.0, 1.0]),)]
dfA = spark.createDataFrame(dataA, ["id", "keys"])

dataB = [(4, Vectors.dense([1.0, 0.0]),),
(5, Vectors.dense([-1.0, 0.0]),),
(6, Vectors.dense([0.0, 1.0]),),
(7, Vectors.dense([0.0, -1.0]),)]
dfB = spark.createDataFrame(dataB, ["id", "keys"])

key = Vectors.dense([1.0, 0.0])

brp = BucketedRandomProjectionLSH(inputCol="keys", outputCol="values", bucketLength=2.0,
numHashTables=3)
model = brp.fit(dfA)

# Feature Transformation
model.transform(dfA).show()
Copy link
Contributor

Choose a reason for hiding this comment

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

Other examples typically will output some print statements along with the output, explaining what you're seeing. As it is, this example just spits out a bunch of dataframes with no explanations. I'd like us to add that here, and for the Scala examples really.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done for Scala/Java/Python Examples.

# Cache the transformed columns
transformedA = model.transform(dfA).cache()
transformedB = model.transform(dfB).cache()

# Approximate similarity join
model.approxSimilarityJoin(dfA, dfB, 1.5).show()
model.approxSimilarityJoin(transformedA, transformedB, 1.5).show()
# Self Join
model.approxSimilarityJoin(dfA, dfA, 2.5).filter("datasetA.id < datasetB.id").show()

# Approximate nearest neighbor search
model.approxNearestNeighbors(dfA, key, 2).show()
model.approxNearestNeighbors(transformedA, key, 2).show()

# $example off$

spark.stop()
75 changes: 75 additions & 0 deletions examples/src/main/python/ml/min_hash_lsh.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
#
# 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.
#


from __future__ import print_function

# $example on$
from pyspark.ml.feature import MinHashLSH
from pyspark.ml.linalg import Vectors
# $example off$
from pyspark.sql import SparkSession

"""
An example demonstrating MinHashLSH.
Run with:
bin/spark-submit examples/src/main/python/ml/min_hash_lsh.py
"""

if __name__ == "__main__":
spark = SparkSession \
.builder \
.appName("MinHashLSHExample") \
.getOrCreate()

# $example on$
dataA = [(0, Vectors.sparse(6, [0, 1, 2], [1.0, 1.0, 1.0]),),
(1, Vectors.sparse(6, [2, 3, 4], [1.0, 1.0, 1.0]),),
(2, Vectors.sparse(6, [0, 2, 4], [1.0, 1.0, 1.0]),)]
dfA = spark.createDataFrame(dataA, ["id", "keys"])

dataB = [(3, Vectors.sparse(6, [1, 3, 5], [1.0, 1.0, 1.0]),),
(4, Vectors.sparse(6, [2, 3, 5], [1.0, 1.0, 1.0]),),
(5, Vectors.sparse(6, [1, 2, 4], [1.0, 1.0, 1.0]),)]
dfB = spark.createDataFrame(dataB, ["id", "keys"])

key = Vectors.sparse(6, [1, 3], [1.0, 1.0])

mh = MinHashLSH(inputCol="keys", outputCol="values", numHashTables=3)
model = mh.fit(dfA)

# Feature Transformation
model.transform(dfA).show()
Copy link
Contributor

Choose a reason for hiding this comment

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

same comment about print statements here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.


# Cache the transformed columns
transformedA = model.transform(dfA).cache()
transformedB = model.transform(dfB).cache()

# Approximate similarity join
model.approxSimilarityJoin(dfA, dfB, 0.6).show()
model.approxSimilarityJoin(transformedA, transformedB, 0.6).show()

# Self Join
model.approxSimilarityJoin(dfA, dfA, 0.6).filter("datasetA.id < datasetB.id").show()

# Approximate nearest neighbor search
model.approxNearestNeighbors(dfA, key, 2).show()
Copy link
Contributor

Choose a reason for hiding this comment

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

These two output empty dataframes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Increased the number of HashTables.

model.approxNearestNeighbors(transformedA, key, 2).show()

# $example off$

spark.stop()
Loading