Author: bugman
Date: Thu Dec 11 18:21:14 2008
New Revision: 8194
URL: http://svn.gna.org/viewcvs/relax?rev=8194&view=rev
Log:
Merged revisions 8191-8193 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r8191 | bugman | 2008-12-11 17:24:46 +0100 (Thu, 11 Dec 2008) | 8 lines
Fixes for bug #12573 (https://gna.org/bugs/index.php?12573).
This bug was reported by Jack Howarth (https://gna.org/users/jhowarth).
The problem was simply that the optimisation checks are exact and had to be
slightly modified for
the Darwin kernel on 32 bit PowerPC.
........
r8192 | bugman | 2008-12-11 17:48:43 +0100 (Thu, 11 Dec 2008) | 11 lines
Fixes for the 2 test_atom_loop_spin_selection2() unit tests.
This problem was reported by Jack Howarth (https://gna.org/users/jhowarth)
in the post at
https://mail.gna.org/public/relax-users/2008-10/msg00089.html (Message-id:
<20081024141150.GA879@xxxxxxxxxxxxxxxxx>).
The problem was with the position array comparison as this was being
converted to a string and then
compared. The string representations of the numpy arrays is obviously
different on the intel vs.
powerpc chips.
........
r8193 | bugman | 2008-12-11 18:09:51 +0100 (Thu, 11 Dec 2008) | 10 lines
Another PowerPC system test bug fix.
This problem was reported by Jack Howarth (https://gna.org/users/jhowarth)
in the post at
https://mail.gna.org/public/relax-users/2008-10/msg00089.html (Message-id:
<20081024141150.GA879@xxxxxxxxxxxxxxxxx>).
The string.fromstring() function appears to be useless when switching
between big and little endian
machines.
........
Modified:
branches/ave_noe/ (props changed)
branches/ave_noe/test_suite/system_tests/angles.py
branches/ave_noe/test_suite/system_tests/model_free.py
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Propchange: branches/ave_noe/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec 11 18:21:14 2008
@@ -1,1 +1,1 @@
-/1.3:1-8189
+/1.3:1-8193
Modified: branches/ave_noe/test_suite/system_tests/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/ave_noe/test_suite/system_tests/angles.py?rev=8194&r1=8193&r2=8194&view=diff
==============================================================================
--- branches/ave_noe/test_suite/system_tests/angles.py (original)
+++ branches/ave_noe/test_suite/system_tests/angles.py Thu Dec 11 18:21:14
2008
@@ -21,7 +21,6 @@
###############################################################################
# Python module imports.
-from numpy import fromstring
import sys
from unittest import TestCase
@@ -56,16 +55,16 @@
xh_vects = [
None,
None,
-
fromstring('\xf8s\xf3<\xec,\xda?\x01\xb4\xea\xdc\xa8\xc8\xe9\xbf\x94~dBlj\xdb?'),
-
fromstring('\xd6I\x05\xbe57\xbd\xbf\x90\x96\xc8\x86B\xa9\xef\xbf\xdfp\x96\xa7\x85\xf4\xb6\xbf'),
-
fromstring('\xe3\xdds\x90O\xb0\x90\xbf%\xccH\xdf\xe49\xef\xbf\xf1\xb6\x81\x05\xc5\xe6\xcb?'),
-
fromstring('\x8d\xbd5x9a\xd0\xbf\xa2,\xdc\x89\x8f\xbc\xee\xbf\x8f\xb7_\x143\xee\xbb\xbf'),
-
fromstring('\x03\xa2\x0f4+\x86\xed?(Y\xf1\xcc&a\xd8?\x0c\xb6!g\xe1\xee\xae?'),
-
fromstring('\xe3\xee?\x82\x17\xa5\xed?\xa4\xa6\x01\x07\xa2\x05\xd2??\xd8\xd0\xba\xde\xfe\xcf?'),
+ [0.408991870425, -0.805744582632, 0.428370537602],
+ [-0.114123686687, -0.989411605119, -0.0896686109685],
+ [-0.0162975723187, -0.975817142584, 0.217980029763],
+ [-0.255934111969, -0.960517663248, -0.109103386377],
+ [0.922628022844, 0.38092966093, 0.0604162634271],
+ [0.926402811426, 0.281593806116, 0.249965516299],
None,
None,
-
fromstring('u\xff\xd6\xe1\xde?\xea?\x9a1\xbf\x1b&@\xe2?g\xd5\xf0\xb8\x9b\xf0\xa5\xbf'),
-
fromstring('\x0f\x95|\\\xd1\x97\xcc\xbfC0\xf2\xe9\xa3\xc1\xa1\xbf\xa7\xb1H9\xf0+\xef\xbf'),
+ [0.820296708196, 0.570330671495, -0.0428513205774],
+ [-0.223383112106, -0.034680483158, -0.974113571055],
None,
None,
None,
Modified: branches/ave_noe/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/ave_noe/test_suite/system_tests/model_free.py?rev=8194&r1=8193&r2=8194&view=diff
==============================================================================
--- branches/ave_noe/test_suite/system_tests/model_free.py (original)
+++ branches/ave_noe/test_suite/system_tests/model_free.py Thu Dec 11
18:21:14 2008
@@ -315,6 +315,10 @@
iter = 156
f_count = 701
g_count = 163
+ elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+ iter = 156
+ f_count = 695
+ g_count = 162
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -366,6 +370,9 @@
if SYSTEM == 'Linux' and ARCH[0] == '64bit':
f_count = 384
g_count = 384
+ elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+ f_count = 377
+ g_count = 377
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -466,6 +473,9 @@
if SYSTEM == 'Linux' and ARCH[0] == '64bit':
f_count = 757
g_count = 757
+ elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+ f_count = 757
+ g_count = 757
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -514,6 +524,10 @@
h_count = 18
warning = None
+ # Optimisation differences.
+ if SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+ f_count = 94
+
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
self.value_test(spin, select, s2, te, rex, chi2, iter, f_count,
g_count, h_count, warning)
@@ -568,6 +582,9 @@
elif SYSTEM == 'Windows' and ARCH[0] == '32bit':
f_count = 165
g_count = 165
+ elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
+ f_count = 160
+ g_count = 160
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
Modified:
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL:
http://svn.gna.org/viewcvs/relax/branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=8194&r1=8193&r2=8194&view=diff
==============================================================================
---
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
(original)
+++
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
Thu Dec 11 18:21:14 2008
@@ -194,7 +194,9 @@
self.assertEqual(spin_num, 163)
self.assertEqual(spin_name, 'OE1')
self.assertEqual(element, 'O')
- self.assertEqual(pos.tostring(),
'\\\x8f\xc2\xf5(\x1c$@\xecQ\xb8\x1e\x85\xeb\x05\xc0\x89A`\xe5\xd0b*\xc0')
+ self.assertEqual(pos[0], float('10.055'))
+ self.assertEqual(pos[1], float('-2.74'))
+ self.assertEqual(pos[2], float('-13.193'))
# Increment the atom count.
atom_count = atom_count + 1
Modified:
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
URL:
http://svn.gna.org/viewcvs/relax/branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=8194&r1=8193&r2=8194&view=diff
==============================================================================
---
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
(original)
+++
branches/ave_noe/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Thu Dec 11 18:21:14 2008
@@ -294,7 +294,9 @@
self.assertEqual(spin_num, 163)
self.assertEqual(spin_name, 'OE1')
self.assertEqual(element, 'O')
- self.assertEqual(pos.tostring(),
'\\\x8f\xc2\xf5(\x1c$@\xecQ\xb8\x1e\x85\xeb\x05\xc0\x89A`\xe5\xd0b*\xc0')
+ self.assertEqual(pos[0], float('10.055'))
+ self.assertEqual(pos[1], float('-2.74'))
+ self.assertEqual(pos[2], float('-13.193'))
# Increment the atom count.
atom_count = atom_count + 1
r8194 - in /branches/ave_noe: ./ test_suite/system_tests/ test_suite/unit_tests/_generic_fns/_structure/