Skip to content

Commit 22703dd

Browse files
committed
[SPARK-8032] Make version checking for NumPy in MLlib more robust
1 parent 6181937 commit 22703dd

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

python/pyspark/mllib/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@
2323
# MLlib currently needs NumPy 1.4+, so complain if lower
2424

2525
import numpy
26-
if numpy.version.version < '1.4':
26+
ver = numpy.version.version
27+
28+
fd = ver.find('.')
29+
ver1 = int(ver[: fd])
30+
ver = ver[fd + 1:]
31+
ver2 = int(ver[: ver.find('.')])
32+
33+
if ver1 < 1 or (ver1 == 1 and ver2 <= 4):
2734
raise Exception("MLlib requires NumPy 1.4+")
2835

2936
__all__ = ['classification', 'clustering', 'feature', 'fpm', 'linalg', 'random',

0 commit comments

Comments
 (0)