Skip to content
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

Jump to bottom

TST: fix testing on Windows against numpy2 #101

Merged
merged 1 commit into from
Jul 1, 2024
Merged

TST: fix testing on Windows against numpy2 #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions ewah_bool_utils/_testing.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ ctypedef fused dtype_t:
np.float32_t
np.float64_t

ctypedef fused int_t:
np.int32_t
np.int64_t


cdef class Index:
cdef void* ewah_array
Expand Down Expand Up @@ -59,7 +63,7 @@ cdef class Index:
@cython.wraparound(False)
@cython.cdivision(True)
@cython.initializedcheck(False)
def set_from(self, long[:] ids):
def set_from(self, int_t[:] ids):
cdef ewah_bool_array *ewah_array = <ewah_bool_array *> self.ewah_array
cdef np.uint64_t i
cdef np.uint64_t last = 0
Expand All @@ -73,7 +77,7 @@ cdef class Index:
ids.size, ewah_array[0].sizeInBytes()))


cpdef np.uint64_t[:] ewah_set_and_unset(long[:] arr):
cpdef np.uint64_t[:] ewah_set_and_unset(int_t[:] arr):
cdef ewah_bool_array *ewah_arr
cdef vector[size_t] vec

Expand All @@ -88,7 +92,7 @@ cpdef np.uint64_t[:] ewah_set_and_unset(long[:] arr):

return np_arr

cpdef int find_ewah_collisions(long[:] arr1, long[:] arr2):
cpdef int find_ewah_collisions(int_t[:] arr1, int_t[:] arr2):
cdef ewah_bool_array *ewah_arr1
cdef ewah_bool_array *ewah_arr2
cdef ewah_bool_array *ewah_arr_keys
Expand All @@ -112,7 +116,7 @@ cpdef int find_ewah_collisions(long[:] arr1, long[:] arr2):
return ncoll

cpdef dtype_t[:] make_and_select_from_ewah_index(dtype_t[:] arr,
long[:] np_idx):
int_t[:] np_idx):
cdef Index idx = Index()

idx.set_from(np_idx)
Expand Down