Author: bugman
Date: Fri Jun 27 18:59:29 2014
New Revision: 24359
URL: http://svn.gna.org/viewcvs/relax?rev=24359&view=rev
Log:
Merged revisions 24354-24355 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24354 | bugman | 2014-06-27 18:13:27 +0200 (Fri, 27 Jun 2014) | 16 lines
Numpy version 1.6 or higher is now required to be able to run relax.
This follows from the series of messages:
- http://www.mail-archive.com/relax-devel@xxxxxxx/msg06288.html,
- http://www.mail-archive.com/relax-devel@xxxxxxx/msg06289.html,
- http://www.mail-archive.com/relax-devel@xxxxxxx/msg06327.html,
- http://www.mail-archive.com/relax-devel@xxxxxxx/msg06335.html.
If too many users complain, maybe this change can be reverted later. This
minimal numpy version is
needed for many of the speed ups going in the relaxation dispersion and
frame order analyses. It is
required for the numpy ufunc out arguments and for the numpy.eigsum()
function. These will likely
be used in other analyses in the future for improving the speed of relax,
so it might affect users
of other analyses later on.
........
r24355 | bugman | 2014-06-27 18:14:26 +0200 (Fri, 27 Jun 2014) | 3 lines
Updated the numpy minimal dependency in the installation chapter of the
manual to version 1.6.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/dep_check.py
branches/frame_order_cleanup/docs/latex/install.tex
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 27 18:59:29 2014
@@ -1 +1 @@
-/trunk:1-24268
+/trunk:1-24358
Modified: branches/frame_order_cleanup/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/dep_check.py?rev=24359&r1=24358&r2=24359&view=diff
==============================================================================
--- branches/frame_order_cleanup/dep_check.py (original)
+++ branches/frame_order_cleanup/dep_check.py Fri Jun 27 18:59:29 2014
@@ -37,6 +37,9 @@
# numpy.
try:
import numpy
+ if float(numpy.version.version[:3]) < 1.6:
+ sys.stderr.write("Version %s of the 'numpy' dependency is not
supported, numpy >= 1.6 is required.\n" % numpy.version.version)
+ sys.exit()
except ImportError:
sys.stderr.write("The dependency 'numpy' has not been installed.\n")
sys.exit()
Modified: branches/frame_order_cleanup/docs/latex/install.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/install.tex?rev=24359&r1=24358&r2=24359&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/install.tex (original)
+++ branches/frame_order_cleanup/docs/latex/install.tex Fri Jun 27 18:59:29
2014
@@ -12,7 +12,7 @@
The following packages need to be installed before using relax:
\begin{description}
\item[\href{http://python.org/}{Python}\index{Python}:] Version 2.5 or
higher.
- \item[\href{http://numpy.scipy.org/}{NumPy}\index{NumPy}:] Version 1.0.4
or higher.
+ \item[\href{http://numpy.scipy.org/}{NumPy}\index{NumPy}:] Version 1.6 or
higher.
This package is used for most of the numerical calculations within relax.
\item[\href{http://www.scipy.org/}{SciPy}\index{SciPy}:] Version 0.7.1 or
higher.
This package is optional.
r24359 - in /branches/frame_order_cleanup: ./ dep_check.py docs/latex/install.tex