Skip to content

Commit

Permalink
[SPARK-8032] [PYSPARK] Make version checking for NumPy in MLlib more …
Browse files Browse the repository at this point in the history
…robust

The current checking does version `1.x' is less than `1.4' this will fail if x has greater than 1 digit, since x > 4, however `1.x` < `1.4`

It fails in my system since I have version `1.10` :P

Author: MechCoder <[email protected]>

Closes #6579 from MechCoder/np_ver and squashes the following commits:

15430f8 [MechCoder] fix syntax error
893fb7e [MechCoder] remove equal to
e35f0d4 [MechCoder] minor
e89376c [MechCoder] Better checking
22703dd [MechCoder] [SPARK-8032] Make version checking for NumPy in MLlib more robust
  • Loading branch information
MechCoder authored and mengxr committed Jun 3, 2015
1 parent 43adbd5 commit 452eb82
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion python/pyspark/mllib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
# MLlib currently needs NumPy 1.4+, so complain if lower

import numpy
if numpy.version.version < '1.4':

ver = [int(x) for x in numpy.version.version.split('.')[:2]]
if ver < [1, 4]:
raise Exception("MLlib requires NumPy 1.4+")

__all__ = ['classification', 'clustering', 'feature', 'fpm', 'linalg', 'random',
Expand Down

0 comments on commit 452eb82

Please sign in to comment.