Minor updates

Author: kozlov-alexey

sdc/hiframes/pd_series_type.py

@@ -32,7 +32,7 @@
 from numba.core import cgutils
 from numba.np.numpy_support import from_dtype
 from numba.extending import (models, register_model, make_attribute_wrapper, lower_builtin)
-from numba.core.imputils import (impl_ret_new_ref, iternext_impl, RefType)
+from numba.core.imputils import (impl_ret_untracked, call_getiter, iternext_impl, RefType)
 from numba.np.arrayobj import make_array, _getitem_array_single_int
 
 from sdc.str_ext import string_type, list_string_array_type
@@ -168,8 +168,6 @@ def __init__(self, dmm, fe_type):
         models.StructModel.__init__(self, dmm, fe_type, members)
 
 
-from numba.core.imputils import impl_ret_untracked, call_getiter
-## FIXME: why is it here and not in series functions?
 @lower_builtin('getiter', SeriesType)
 def getiter_series(context, builder, sig, args):
     """
@@ -183,32 +181,6 @@ def getiter_series(context, builder, sig, args):
     :return: reference to iterator
     """
 
-#     arraytype = sig.args[0].data
-# 
-#     # Create instruction to get array to iterate
-#     zero_member_pointer = context.get_constant(types.intp, 0)
-#     zero_member = context.get_constant(types.int32, 0)
-#     alloca = args[0].operands[0]
-#     gep_result = builder.gep(alloca, [zero_member_pointer, zero_member])
-#     array = builder.load(gep_result)
-# 
-#     # TODO: call numba getiter with gep_result for array
-#     iterobj = context.make_helper(builder, sig.return_type)
-#     zero_index = context.get_constant(types.intp, 0)
-#     indexptr = cgutils.alloca_once_value(builder, zero_index)
-# 
-#     iterobj.index = indexptr
-#     iterobj.array = array
-# 
-#     if context.enable_nrt:
-#         context.nrt.incref(builder, arraytype, array)
-# 
-#     result = iterobj._getvalue()
-#     # Note: a decref on the iterator will dereference all internal MemInfo*
-#     out = impl_ret_new_ref(context, builder, sig.return_type, result)
-#     return out
-
-    ### FIXME: this can be the fix (at least for numeric series), but why the above stopped to work?
     (value,) = args
     series_obj = cgutils.create_struct_proxy(sig.args[0])(context, builder, value)
     res = call_getiter(context, builder, sig.args[0].data, series_obj.data)

sdc/str_ext.py

@@ -30,6 +30,7 @@
 import llvmlite.llvmpy.core as lc
 from llvmlite import ir as lir
 import llvmlite.binding as ll
+import numpy as np
 
 import numba
 from numba.core import cgutils, types
@@ -406,16 +407,6 @@ def generic(self, args, kws):
             return signature(types.float64, arg)
 
 
-# FIXME: this is typing for broken impl
-# @infer_global(str)
-# class StrConstInfer(AbstractTemplate):
-#     def generic(self, args, kws):
-#         assert not kws
-#         assert len(args) == 1
-#         assert args[0] in [types.int32, types.int64, types.float32, types.float64, string_type]
-#         return signature(string_type, *args)
-
-
 class RegexType(types.Opaque):
     def __init__(self):
         super(RegexType, self).__init__(name='RegexType')
@@ -673,22 +664,6 @@ def const_to_string_type(context, builder, fromty, toty, val):
     return ret
 
 
-### FIXME: this impl introduces problem!
-'''
-@lower_builtin(str, types.Any)
-def string_from_impl(context, builder, sig, args):
-    in_typ = sig.args[0]
-    if in_typ == string_type:
-        return args[0]
-    ll_in_typ = context.get_value_type(sig.args[0])
-    fnty = lir.FunctionType(lir.IntType(8).as_pointer(), [ll_in_typ])
-    fn = cgutils.get_or_insert_function(builder.module,
-        fnty, name="str_from_" + str(in_typ))
-    std_str = builder.call(fn, args)
-    return gen_std_str_to_unicode(context, builder, std_str)
-'''
-
-import numpy as np
 @overload(str)
 def str_from_float_ovld(val):
     if not isinstance(val, types.Float):
@@ -825,7 +800,8 @@ def cast_str_to_int64(context, builder, fromty, toty, val):
     fnty = lir.FunctionType(lir.IntType(64), [lir.IntType(8).as_pointer()])
     fn = cgutils.get_or_insert_function(builder.module, fnty, name="std_str_to_int64")
     return builder.call(fn, (val,))
- 
+
+
 # # XXX handle unicode until Numba supports int(str)
 # @lower_cast(string_type, types.int64)
 # def cast_unicode_str_to_int64(context, builder, fromty, toty, val):

sdc/tests/test_strings.py

@@ -160,7 +160,7 @@ def test_impl(a):
             with self.subTest(val=val):
                 result_ref = test_impl(val)
                 result = sdc_func(val)
-                ### FIXME: return back comment
+                # XXX: use startswith since hpat output can have extra characters
                 self.assertTrue(result.startswith(result_ref),
                                 f"result={result} not started with {result_ref}")