Merge pull request #566 from izaid/type

Updates to match libdynd changes

Author: izaid

dynd/cpp/types/callable_type.pxd

@@ -1,6 +1,7 @@
 from ..type cimport type
 from ..array cimport array
+from libcpp.vector cimport vector
 
 cdef extern from 'dynd/types/callable_type.hpp':
-    type make_callable 'dynd::ndt::callable_type::make'(type &, array &)
+    type make_callable 'dynd::ndt::callable_type::make'(type &, vector[type] &)
     type make_callable 'dynd::ndt::callable_type::make'(type &, type &, type &)

dynd/cpp/types/struct_type.pxd

@@ -1,3 +1,5 @@
+from libcpp.vector cimport vector
+
 from ..array cimport array
 from ..type cimport type
 
@@ -6,5 +8,5 @@ from ...config cimport translate_exception
 cdef extern from 'dynd/types/struct_type.hpp':
     type make_struct 'dynd::ndt::struct_type::make'() \
         except +translate_exception
-    type make_struct 'dynd::ndt::struct_type::make'(const array &, const array &) \
+    type make_struct 'dynd::ndt::struct_type::make'(const array &, const vector[type] &) \
         except +translate_exception

dynd/cpp/types/tuple_type.pxd

@@ -1,3 +1,5 @@
+from libcpp.vector cimport vector
+
 from ..type cimport type
 from ..array cimport array
 
@@ -6,5 +8,5 @@ from ...config cimport translate_exception
 cdef extern from 'dynd/types/tuple_type.hpp':
     type make_tuple 'dynd::ndt::tuple_type::make'() \
         except +translate_exception
-    type make_tuple 'dynd::ndt::tuple_type::make'(const array &) \
+    type make_tuple 'dynd::ndt::tuple_type::make'(const vector[type] &) \
         except +translate_exception

dynd/include/kernels/apply_pyobject_kernel.hpp

@@ -159,12 +159,16 @@ struct apply_pyobject_kernel : dynd::nd::base_kernel<apply_pyobject_kernel> {
   {
     pydynd::PyGILState_RAII pgs;
 
+    std::vector<dynd::ndt::type> src_tp_copy(nsrc);
+    for (int i = 0; i < nsrc; ++i) {
+      src_tp_copy[i] = src_tp[i];
+    }
+
     intptr_t ckb_offset = ckb->m_size;
     ckb->emplace_back<apply_pyobject_kernel>(kernreq);
     apply_pyobject_kernel *self =
         ckb->get_at<apply_pyobject_kernel>(ckb_offset);
-    self->m_proto =
-        dynd::ndt::callable_type::make(dst_tp, dynd::nd::array(src_tp, nsrc));
+    self->m_proto = dynd::ndt::callable_type::make(dst_tp, src_tp_copy);
     self->m_pyfunc = *reinterpret_cast<PyObject **>(static_data);
     Py_XINCREF(self->m_pyfunc);
     self->m_dst_arrmeta = dst_arrmeta;

dynd/nd/functional.pyx

@@ -94,7 +94,11 @@ cdef public object _jit(object func, intptr_t nsrc, const _type *src_tp):
     library.add_ir_module(ir_module)
     library.finalize()
 
-    return dynd_nd_callable_from_cpp(_apply_jit(make_callable(dst_tp, _array(src_tp, nsrc)),
+    cdef vector[_type] src_tp_copy
+    for i in range(nsrc):
+        src_tp_copy.push_back(src_tp[i])
+
+    return dynd_nd_callable_from_cpp(_apply_jit(make_callable(dst_tp, src_tp_copy),
             library.get_pointer_to_function('single')))
 
 def apply(func = None, jit = _import_numba(), *args, **kwds):

dynd/ndt/type.pyx

@@ -5,6 +5,7 @@ from libc.stdint cimport (intptr_t, int8_t, int16_t, int32_t, int64_t,
                           uint8_t, uint16_t, uint32_t, uint64_t)
 from libcpp.map cimport map
 from libcpp.string cimport string
+from libcpp.vector cimport vector
 from libcpp cimport bool as cpp_bool
 
 import datetime
@@ -692,6 +693,7 @@ complex_float64 = type(complex_float64_id)
 void = type(void_id)
 
 def tuple(*args):
+    cdef vector[_type] _args
 
     if args:
         # TODO: Use a different interface that doesn't involve nd.array.
@@ -700,17 +702,25 @@ def tuple(*args):
         # that can then be used to create a tuple type.
         # Constructing an array from the list is really
         # only partially correct.
-        return dynd_ndt_type_from_cpp(_make_tuple(as_cpp_array(args)))
+        for arg in args:
+            _args.push_back(as_cpp_type(arg))
+
+        return dynd_ndt_type_from_cpp(_make_tuple(_args))
 
     return dynd_ndt_type_from_cpp(_make_tuple())
 
 def struct(**kwds):
     # TODO: require an ordered dict here since struct types are ordered.
     # TODO: Use something other than dynd arrays to pass these arguments.
     #       See the comment in the tuple function for details.
+    cdef vector[_type] _kwds
+
     if kwds:
+        for kwd in kwds.values():
+            _kwds.push_back(as_cpp_type(kwd))
+
         return dynd_ndt_type_from_cpp(_make_struct(
-            as_cpp_array(list(kwds.keys())), as_cpp_array(list(kwds.values()))))
+            as_cpp_array(list(kwds.keys())), _kwds))
 
     return dynd_ndt_type_from_cpp(_make_struct())