Skip to content

Commit e14d040

Browse files
committed
Fix some return types in module.cc
1 parent 6944451 commit e14d040

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

apis/python/src/tiledb/vector_search/module.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ static void declare_qv_query_heap_infinite_ram(py::module& m, const std::string&
124124
size_t k_nn,
125125
size_t nthreads) -> py::tuple { //std::pair<ColMajorMatrix<float>, ColMajorMatrix<size_t>> { // TODO change return type
126126

127-
auto r = detail::ivf::qv_query_heap_infinite_ram<Id_Type>(
127+
// auto r = detail::ivf::qv_query_heap_infinite_ram(
128+
auto r = detail::ivf::query_infinite_ram(
128129
parts,
129130
centroids,
130131
query_vectors,
@@ -176,7 +177,7 @@ static void declare_nuv_query_heap_infinite_ram(py::module& m, const std::string
176177
std::vector<Id_Type>& ids,
177178
size_t nprobe,
178179
size_t k_nn,
179-
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<size_t>> { // TODO change return type
180+
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<uint64_t>> { // TODO change return type
180181

181182
auto r = detail::ivf::nuv_query_heap_infinite_ram_reg_blocked(
182183
parts,
@@ -203,7 +204,7 @@ static void declare_nuv_query_heap_finite_ram(py::module& m, const std::string&
203204
size_t nprobe,
204205
size_t k_nn,
205206
size_t upper_bound,
206-
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<size_t>> { // TODO change return type
207+
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<uint64_t>> { // TODO change return type
207208

208209
auto r = detail::ivf::nuv_query_heap_finite_ram_reg_blocked<T, Id_Type>(
209210
ctx,
@@ -399,8 +400,8 @@ static void declare_vq_query_heap(py::module& m, const std::string& suffix) {
399400
ColMajorMatrix<float>& query_vectors,
400401
const std::vector<uint64_t> &ids,
401402
int k,
402-
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<size_t>> {
403-
auto r = detail::flat::vq_query_heap<tdbColMajorMatrix<T>, ColMajorMatrix<float>, uint64_t>(data, query_vectors, ids, k, nthreads);
403+
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<uint64_t>> {
404+
auto r = detail::flat::vq_query_heap(data, query_vectors, ids, k, nthreads);
404405
return r;
405406
});
406407
}
@@ -412,8 +413,8 @@ static void declare_vq_query_heap_pyarray(py::module& m, const std::string& suff
412413
ColMajorMatrix<float>& query_vectors,
413414
const std::vector<uint64_t> &ids,
414415
int k,
415-
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<size_t>> {
416-
auto r = detail::flat::vq_query_heap<ColMajorMatrix<T>, ColMajorMatrix<float>, uint64_t>(data, query_vectors, ids, k, nthreads);
416+
size_t nthreads) -> std::tuple<ColMajorMatrix<float>, ColMajorMatrix<uint64_t>> {
417+
auto r = detail::flat::vq_query_heap(data, query_vectors, ids, k, nthreads);
417418
return r;
418419
});
419420
}

0 commit comments

Comments
 (0)