Skip to content

fix int type usage #1391

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
rathann wants to merge 2 commits into from
Closed

fix int type usage #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51649ad
use correct int types
rathann Jun 9, 2017
280dc13
relax test_symmetry test due to lower precision on 32bit
rathann Jun 9, 2017
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
2 changes: 1 addition & 1 deletion package/MDAnalysis/core/groups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ def __init__(self, *args):
ix, u = args

# indices for the objects I hold
self._ix = np.asarray(ix, dtype=np.int64)
self._ix = np.asarray(ix, dtype=np.intp)
self._u = u
self._cache = dict()

Expand Down
6 changes: 3 additions & 3 deletions package/MDAnalysis/core/topology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ def make_downshift_arrays(upshift, nparents):
counter += 1
# If parent is skipped, eg (0, 0, 2, 2, etc)
while counter != upshift[order[x:y][0]]:
downshift.append(np.array([], dtype=np.int))
downshift.append(np.array([], dtype=np.int64))
counter += 1
downshift.append(np.sort(np.array(order[x:y], copy=True, dtype=np.int)))
downshift.append(np.sort(np.array(order[x:y], copy=True, dtype=np.int64)))
# Add entries for childless parents at end of range
while counter < (nparents - 1):
downshift.append(np.array([], dtype=np.int))
downshift.append(np.array([], dtype=np.int64))
counter += 1
# Add None to end of array to force it to be of type Object
# Without this, a rectangular array gets squashed into a single array
Expand Down
3 changes: 2 additions & 1 deletion testsuite/MDAnalysisTests/analysis/test_psa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,8 @@ def test_symmetry(self):
for a given Hausdorff metric, h.'''
forward = self.h(self.path_1, self.path_2)
reverse = self.h(self.path_2, self.path_1)
self.assertEqual(forward, reverse)
# lower precision on 32bit
assert_almost_equal(forward, reverse, decimal=15)

def test_hausdorff_value(self):
'''Test that the undirected Hausdorff
Expand Down