Skip to content

[SPARK-8032] [PySpark] Make version checking for NumPy in MLlib more robust #6579

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
MechCoder wants to merge 5 commits into from
Closed

[SPARK-8032] [PySpark] Make version checking for NumPy in MLlib more robust #6579

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22703dd
[SPARK-8032] Make version checking for NumPy in MLlib more robust
MechCoder Jun 2, 2015
e89376c
Better checking
MechCoder Jun 2, 2015
e35f0d4
minor
MechCoder Jun 2, 2015
893fb7e
remove equal to
MechCoder Jun 2, 2015
15430f8
fix syntax error
MechCoder Jun 2, 2015
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
9 changes: 8 additions & 1 deletion python/pyspark/mllib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@
# MLlib currently needs NumPy 1.4+, so complain if lower

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

@mengxr mengxr Jun 2, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for catching this before the official 1.10 release comes out! The following may be simpler:

ver = [int(x) for x in numpy.version.version.split(.)[:2]]
if ver < [1, 4]:
  raise ...

@MechCoder MechCoder Jun 2, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Is this way of list comparison common? Funny, I haven't used it before.

@mengxr mengxr Jun 2, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See the last section in https://docs.python.org/2/tutorial/datastructures.html


fd = ver.find('.')
ver1 = int(ver[: fd])
ver = ver[fd + 1:]
ver2 = int(ver[: ver.find('.')])

if ver1 < 1 or (ver1 == 1 and ver2 <= 4):
raise Exception("MLlib requires NumPy 1.4+")

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