fix C extension namespace and use relative import to fix setup.py install

Author: Ehsan Totoni

hpat/config.py

@@ -1,6 +1,5 @@
 try:
-    import hpat.io
-    import hpat.io._hdf5
+    from .io import _hdf5
 except ImportError:
     _has_h5py = False
 else:
@@ -14,22 +13,22 @@
     _has_pyarrow = True
 
 try:
-    import ros_cpp
+    from . import ros_cpp
 except ImportError:
     _has_ros = False
 else:
     _has_ros = True
 
 try:
-    import cv_wrapper
+    from . import cv_wrapper
 except ImportError:
     _has_opencv = False
 else:
     _has_opencv = True
     import hpat.cv_ext
 
 try:
-    import hxe_ext
+    from . import hxe_ext
 except ImportError:
     _has_xenon = False
 else:

hpat/cv_ext.py

@@ -13,7 +13,7 @@
 
 from llvmlite import ir as lir
 import llvmlite.binding as ll
-import cv_wrapper
+from . import cv_wrapper
 ll.add_symbol('cv_imread', cv_wrapper.cv_imread)
 ll.add_symbol('cv_resize', cv_wrapper.cv_resize)
 ll.add_symbol('cv_imdecode', cv_wrapper.cv_imdecode)

hpat/dict_ext.py

@@ -13,7 +13,7 @@
 from numba import cgutils
 from llvmlite import ir as lir
 import llvmlite.binding as ll
-import hdict_ext
+from . import hdict_ext
 from hpat.utils import unliteral_all
 
 ll_voidp = lir.IntType(8).as_pointer()

hpat/distributed.py

@@ -958,7 +958,7 @@ def _run_call_df(self, lhs, df, func_name, assign, args):
             # nodes.append(print_node)
 
             # TODO: fix lazy IO load
-            import hio
+            from . import hio
             import llvmlite.binding as ll
             ll.add_symbol('file_write_parallel', hio.file_write_parallel)
             # HACK use the string in a dummy function to avoid refcount issues

hpat/distributed_api.py

@@ -13,7 +13,7 @@
     unliteral_all)
 import time
 from llvmlite import ir as lir
-import hdist
+from . import hdist
 import llvmlite.binding as ll
 ll.add_symbol('c_alltoall', hdist.c_alltoall)
 ll.add_symbol('c_gather_scalar', hdist.c_gather_scalar)
@@ -25,7 +25,7 @@
 from enum import Enum
 
 # get size dynamically from C code (mpich 3.2 is 4 bytes but openmpi 1.6 is 8)
-import hdist
+from . import hdist
 mpi_req_numba_type = getattr(types, "int"+str(8 * hdist.mpi_req_num_bytes))
 
 MPI_ROOT = 0

hpat/distributed_lower.py

@@ -13,7 +13,7 @@
 from hpat.distributed_api import mpi_req_numba_type, ReqArrayType, req_array_type
 import time
 from llvmlite import ir as lir
-import hdist
+from . import hdist
 import llvmlite.binding as ll
 ll.add_symbol('hpat_dist_get_rank', hdist.hpat_dist_get_rank)
 ll.add_symbol('hpat_dist_get_size', hdist.hpat_dist_get_size)

hpat/hiframes/api.py

@@ -44,7 +44,7 @@
 # quantile imports?
 import llvmlite.llvmpy.core as lc
 from llvmlite import ir as lir
-import quantile_alg
+from .. import quantile_alg
 import llvmlite.binding as ll
 ll.add_symbol('quantile_parallel', quantile_alg.quantile_parallel)
 ll.add_symbol('nth_sequential', quantile_alg.nth_sequential)

hpat/hiframes/boxing.py

@@ -23,7 +23,7 @@
     box_categorical_array, unbox_categorical_array)
 from hpat.hiframes.pd_series_ext import SeriesType, arr_to_series_type
 
-import hstr_ext
+from .. import hstr_ext
 import llvmlite.binding as ll
 from llvmlite import ir as lir
 import llvmlite.llvmpy.core as lc

hpat/hiframes/join.py

@@ -667,10 +667,10 @@ def write_data_send_buff_overload(meta_tup, node_id, ind, data, key_meta):
 import llvmlite.binding as ll
 from numba.targets.arrayobj import make_array
 from hpat.utils import _numba_to_c_type_map
-import chiframes
+from .. import chiframes
 ll.add_symbol('get_join_sendrecv_counts', chiframes.get_join_sendrecv_counts)
 ll.add_symbol('timsort', chiframes.timsort)
-import hdist
+from .. import hdist
 ll.add_symbol('c_alltoallv', hdist.c_alltoallv)
 
 

hpat/hiframes/pd_timestamp_ext.py

@@ -28,7 +28,7 @@
 #     pandas_present = False
 
 import datetime
-import hdatetime_ext
+from .. import hdatetime_ext
 import llvmlite.binding as ll
 ll.add_symbol('parse_iso_8601_datetime', hdatetime_ext.parse_iso_8601_datetime)
 ll.add_symbol('convert_datetimestruct_to_datetime', hdatetime_ext.convert_datetimestruct_to_datetime)
@@ -881,7 +881,7 @@ def parse_datetime_str(str):
 # from numba.targets.listobj import ListInstance
 # from llvmlite import ir as lir
 # import llvmlite.binding as ll
-# #import hdatetime_ext
+# #from .. import hdatetime_ext
 # #ll.add_symbol('dt_to_timestamp', hdatetime_ext.dt_to_timestamp)
 #
 # @lower_builtin(operator.getitem, TimestampSeriesType, types.Integer)