diff options
author | Matthew Farrellee <matt@redhat.com> | 2014-09-19 14:35:22 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@apache.org> | 2014-09-19 14:35:22 -0700 |
commit | a03e5b81e91d9d792b6a2e01d1505394ea303dd8 (patch) | |
tree | 074018184808d230a4c64805db0523ed73a34531 /examples/src/main/python/als.py | |
parent | be0c7563ea001a59469dbba219d2a8ef5785afa3 (diff) | |
download | spark-a03e5b81e91d9d792b6a2e01d1505394ea303dd8.tar.gz spark-a03e5b81e91d9d792b6a2e01d1505394ea303dd8.tar.bz2 spark-a03e5b81e91d9d792b6a2e01d1505394ea303dd8.zip |
[SPARK-1701] [PySpark] remove slice terminology from python examples
Author: Matthew Farrellee <matt@redhat.com>
Closes #2304 from mattf/SPARK-1701-partition-over-slice-for-python-examples and squashes the following commits:
928a581 [Matthew Farrellee] [SPARK-1701] [PySpark] remove slice terminology from python examples
Diffstat (limited to 'examples/src/main/python/als.py')
-rwxr-xr-x | examples/src/main/python/als.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/src/main/python/als.py b/examples/src/main/python/als.py index 5b1fa4d997..70b6146e39 100755 --- a/examples/src/main/python/als.py +++ b/examples/src/main/python/als.py @@ -54,7 +54,7 @@ def update(i, vec, mat, ratings): if __name__ == "__main__": """ - Usage: als [M] [U] [F] [iterations] [slices]" + Usage: als [M] [U] [F] [iterations] [partitions]" """ print >> sys.stderr, """WARN: This is a naive implementation of ALS and is given as an @@ -66,10 +66,10 @@ if __name__ == "__main__": U = int(sys.argv[2]) if len(sys.argv) > 2 else 500 F = int(sys.argv[3]) if len(sys.argv) > 3 else 10 ITERATIONS = int(sys.argv[4]) if len(sys.argv) > 4 else 5 - slices = int(sys.argv[5]) if len(sys.argv) > 5 else 2 + partitions = int(sys.argv[5]) if len(sys.argv) > 5 else 2 - print "Running ALS with M=%d, U=%d, F=%d, iters=%d, slices=%d\n" % \ - (M, U, F, ITERATIONS, slices) + print "Running ALS with M=%d, U=%d, F=%d, iters=%d, partitions=%d\n" % \ + (M, U, F, ITERATIONS, partitions) R = matrix(rand(M, F)) * matrix(rand(U, F).T) ms = matrix(rand(M, F)) @@ -80,7 +80,7 @@ if __name__ == "__main__": usb = sc.broadcast(us) for i in range(ITERATIONS): - ms = sc.parallelize(range(M), slices) \ + ms = sc.parallelize(range(M), partitions) \ .map(lambda x: update(x, msb.value[x, :], usb.value, Rb.value)) \ .collect() # collect() returns a list, so array ends up being @@ -88,7 +88,7 @@ if __name__ == "__main__": ms = matrix(np.array(ms)[:, :, 0]) msb = sc.broadcast(ms) - us = sc.parallelize(range(U), slices) \ + us = sc.parallelize(range(U), partitions) \ .map(lambda x: update(x, usb.value[x, :], msb.value, Rb.value.T)) \ .collect() us = matrix(np.array(us)[:, :, 0]) |