Migrating to Numba 0.51.2 (#926)

Author: kozlov-alexey

conda-recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set NUMBA_VERSION = "==0.50.1" %}
+{% set NUMBA_VERSION = "==0.51.2" %}
 {% set PANDAS_VERSION = "==1.0.5" %}
 {% set PYARROW_VERSION = "==0.17.0" %}
 

requirements.txt

@@ -1,6 +1,6 @@
 numpy>=1.16
 pandas==0.25.3
 pyarrow==0.17.0
-numba==0.50.1
+numba==0.51.2
 tbb
 tbb-devel

sdc/datatypes/hpat_pandas_dataframe_getitem_types.py

@@ -32,6 +32,7 @@
 from numba.extending import models, overload, register_model, make_attribute_wrapper, intrinsic
 from numba.core.datamodel import register_default, StructModel
 from numba.core.typing.templates import signature
+from sdc.hiframes.pd_dataframe_type import DataFrameType
 
 
 class DataFrameGetitemAccessorType(types.Type):
@@ -56,6 +57,11 @@ def __init__(self, dmm, fe_type):
 
 @intrinsic
 def dataframe_getitem_accessor_init(typingctx, dataframe, accessor):
+
+    if not (isinstance(dataframe, DataFrameType)
+            and isinstance(accessor, types.StringLiteral)):
+        return None, None
+
     def dataframe_getitem_accessor_init_codegen(context, builder, signature, args):
         dataframe_val, accessor_val = args
         getitem_accessor = cgutils.create_struct_proxy(

sdc/datatypes/hpat_pandas_getitem_types.py

@@ -32,6 +32,7 @@
 from numba.extending import (models, overload, register_model, make_attribute_wrapper, intrinsic)
 from numba.core.datamodel import (register_default, StructModel)
 from numba.core.typing.templates import signature
+from sdc.hiframes.pd_series_type import SeriesType
 
 
 class SeriesGetitemAccessorType(types.Type):
@@ -56,6 +57,11 @@ def __init__(self, dmm, fe_type):
 
 @intrinsic
 def series_getitem_accessor_init(typingctx, series, accessor):
+
+    if not (isinstance(series, SeriesType)
+            and isinstance(accessor, types.StringLiteral)):
+        return None, None
+
     def series_getitem_accessor_init_codegen(context, builder, signature, args):
         series_val, accessor_val = args
         getitem_accessor = cgutils.create_struct_proxy(

sdc/datatypes/hpat_pandas_series_functions.py

@@ -1828,7 +1828,7 @@ def hpat_pandas_series_len_impl(self):
     return hpat_pandas_series_len_impl
 
 
-@sdc_overload_method(SeriesType, 'astype', parallel=False)
+@sdc_overload_method(SeriesType, 'astype')
 def hpat_pandas_series_astype(self, dtype, copy=True, errors='raise'):
     """
     Intel Scalable Dataframe Compiler User Guide
@@ -1885,6 +1885,9 @@ def hpat_pandas_series_astype(self, dtype, copy=True, errors='raise'):
     if not isinstance(copy, (types.Omitted, bool, types.Boolean)):
         ty_checker.raise_exc(copy, 'bool', 'copy')
 
+    if not (isinstance(dtype, (types.functions.NumberClass, types.Function, types.StringLiteral))):
+        return None
+
     if (not isinstance(errors, (types.Omitted, str, types.UnicodeType, types.StringLiteral)) and
         errors in ('raise', 'ignore')):
         ty_checker.raise_exc(errors, 'str', 'errors')

sdc/functions/numpy_like.py

@@ -123,13 +123,14 @@ def sdc_astype_overload(self, dtype):
     if not isinstance(self, (types.Array, StringArrayType, RangeIndexType)):
         return None
 
-    if not isinstance(dtype, (types.functions.NumberClass, types.Function, types.Literal)):
+    accepted_dtype_types = (types.functions.NumberClass, types.Function, types.StringLiteral)
+    if not isinstance(dtype, accepted_dtype_types):
         def impl(self, dtype):
             return literally(dtype)
 
         return impl
 
-    if not isinstance(dtype, (types.StringLiteral, types.UnicodeType, types.Function, types.functions.NumberClass)):
+    if not isinstance(dtype, accepted_dtype_types):
         ty_checker.raise_exc(dtype, 'string or type', 'dtype')
 
     if (
@@ -533,13 +534,13 @@ def sdc_fillna_overload(self, inplace=False, value=None):
     if not isinstance(self, (types.Array, StringArrayType)):
         return None
 
+    if not isinstance(inplace, (types.Literal, types.Omitted) or inplace is False):
+        return None
+
     dtype = self.dtype
     isnan = get_isnan(dtype)
 
-    if (
-        (isinstance(inplace, types.Literal) and inplace.literal_value == True) or  # noqa
-        (isinstance(inplace, bool) and inplace == True)  # noqa
-    ):
+    if (isinstance(inplace, types.Literal) and inplace.literal_value is True):
 
         def sdc_fillna_inplace_noop(self, inplace=False, value=None):
             return None

sdc/tests/test_series.py

@@ -810,7 +810,6 @@ def test_impl(A):
         S = pd.Series(['3.24', '1E+05', '-1', '-1.3E-01', 'nan', 'inf'])
         pd.testing.assert_series_equal(hpat_func(S), test_impl(S))
 
-    @skip_parallel
     @skip_inline
     def test_series_astype_str_index_str(self):
         """Verifies Series.astype implementation with function 'str' as argument
@@ -824,7 +823,6 @@ def test_impl(S):
         S = pd.Series(['aa', 'bb', 'cc'], index=['a', 'b', 'c'])
         pd.testing.assert_series_equal(hpat_func(S), test_impl(S))
 
-    @skip_parallel
     @skip_inline
     def test_series_astype_str_index_int(self):
         """Verifies Series.astype implementation with function 'str' as argument

sdc/utilities/utils.py

@@ -624,13 +624,13 @@ def update_jit_options(jit_options, parallel, config_flag):
     return jit_options
 
 
-def sdc_overload(func, jit_options={}, parallel=None, strict=True, inline=None):
+def sdc_overload(func, jit_options={}, parallel=None, strict=True, inline=None, prefer_literal=True):
     jit_options = update_jit_options(jit_options, parallel, config_use_parallel_overloads)
 
     if inline is None:
         inline = 'always' if config_inline_overloads else 'never'
 
-    return overload(func, jit_options=jit_options, strict=strict, inline=inline)
+    return overload(func, jit_options=jit_options, strict=strict, inline=inline, prefer_literal=prefer_literal)
 
 
 def patched_register_jitable(*args, **kwargs):
@@ -666,19 +666,23 @@ def wrap(fn):
         return wrap(*args)
 
 
-def sdc_overload_method(typ, name, jit_options={}, parallel=None, strict=True, inline=None):
+def sdc_overload_method(typ, name, jit_options={}, parallel=None, strict=True, inline=None, prefer_literal=True):
     jit_options = update_jit_options(jit_options, parallel, config_use_parallel_overloads)
 
     if inline is None:
         inline = 'always' if config_inline_overloads else 'never'
 
-    return overload_method(typ, name, jit_options=jit_options, strict=strict, inline=inline)
+    return overload_method(
+        typ, name, jit_options=jit_options, strict=strict, inline=inline, prefer_literal=prefer_literal
+    )
 
 
-def sdc_overload_attribute(typ, name, jit_options={}, parallel=None, strict=True, inline=None):
+def sdc_overload_attribute(typ, name, jit_options={}, parallel=None, strict=True, inline=None, prefer_literal=True):
     jit_options = update_jit_options(jit_options, parallel, config_use_parallel_overloads)
 
     if inline is None:
         inline = 'always' if config_inline_overloads else 'never'
 
-    return overload_attribute(typ, name, jit_options=jit_options, strict=strict, inline=inline)
+    return overload_attribute(
+        typ, name, jit_options=jit_options, strict=strict, inline=inline, prefer_literal=prefer_literal
+    )

setup.py

@@ -375,7 +375,7 @@ def run(self):
           'numpy>=1.16',
           'pandas>=1.0',
           'pyarrow==0.17.0',
-          'numba>=0.50.1,<0.51',
+          'numba>=0.51.2,<0.52',
           'tbb'
           ],
       cmdclass=sdc_build_commands,