Merge pull request #679 from izaid/memblock

Updates to match libdynd

Author: izaid

dynd/include/array_functions.hpp

@@ -52,7 +52,8 @@ 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::nd::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(), data_ptr, dynd::nd::memory_block());
     array_tp.extended<dynd::ndt::base_memory_type>()->data_alloc(&data_ptr, data_size);
   }
   else {
@@ -72,7 +73,6 @@ inline dynd::nd::array make_strided_array(const dynd::ndt::type &dtp, intptr_t n
 
   // Fill in the preamble arrmeta
   dynd::nd::array_preamble *ndo = reinterpret_cast<dynd::nd::array_preamble *>(result.get());
-  ndo->data = data_ptr;
   ndo->flags = dynd::nd::read_access_flag | dynd::nd::write_access_flag;
 
   if (!any_variable_dims) {
@@ -394,10 +394,8 @@ 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::nd::make_array_memory_block(result_tp, arrmeta_size, n->get_owner() ? n->get_owner() : n);
-
-  // Clone the data pointer
-  result.get()->data = n.get()->data;
+  dynd::nd::array result =
+      dynd::nd::make_array_memory_block(result_tp, arrmeta_size, n->get_data(), n->get_owner() ? n->get_owner() : n);
 
   // Copy the flags
   result.get()->flags = n.get()->flags;

dynd/include/kernels/apply_pyobject_kernel.hpp

@@ -46,7 +46,7 @@ struct apply_pyobject_kernel : dynd::nd::base_strided_kernel<apply_pyobject_kern
         pydynd::array_to_cpp_ref(item).debug_print(ss);
         // Set all the args' data pointers to NULL as a precaution
         for (i = 0; i != nsrc; ++i) {
-          pydynd::array_to_cpp_ref(item).get()->data = NULL;
+          pydynd::array_to_cpp_ref(item).get()->set_data(NULL);
         }
         throw std::runtime_error(ss.str());
       }
@@ -76,9 +76,9 @@ 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 = dynd::nd::make_array_memory_block(tp, tp.get_arrmeta_size());
+      dynd::nd::array n = dynd::nd::make_array_memory_block(tp, tp.get_arrmeta_size(), const_cast<char *>(src[i]),
+                                                            dynd::nd::memory_block());
       n.get()->flags = dynd::nd::read_access_flag;
-      n.get()->data = const_cast<char *>(src[i]);
       if (src_tp[i].get_arrmeta_size() > 0) {
         src_tp[i].extended()->arrmeta_copy_construct(n.get()->metadata(), m_src_arrmeta[i], dynd::nd::memory_block());
       }
@@ -107,9 +107,9 @@ 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 = dynd::nd::make_array_memory_block(tp, tp.get_arrmeta_size());
+      dynd::nd::array n = dynd::nd::make_array_memory_block(tp, tp.get_arrmeta_size(), const_cast<char *>(src[i]),
+                                                            dynd::nd::memory_block());
       n.get()->flags = dynd::nd::read_access_flag;
-      n.get()->data = const_cast<char *>(src[i]);
       if (src_tp[i].get_arrmeta_size() > 0) {
         src_tp[i].extended()->arrmeta_copy_construct(n.get()->metadata(), m_src_arrmeta[i], dynd::nd::memory_block());
       }
@@ -132,7 +132,7 @@ struct apply_pyobject_kernel : dynd::nd::base_strided_kernel<apply_pyobject_kern
       dst += dst_stride;
       for (intptr_t i = 0; i != nsrc; ++i) {
         const dynd::nd::array &n = pydynd::array_to_cpp_ref(PyTuple_GET_ITEM(args.get(), i));
-        n.get()->data += src_stride[i];
+        n->set_data(n->get_data() + src_stride[i]);
       }
     }
   }