Author: tlinnet Date: Tue Jul 22 15:27:44 2014 New Revision: 24614 URL: http://svn.gna.org/viewcvs/relax?rev=24614&view=rev Log: Reverted r24337 as relax dependency of numpy is now 1.6 where the "out" argument is available. The command used was: svn merge -r24337:r24336 . ..... r24337 | tlinnet | 2014-06-27 12:58:24 +0200 (Fri, 27 Jun 2014) | 8 lines Added a numpy "out" argument check to dep_check.py. This is for checking the out argument of: numpy.multiply numpy.add numpy.subtract Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. ..... Modified: branches/disp_spin_speed/dep_check.py Modified: branches/disp_spin_speed/dep_check.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/dep_check.py?rev=24614&r1=24613&r2=24614&view=diff ============================================================================== --- branches/disp_spin_speed/dep_check.py (original) +++ branches/disp_spin_speed/dep_check.py Tue Jul 22 15:27:44 2014 @@ -67,16 +67,6 @@ einsum_module = True except ImportError: einsum_module = False - -# numpy "out" argument to numpy.multiply or numpy.add. -try: - a = numpy.array([1]) - numpy.multiply(1, 1, a) - numpy.add(1, 1, a) - numpy.subtract(1, 1, a) - numpy_out = True -except ValueError: - numpy_out = False # Bmrblib python package check. try: