Merge pull request #675 from izaid/memblock

Updates to match libdynd

Author: izaid

dynd/include/array_functions.hpp

@@ -52,12 +52,12 @@ inline dynd::nd::array make_strided_array(const dynd::ndt::type &dtp, intptr_t n
   dynd::nd::array result;
   char *data_ptr = NULL;
   if (array_tp.get_base_id() == dynd::memory_id) {
-    result = dynd::make_array_memory_block(array_tp, array_tp.get_arrmeta_size());
+    result = dynd::nd::make_array_memory_block(array_tp, array_tp.get_arrmeta_size());
     array_tp.extended<dynd::ndt::base_memory_type>()->data_alloc(&data_ptr, data_size);
   }
   else {
     // Allocate the array arrmeta and data in one memory block
-    result = dynd::make_array_memory_block(array_tp, array_tp.get_arrmeta_size(), data_size,
+    result = dynd::nd::make_array_memory_block(array_tp, array_tp.get_arrmeta_size(), data_size,
                                            array_tp.get_data_alignment(), &data_ptr);
   }
 
@@ -71,9 +71,9 @@ inline dynd::nd::array make_strided_array(const dynd::ndt::type &dtp, intptr_t n
   }
 
   // Fill in the preamble arrmeta
-  dynd::array_preamble *ndo = reinterpret_cast<dynd::array_preamble *>(result.get());
+  dynd::nd::array_preamble *ndo = reinterpret_cast<dynd::nd::array_preamble *>(result.get());
   ndo->data = data_ptr;
-  ndo->owner = NULL;
+  ndo->owner = dynd::nd::memory_block();
   ndo->flags = dynd::nd::read_access_flag | dynd::nd::write_access_flag;
 
   if (!any_variable_dims) {
@@ -395,13 +395,13 @@ inline dynd::nd::array nd_fields(const dynd::nd::array &n, PyObject *field_list)
 
   // Allocate the new memory block.
   size_t arrmeta_size = result_tp.get_arrmeta_size();
-  dynd::nd::array result = dynd::make_array_memory_block(result_tp, arrmeta_size);
+  dynd::nd::array result = dynd::nd::make_array_memory_block(result_tp, arrmeta_size);
 
   // Clone the data pointer
   result.get()->data = n.get()->data;
-  result.get()->owner = n.get()->owner;
-  if (!result.get()->owner) {
-    result.get()->owner = n.get();
+  result->owner = n->owner;
+  if (!result->owner) {
+    result->owner = n;
   }
 
   // Copy the flags

dynd/include/kernels/apply_pyobject_kernel.hpp

@@ -76,9 +76,7 @@ struct apply_pyobject_kernel : dynd::nd::base_strided_kernel<apply_pyobject_kern
     pydynd::pyobject_ownref args(PyTuple_New(nsrc));
     for (intptr_t i = 0; i != nsrc; ++i) {
       dynd::ndt::type tp = src_tp[i];
-      dynd::nd::array n(
-          reinterpret_cast<dynd::array_preamble *>(dynd::make_array_memory_block(tp, tp.get_arrmeta_size()).get()),
-          true);
+      dynd::nd::array n = dynd::nd::make_array_memory_block(tp, tp.get_arrmeta_size());
       n.get()->flags = dynd::nd::read_access_flag;
       n.get()->data = const_cast<char *>(src[i]);
       if (src_tp[i].get_arrmeta_size() > 0) {
@@ -110,9 +108,7 @@ struct apply_pyobject_kernel : dynd::nd::base_strided_kernel<apply_pyobject_kern
     pydynd::pyobject_ownref args(PyTuple_New(nsrc));
     for (intptr_t i = 0; i != nsrc; ++i) {
       dynd::ndt::type tp = src_tp[i];
-      dynd::nd::array n(
-          reinterpret_cast<dynd::array_preamble *>(dynd::make_array_memory_block(tp, tp.get_arrmeta_size()).get()),
-          true);
+      dynd::nd::array n = dynd::nd::make_array_memory_block(tp, tp.get_arrmeta_size());
       n.get()->flags = dynd::nd::read_access_flag;
       n.get()->data = const_cast<char *>(src[i]);
       if (src_tp[i].get_arrmeta_size() > 0) {

dynd/src/array_as_pep3118.cpp

@@ -261,7 +261,7 @@ int pydynd::array_getbuffer_pep3118(PyObject *ndo, Py_buffer *buffer, int flags)
       throw runtime_error("array_getbuffer_pep3118 called on a non-array");
     }
     nd::array &n = pydynd::array_to_cpp_ref(ndo);
-    array_preamble *preamble = n.get();
+    nd::array_preamble *preamble = n.get();
     ndt::type tp = n.get_type();
 
     // Check if a writable buffer is requested

dynd/src/array_from_py.cpp

@@ -437,13 +437,10 @@ dynd::nd::array pydynd::array_from_py(PyObject *obj, uint32_t access_flags, bool
     intrusive_ptr<memory_block_data> bytesref =
         make_external_memory_block(reinterpret_cast<void *>(obj), &py_decref_function);
     char *data_ptr;
-    result = nd::array(reinterpret_cast<dynd::array_preamble *>(
-                           make_array_memory_block(d, d.extended()->get_arrmeta_size(), d.get_data_size(),
-                                                   d.get_data_alignment(), &data_ptr)
-                               .get()),
-                       true);
+    result = nd::make_array_memory_block(d, d.extended()->get_arrmeta_size(), d.get_data_size(),
+                                        d.get_data_alignment(), &data_ptr);
     result.get()->data = data_ptr;
-    result.get()->owner = NULL;
+    result.get()->owner = nd::memory_block();
     // The scalar consists of pointers to the byte string data
     reinterpret_cast<dynd::string *>(data_ptr)->assign(data, len);
     // The arrmeta

dynd/src/assign.cpp

@@ -22,7 +22,8 @@ PYDYND_API void assign_init()
   typedef type_id_sequence<bool_id, int8_id, int16_id, int32_id, int64_id, int128_id, uint8_id, uint16_id, uint32_id,
                            uint64_id, uint128_id, float16_id, float32_id, float64_id, complex_float32_id,
                            complex_float64_id, bytes_id, fixed_bytes_id, string_id, fixed_string_id, option_id, type_id,
-                           tuple_id, struct_id, fixed_dim_id, var_dim_id> type_ids;
+                           tuple_id, struct_id, fixed_dim_id, var_dim_id>
+      type_ids;
 
   PyDateTime_IMPORT;
 
@@ -62,8 +63,7 @@ void array_copy_to_numpy(PyArrayObject *dst_arr, const dynd::ndt::type &src_tp,
 
   // TODO: This is a hack, need a proper way to pass this dst param
   intptr_t tmp_dst_arrmeta_size = dst_ndim * sizeof(dynd::fixed_dim_type_arrmeta) + sizeof(copy_to_numpy_arrmeta);
-  dynd::nd::array tmp_dst(
-      reinterpret_cast<dynd::array_preamble *>(dynd::make_array_memory_block(dst_tp, tmp_dst_arrmeta_size).get()), true);
+  dynd::nd::array tmp_dst = dynd::nd::make_array_memory_block(dst_tp, tmp_dst_arrmeta_size);
   tmp_dst.get()->flags = dynd::nd::read_access_flag | dynd::nd::write_access_flag;
   if (dst_tp.get_arrmeta_size() > 0) {
     memcpy(tmp_dst.get()->metadata(), dst_am, tmp_dst_arrmeta_size);

dynd/src/copy_from_numpy_arrfunc.cpp

@@ -186,9 +186,7 @@ void pydynd::nd::array_copy_from_numpy(const dynd::ndt::type &dst_tp, const char
   src_am_holder.am.src_alignment = src_alignment;
 
   // TODO: This is a hack, need a proper way to pass this dst param
-  dynd::nd::array tmp_dst(
-      reinterpret_cast<dynd::array_preamble *>(dynd::make_array_memory_block(dst_tp, dst_tp.get_arrmeta_size()).get()),
-      true);
+  dynd::nd::array tmp_dst = dynd::nd::make_array_memory_block(dst_tp, dst_tp.get_arrmeta_size());
   tmp_dst.get()->flags = dynd::nd::read_access_flag | dynd::nd::write_access_flag;
   if (dst_tp.get_arrmeta_size() > 0) {
     dst_tp.extended()->arrmeta_copy_construct(tmp_dst.get()->metadata(), dst_arrmeta,

dynd/src/numpy_interop.cpp

@@ -145,7 +145,7 @@ dynd::nd::array pydynd::array_from_numpy_array(PyArrayObject *obj, uint32_t acce
     dynd::nd::array result = dynd::nd::make_strided_array_from_data(
         d, PyArray_NDIM(obj), PyArray_DIMS(obj), PyArray_STRIDES(obj),
         dynd::nd::read_access_flag | (PyArray_ISWRITEABLE(obj) ? dynd::nd::write_access_flag : 0), PyArray_BYTES(obj),
-        std::move(memblock), &arrmeta);
+        dynd::nd::memory_block(std::move(memblock).get(), true), &arrmeta);
     if (d.get_id() == dynd::struct_id) {
       // If it's a struct, there's additional arrmeta that needs to be populated
       pydynd::fill_arrmeta_from_numpy_dtype(d, PyArray_DESCR(obj), arrmeta);