Skip to content

Accept constant memoryviews in HashTable.lookup #21688

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

Merged
jreback merged 13 commits into from
Jul 7, 2018
Merged

Accept constant memoryviews in HashTable.lookup #21688

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
475e99d
Accept constant memoryviews in HashTable.lookup
xhochy Jun 29, 2018
bcd1384
Add const specifiers to remaining signatures
xhochy Jun 30, 2018
081067c
Increase minimal Cython version to 0.28
xhochy Jun 30, 2018
e42a718
Add whatsnew section
xhochy Jun 30, 2018
bf4eed7
Add tests for readonly memoryviews
xhochy Jun 30, 2018
6c9341b
Bump Cython version in CI to 0.28
xhochy Jul 1, 2018
6c335b0
Apply modern fix for #18825
xhochy Jul 7, 2018
9deaf07
Start new section 'Build Changes' in whatsnew
xhochy Jul 7, 2018
e0b7098
Test writable arrays with parameters
xhochy Jul 7, 2018
20c181f
Bump CI version for Cython to 0.28.2
xhochy Jul 7, 2018
0552d61
add writeable fixture & fix docs
jreback Jul 7, 2018
64fd445
bump min version
jreback Jul 7, 2018
a4cb629
add min cython versions everywhere
jreback Jul 7, 2018
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
Prev Previous commit
Next Next commit
Test writable arrays with parameters
  • Loading branch information
@xhochy
xhochy committed Jul 7, 2018
commit e0b709824c6a7c11019fd244c70c4fbb99eae2c2
15 changes: 9 additions & 6 deletions pandas/tests/test_algos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,19 +1077,21 @@ class TestGroupVarFloat32(GroupVarTestMixin):

class TestHashTable(object):

def test_lookup_nan(self):
@pytest.mark.parametrize('writable', [True, False])
def test_lookup_nan(self, writable):
xs = np.array([2.718, 3.14, np.nan, -7, 5, 2, 3])
# GH 21688 ensure we can deal with readonly memory views
xs.setflags(write=False)
xs.setflags(write=writable)
m = ht.Float64HashTable()
m.map_locations(xs)
tm.assert_numpy_array_equal(m.lookup(xs), np.arange(len(xs),
dtype=np.int64))

def test_lookup_overflow(self):
@pytest.mark.parametrize('writable', [True, False])
def test_lookup_overflow(self, writable):
xs = np.array([1, 2, 2**63], dtype=np.uint64)
# GH 21688 ensure we can deal with readonly memory views
xs.setflags(write=False)
xs.setflags(write=writable)
m = ht.UInt64HashTable()
m.map_locations(xs)
tm.assert_numpy_array_equal(m.lookup(xs), np.arange(len(xs),
Expand All @@ -1100,14 +1102,15 @@ def test_get_unique(self):
exp = np.array([1, 2, 2**63], dtype=np.uint64)
tm.assert_numpy_array_equal(s.unique(), exp)

def test_vector_resize(self):
@pytest.mark.parametrize('writable', [True, False])
def test_vector_resize(self, writable):
# Test for memory errors after internal vector
# reallocations (pull request #7157)

def _test_vector_resize(htable, uniques, dtype, nvals, safely_resizes):
vals = np.array(np.random.randn(1000), dtype=dtype)
# GH 21688 ensure we can deal with readonly memory views
vals.setflags(write=False)
vals.setflags(write=writable)
# get_labels may append to uniques
htable.get_labels(vals[:nvals], uniques, 0, -1)
# to_array() set an external_view_exists flag on uniques.
Expand Down