Skip to content

Commit 080a32c

Browse files
committed
raft::ceildiv
1 parent 1c7589f commit 080a32c

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

cpp/src/neighbors/detail/nn_descent.cuh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,8 +1554,8 @@ void GNND<Data_t, Index_t>::build(Data_t* data,
15541554
compute_l2_norms_kernel<<<batch.size(),
15551555
raft::warp_size(),
15561556
sizeof(float) *
1557-
ceildiv(build_config_.dataset_dim,
1558-
static_cast<size_t>(raft::warp_size())) *
1557+
raft::ceildiv(build_config_.dataset_dim,
1558+
static_cast<size_t>(raft::warp_size())) *
15591559
raft::warp_size(),
15601560
stream>>>(
15611561
batch.data(), build_config_.dataset_dim, l2_norms_.data_handle() + batch.offset());
@@ -1579,12 +1579,13 @@ void GNND<Data_t, Index_t>::build(Data_t* data,
15791579
}
15801580
15811581
if (needs_l2_norms && !downcast_host_data) {
1582-
compute_l2_norms_kernel<<<
1583-
nrow_,
1584-
raft::warp_size(),
1585-
sizeof(input_t) * ceildiv(build_config_.dataset_dim, static_cast<size_t>(raft::warp_size())) *
1586-
raft::warp_size(),
1587-
stream>>>(
1582+
compute_l2_norms_kernel<<<nrow_,
1583+
raft::warp_size(),
1584+
sizeof(input_t) *
1585+
raft::ceildiv(build_config_.dataset_dim,
1586+
static_cast<size_t>(raft::warp_size())) *
1587+
raft::warp_size(),
1588+
stream>>>(
15881589
static_cast<const input_t*>(d_data_ptr_), build_config_.dataset_dim, l2_norms_.data_handle());
15891590
raft::resource::sync_stream(res);
15901591
}

python/cuvs/cuvs/neighbors/nn_descent/nn_descent.pyx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,12 @@ cdef class IndexParams:
8484
cdef object _metric
8585

8686
def __cinit__(self):
87-
cuvsNNDescentIndexParamsCreate_v6(&self.params)
87+
self.params = NULL
88+
check_cuvs(cuvsNNDescentIndexParamsCreate_v6(&self.params))
8889

8990
def __dealloc__(self):
90-
check_cuvs(cuvsNNDescentIndexParamsDestroy_v6(self.params))
91+
if self.params != NULL:
92+
check_cuvs(cuvsNNDescentIndexParamsDestroy_v6(self.params))
9193

9294
def __init__(self, *,
9395
metric=None,

0 commit comments

Comments
 (0)