Test and fix array_to_matrix

Author: ihnorton

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

@@ -77,14 +77,15 @@ static void declareColMajorMatrix(py::module& mod, std::string const& suffix) {
 template <typename T>
 static void declare_pyarray_to_matrix(py::module& m, const std::string& suffix) {
   m.def(("pyarray_copyto_matrix" + suffix).c_str(),
-      [](py::array_t<T> arr) -> ColMajorMatrix<T> {
+      [](py::array_t<T, py::array::f_style> arr) -> ColMajorMatrix<T> {
         py::buffer_info info = arr.request();
         if (info.ndim != 2)
           throw std::runtime_error("Number of dimensions must be two");
         if (info.format != py::format_descriptor<T>::format())
           throw std::runtime_error("Mismatched buffer format!");
 
         auto data = std::unique_ptr<T[]>{new T[info.shape[0] * info.shape[1]]};
+        std::memcpy(data.get(), info.ptr, info.shape[0] * info.shape[1] * sizeof(T));
         auto r = ColMajorMatrix<T>(std::move(data), info.shape[0], info.shape[1]);
         return r;
         });

apis/python/test/test_module.py

@@ -1,6 +1,7 @@
 import numpy as np
 from common import *
 
+import tiledb.vector_search as vs
 from tiledb.vector_search import _tiledbvspy as vspy
 
 
@@ -19,10 +20,20 @@ def test_tdbMatrix(tmpdir):
     m_array2 = np.array(m, copy=False)  # mutable view
     v = np.random.rand(1).astype(np.float32)
     m_array2[1, 2] = v
+
     data[1, 2] = v
+
     assert np.array_equal(m_array2, data)
     assert m[1, 2] == v
 
+def test_array_to_matrix(tmpdir):
+    p = str(tmpdir.mkdir("test").join("test.tdb"))
+
+    data = np.random.rand(12).astype(np.float32).reshape(3, 4)
+
+    mat = vs.array_to_matrix(data)
+    mat_view = np.array(mat, copy=True)  # mutable view
+    assert np.array_equal(mat_view, data)
 
 def test_context(tmpdir):
     str(tmpdir.mkdir("test").join("test.tdb"))