-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Python wrappers to IVF-Flat. closes #1139 It also adds a C++ interface to raft_runtime, that is called from Cython wrappers. The corresponding specializations are defined, but not used elsewhere (see #1238). Authors: - Tamas Bela Feher (https://github.com/tfeher) - Victor Lafargue (https://github.com/viclafargue) - Corey J. Nolet (https://github.com/cjnolet) - Divye Gala (https://github.com/divyegala) Approvers: - Corey J. Nolet (https://github.com/cjnolet) URL: #1316
- Loading branch information
Showing
32 changed files
with
2,086 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ log | |
| .DS_Store | ||
| dask-worker-space/ | ||
| *.egg-info/ | ||
| *.bin | ||
|
|
||
| ## scikit-build | ||
| _skbuild | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright (c) 2023, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <raft/neighbors/ivf_flat.cuh> | ||
|
|
||
| namespace raft::neighbors::ivf_flat { | ||
|
|
||
| #define RAFT_INST(T, IdxT) \ | ||
| extern template auto build(raft::device_resources const& handle, \ | ||
| const index_params& params, \ | ||
| raft::device_matrix_view<const T, uint64_t, row_major> dataset) \ | ||
| ->index<T, IdxT>; \ | ||
| \ | ||
| extern template auto extend( \ | ||
| raft::device_resources const& handle, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major> new_vectors, \ | ||
| std::optional<raft::device_vector_view<const IdxT, IdxT>> new_indices, \ | ||
| const index<T, IdxT>& orig_index) \ | ||
| ->index<T, IdxT>; \ | ||
| \ | ||
| extern template void extend( \ | ||
| raft::device_resources const& handle, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major> new_vectors, \ | ||
| std::optional<raft::device_vector_view<const IdxT, IdxT>> new_indices, \ | ||
| raft::neighbors::ivf_flat::index<T, IdxT>* idx); \ | ||
| \ | ||
| extern template void search(raft::device_resources const&, \ | ||
| raft::neighbors::ivf_flat::search_params const&, \ | ||
| const raft::neighbors::ivf_flat::index<T, IdxT>&, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major>, \ | ||
| raft::device_matrix_view<IdxT, IdxT, row_major>, \ | ||
| raft::device_matrix_view<float, IdxT, row_major>); | ||
|
|
||
| RAFT_INST(float, uint64_t); | ||
| RAFT_INST(int8_t, uint64_t); | ||
| RAFT_INST(uint8_t, uint64_t); | ||
|
|
||
| #undef RAFT_INST | ||
| } // namespace raft::neighbors::ivf_flat |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright (c) 2023, NVIDIA CORPORATION. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <raft/neighbors/ivf_flat_types.hpp> | ||
|
|
||
| namespace raft::runtime::neighbors::ivf_flat { | ||
|
|
||
| // We define overloads for build and extend with void return type. This is used in the Cython | ||
| // wrappers, where exception handling is not compatible with return type that has nontrivial | ||
| // constructor. | ||
| #define RAFT_INST_BUILD_EXTEND(T, IdxT) \ | ||
| auto build(raft::device_resources const& handle, \ | ||
| const raft::neighbors::ivf_flat::index_params& params, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major> dataset) \ | ||
| ->raft::neighbors::ivf_flat::index<T, IdxT>; \ | ||
| \ | ||
| auto extend(raft::device_resources const& handle, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major> new_vectors, \ | ||
| std::optional<raft::device_vector_view<const IdxT, IdxT>> new_indices, \ | ||
| const raft::neighbors::ivf_flat::index<T, IdxT>& orig_index) \ | ||
| ->raft::neighbors::ivf_flat::index<T, IdxT>; \ | ||
| \ | ||
| void build(raft::device_resources const& handle, \ | ||
| const raft::neighbors::ivf_flat::index_params& params, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major> dataset, \ | ||
| raft::neighbors::ivf_flat::index<T, IdxT>& idx); \ | ||
| \ | ||
| void extend(raft::device_resources const& handle, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major> new_vectors, \ | ||
| std::optional<raft::device_vector_view<const IdxT, IdxT>> new_indices, \ | ||
| raft::neighbors::ivf_flat::index<T, IdxT>* idx); | ||
|
|
||
| RAFT_INST_BUILD_EXTEND(float, int64_t) | ||
| RAFT_INST_BUILD_EXTEND(int8_t, int64_t) | ||
| RAFT_INST_BUILD_EXTEND(uint8_t, int64_t) | ||
|
|
||
| #undef RAFT_INST_BUILD_EXTEND | ||
|
|
||
| #define RAFT_INST_SEARCH(T, IdxT) \ | ||
| void search(raft::device_resources const&, \ | ||
| raft::neighbors::ivf_flat::search_params const&, \ | ||
| raft::neighbors::ivf_flat::index<T, IdxT> const&, \ | ||
| raft::device_matrix_view<const T, IdxT, row_major>, \ | ||
| raft::device_matrix_view<IdxT, IdxT, row_major>, \ | ||
| raft::device_matrix_view<float, IdxT, row_major>); | ||
|
|
||
| RAFT_INST_SEARCH(float, int64_t); | ||
| RAFT_INST_SEARCH(int8_t, int64_t); | ||
| RAFT_INST_SEARCH(uint8_t, int64_t); | ||
|
|
||
| #undef RAFT_INST_SEARCH | ||
|
|
||
| } // namespace raft::runtime::neighbors::ivf_flat |
Oops, something went wrong.