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.

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

Add PYBIND11_MAKE_OPAQUE to type_erased_module.cc #482

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions apis/python/src/tiledb/vector_search/module.cc
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#include <tiledb/tiledb>

#include <cstdio>

#include <pybind11/numpy.h>
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <cstdio>
#include <tiledb/tiledb>

// @todo Replace
#include "detail/flat/qv.h"
#include "detail/flat/vq.h"
#include "detail/ivf/dist_qv.h"
Expand All @@ -30,18 +27,24 @@ PYBIND11_MAKE_OPAQUE(std::vector<uint8_t>);
PYBIND11_MAKE_OPAQUE(std::vector<int8_t>);
PYBIND11_MAKE_OPAQUE(std::vector<uint32_t>);
PYBIND11_MAKE_OPAQUE(std::vector<uint64_t>);
PYBIND11_MAKE_OPAQUE(std::vector<int32_t>);
PYBIND11_MAKE_OPAQUE(std::vector<int64_t>);
PYBIND11_MAKE_OPAQUE(std::vector<float>);
PYBIND11_MAKE_OPAQUE(std::vector<double>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<uint8_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<int8_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<uint32_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<uint64_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<int32_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<int64_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<float>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<double>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<uint8_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<int8_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<uint32_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<uint64_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<int32_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<int64_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<float>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<double>>);
#if !(defined(__GNUC__) || defined(_MSC_VER))
Expand Down
31 changes: 29 additions & 2 deletions apis/python/src/tiledb/vector_search/type_erased_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@
* @section DESCRIPTION
*/

#include <tiledb/tiledb>

#include <pybind11/functional.h>
#include <pybind11/numpy.h>
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
#include <tiledb/tiledb>

#include "api/api_defs.h"
#include "api/feature_vector.h"
Expand All @@ -48,6 +47,34 @@

namespace py = pybind11;

PYBIND11_MAKE_OPAQUE(std::vector<uint8_t>);
PYBIND11_MAKE_OPAQUE(std::vector<int8_t>);
PYBIND11_MAKE_OPAQUE(std::vector<uint32_t>);
PYBIND11_MAKE_OPAQUE(std::vector<uint64_t>);
PYBIND11_MAKE_OPAQUE(std::vector<int32_t>);
PYBIND11_MAKE_OPAQUE(std::vector<int64_t>);
PYBIND11_MAKE_OPAQUE(std::vector<float>);
PYBIND11_MAKE_OPAQUE(std::vector<double>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<uint8_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<int8_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<uint32_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<uint64_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<int32_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<int64_t>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<float>>);
PYBIND11_MAKE_OPAQUE(std::list<std::vector<double>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<uint8_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<int8_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<uint32_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<uint64_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<int32_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<int64_t>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<float>>);
PYBIND11_MAKE_OPAQUE(std::vector<std::list<double>>);
#if !(defined(__GNUC__) || defined(_MSC_VER))
PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
#endif

namespace {
template <typename... TArgs>
py::tuple make_python_pair(std::tuple<TArgs...>&& arg) {
Expand Down
Loading