Merge pull request #609 from insertinterestingnamehere/pxd_cleanup

insertinterestingnamehere · insertinterestingnamehere · commit 0333ee704616 · 2016-03-03T12:20:17.000-06:00
Pxd cleanup
diff --git a/dynd/cpp/array.pxd b/dynd/cpp/array.pxd
@@ -5,7 +5,6 @@ from libcpp.map cimport map
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 from .type cimport type
-from .func.callable cimport callable
 
 cdef extern from 'dynd/array.hpp' namespace 'dynd::nd' nogil:
 
@@ -31,8 +30,6 @@ cdef extern from 'dynd/array.hpp' namespace 'dynd::nd' nogil:
 
         array p(string)
 
-        map[string, callable] get_properties()
-
         char *data() const
         const char *cdata() const
 
diff --git a/dynd/cpp/callable.pxd b/dynd/cpp/callable.pxd
@@ -2,9 +2,9 @@ from libc.string cimport const_char
 from libcpp.pair cimport pair
 from libcpp cimport bool
 
-from ...config cimport translate_exception
-from ..array cimport array
-from ..type cimport type
+from ..config cimport translate_exception
+from .array cimport array
+from .type cimport type
 
 ctypedef const_char* const_charptr
 
@@ -21,4 +21,3 @@ cdef extern from 'dynd/callable.hpp' namespace 'dynd::nd' nogil:
 
     callable make_callable 'dynd::nd::callable::make'[T](...) except +translate_exception
 
-    callable apply[T](T) except +translate_exception
diff --git a/dynd/cpp/callable_registry.pxd b/dynd/cpp/callable_registry.pxd
@@ -3,7 +3,7 @@ from libcpp.string cimport string
 
 from .callable cimport callable
 
-from ...config cimport translate_exception
+from ..config cimport translate_exception
 
 cdef extern from "dynd/callable_registry.hpp" namespace "dynd::nd" nogil:
     cdef cppclass callable_registry:
diff --git a/dynd/cpp/func/elwise.pxd b/dynd/cpp/func/elwise.pxd
@@ -1,4 +1,4 @@
-from .callable cimport callable
+from ..callable cimport callable
 from ...config cimport translate_exception
 
 cdef extern from 'dynd/func/elwise.hpp' namespace 'dynd::nd::functional' nogil:
diff --git a/dynd/cpp/func/reduction.pxd b/dynd/cpp/func/reduction.pxd
@@ -1,4 +1,4 @@
-from .callable cimport callable
+from ..callable cimport callable
 from ...config cimport translate_exception
 
 cdef extern from 'dynd/func/reduction.hpp' namespace 'dynd::nd::functional' nogil:
diff --git a/dynd/cpp/functional.pxd b/dynd/cpp/functional.pxd
@@ -0,0 +1,5 @@
+from ..config cimport translate_exception
+from .callable cimport callable
+
+cdef extern from "dynd/functional.hpp" namespace "dynd::nd::functional" nogil:
+    callable apply(...) except +translate_exception
diff --git a/dynd/cpp/json_parser.pxd b/dynd/cpp/json_parser.pxd
@@ -7,5 +7,3 @@ from .array cimport array
 cdef extern from 'dynd/json_parser.hpp' namespace 'dynd::ndt::json':
     type discover(string) except +translate_exception
 
-#cdef extern from 'dynd/parse.hpp' namespace 'dynd::nd::json':
-#    array parse(type, string) except +translate_exception
diff --git a/dynd/cpp/type.pxd b/dynd/cpp/type.pxd
@@ -6,7 +6,7 @@ from .types.type_id cimport *
 
 from ..config cimport translate_exception
 from .array cimport array
-from .func.callable cimport callable
+from .callable cimport callable
 
 cdef extern from 'dynd/type.hpp' namespace 'dynd::ndt' nogil:
     cdef cppclass type:
diff --git a/dynd/cpp/types/base_fixed_dim_type.pxd b/dynd/cpp/types/base_fixed_dim_type.pxd
diff --git a/dynd/nd/array.pxd b/dynd/nd/array.pxd
@@ -1,7 +1,7 @@
 from cpython.object cimport PyObject
 
 from ..cpp.array cimport array as _array
-from ..cpp.func.callable cimport callable as _callable
+from ..cpp.callable cimport callable as _callable
 from ..cpp.type cimport type as _type
 
 cdef api class array(object)[object dynd_nd_array_pywrapper,
diff --git a/dynd/nd/array.pyx b/dynd/nd/array.pyx
@@ -16,14 +16,13 @@ import numpy as _np
 from ..cpp.array cimport (groupby as dynd_groupby, array_add, array_subtract,
                           array_multiply, array_divide, empty as cpp_empty,
                           dtyped_zeros, dtyped_ones, dtyped_empty)
-from ..cpp.func.callable cimport callable as _callable
-from ..cpp.func.callable_registry cimport callable_registry
+from ..cpp.callable_registry cimport callable_registry
 from ..cpp.type cimport get_builtin_type_dynamic_array_properties, make_type
 from ..cpp.types.categorical_type cimport dynd_make_categorical_type
 from ..cpp.types.datashape_formatter cimport format_datashape as dynd_format_datashape
 from ..cpp.types.type_id cimport *
 from ..cpp.view cimport view as _view
-from ..cpp.types.pyobject_type cimport pyobject_id
+from ..pyobject_type cimport pyobject_id
 
 from ..config cimport translate_exception
 from ..ndt.type cimport type as _py_type, dynd_ndt_type_to_cpp, as_cpp_type
diff --git a/dynd/nd/callable.pxd b/dynd/nd/callable.pxd
@@ -1,4 +1,4 @@
-from ..cpp.func.callable cimport callable as _callable
+from ..cpp.callable cimport callable as _callable
 
 cdef api class callable(object)[object dynd_nd_callable_pywrapper,
                                 type dynd_nd_callable_pywrapper_type]:
diff --git a/dynd/nd/callable.pyx b/dynd/nd/callable.pyx
@@ -3,7 +3,7 @@ from libcpp.vector cimport vector
 from libcpp.pair cimport pair
 
 from ..cpp.array cimport array as _array
-from ..cpp.func.callable cimport const_charptr
+from ..cpp.callable cimport const_charptr
 
 from ..config cimport translate_exception
 from .array cimport as_cpp_array, dynd_nd_array_from_cpp
diff --git a/dynd/nd/functional.pyx b/dynd/nd/functional.pyx
@@ -1,7 +1,7 @@
 from libc.stdint cimport intptr_t
 from libcpp.vector cimport vector
 
-from ..cpp.func.callable cimport callable as _callable
+from ..cpp.callable cimport callable as _callable
 from ..cpp.type cimport type as _type
 from ..cpp.types.callable_type cimport make_callable
 from ..cpp.func.elwise cimport elwise as _elwise
diff --git a/dynd/nd/registry.pyx b/dynd/nd/registry.pyx
@@ -1,7 +1,7 @@
 # cython: c_string_type=str, c_string_encoding=ascii
 
-from ..cpp.func.callable cimport callable
-from ..cpp.func.callable_registry cimport callable_registry
+from ..cpp.callable cimport callable
+from ..cpp.callable_registry cimport callable_registry
 
 from ..config cimport translate_exception
 from .callable cimport dynd_nd_callable_from_cpp
diff --git a/dynd/ndt/type.pyx b/dynd/ndt/type.pyx
@@ -26,14 +26,14 @@ from ..cpp.type cimport make_type
 from ..cpp.types.datashape_formatter cimport format_datashape as dynd_format_datashape
 from ..cpp.types.categorical_type cimport dynd_make_categorical_type
 from ..cpp.types.fixed_bytes_type cimport make_fixed_bytes as dynd_make_fixed_bytes_type
-from ..cpp.types.fixed_dim_kind_type cimport dynd_make_fixed_dim_kind_type
+from ..cpp.types.base_fixed_dim_type cimport dynd_make_fixed_dim_kind_type
 from ..cpp.types.var_dim_type cimport dynd_make_var_dim_type
 from ..cpp.types.tuple_type cimport make_tuple as _make_tuple
 from ..cpp.types.struct_type cimport make_struct as _make_struct
 from ..cpp.types.callable_type cimport make_callable
 from ..cpp.types.string_type cimport string_type
 from ..cpp.types.bytes_type cimport make as make_bytes_type
-from ..cpp.func.callable cimport callable as _callable
+from ..cpp.callable cimport callable as _callable
 from ..cpp.type cimport make_type
 from ..cpp.complex cimport complex as dynd_complex
 
diff --git a/dynd/pyobject_type.pxd b/dynd/pyobject_type.pxd
@@ -1,5 +1,3 @@
-from ..type cimport type
-
 cdef extern from 'types/pyobject_type.hpp':
     int pyobject_id
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from .callable cimport callable`
	`1`	`+from ..callable cimport callable`
`2`	`2`	`from ...config cimport translate_exception`
`3`	`3`
`4`	`4`	`cdef extern from 'dynd/func/elwise.hpp' namespace 'dynd::nd::functional' nogil:`