Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.

Commit de000ee

Browse files
authored
Numba 0.49.0 all (#824)
* Fix run tests Remove import of _getitem_array1d * expectedFailure * expectedFailure-2 * expectedFailure-3 * Conda recipe numba==0.49 * expectedFailure-4 * Refactor imports from Numba * Unskip tests * Fix using of numpy_support.from_dtype() * Unskip tests * Fix DataFrame tests with rewrite IR without Del statements * Unskip tests * Fix corr_overload with type inference error for none < 1 * Fix hpat_pandas_series_cov with type inference error for none < 2 * Unskip tests * Unskip tests * Fixed iternext_series_array with using _getitem_array1d. _getitem_array1d is replaced with _getitem_array_single_int in Numba 0.49. * Unskip tests * Unskip old test * Fix Series.at * Unskip tests
1 parent cb9caf1 commit de000ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+376
-343
lines changed

buildscripts/sdc-conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set NUMBA_VERSION = "==0.48" %}
1+
{% set NUMBA_VERSION = "==0.49.0" %}
22
{% set PANDAS_VERSION = "==0.25.3" %}
33
{% set PYARROW_VERSION = "==0.15.1" %}
44

docs/source/compilation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Output:
3535

3636
Traceback (most recent call last):
3737
...
38-
numba.errors.TypingError: Failed in nopython mode pipeline (step: nopython frontend)
38+
numba.core.errors.TypingError: Failed in nopython mode pipeline (step: nopython frontend)
3939
Unknown attribute 'read_excel' of type Module(<module 'pandas' from ...)
4040

4141

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
numpy>=1.16
22
pandas==0.25.3
33
pyarrow==0.15.1
4-
numba==0.48
4+
numba==0.49

sdc/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"""
5858

5959
# sdc.config.numba_compiler_define_nopython_pipeline_orig = \
60-
# numba.compiler.DefaultPassBuilder.define_nopython_pipeline
61-
# numba.compiler.DefaultPassBuilder.define_nopython_pipeline = \
60+
# numba.core.compiler.DefaultPassBuilder.define_nopython_pipeline
61+
# numba.core.compiler.DefaultPassBuilder.define_nopython_pipeline = \
6262
# sdc.datatypes.hpat_pandas_dataframe_pass.sdc_nopython_pipeline_lite_register
6363

6464
import sdc.rewrites.dataframe_constructor

sdc/compiler.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434
from sdc.hiframes.hiframes_typed import HiFramesTypedPass
3535
from sdc.hiframes.dataframe_pass import DataFramePass
3636
import numba
37-
import numba.compiler
38-
from numba.compiler import DefaultPassBuilder
37+
import numba.core.compiler
38+
from numba.core.compiler import DefaultPassBuilder
3939
from numba import ir_utils, ir, postproc
40-
from numba.targets.registry import CPUDispatcher
41-
from numba.ir_utils import guard, get_definition
42-
from numba.inline_closurecall import inline_closure_call
40+
from numba.core.registry import CPUDispatcher
41+
from numba.core.ir_utils import guard, get_definition
42+
from numba.core.inline_closurecall import inline_closure_call
4343
from numba.typed_passes import (NopythonTypeInference, AnnotateTypes, ParforPass, IRLegalization)
4444
from numba.untyped_passes import (DeadBranchPrune, InlineInlinables, InlineClosureLikes)
4545
from sdc import config
4646
from sdc.distributed import DistributedPass
4747

48-
from numba.compiler_machinery import FunctionPass, register_pass
48+
from numba.core.compiler_machinery import FunctionPass, register_pass
4949

5050
# workaround for Numba #3876 issue with large labels in mortgage benchmark
5151
binding.set_option("tmp", "-non-global-value-max-name-size=2048")
@@ -143,7 +143,7 @@ def run_pass(self, state):
143143
return True
144144

145145

146-
class SDCPipeline(numba.compiler.CompilerBase):
146+
class SDCPipeline(numba.core.compiler.CompilerBase):
147147
"""SDC compiler pipeline
148148
"""
149149

@@ -170,7 +170,7 @@ def __init__(self):
170170
pass
171171

172172
def run_pass(self, state):
173-
numba.parfor.lower_parfor_sequential(
173+
numba.parfors.parfor.lower_parfor_sequential(
174174
state.typingctx, state.func_ir, state.typemap, state.calltypes)
175175

176176
return True

sdc/cv_ext.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
import numba
2929
import sdc
3030
from numba import types
31-
from numba.typing.templates import infer_global, AbstractTemplate, infer, signature
31+
from numba.core.typing.templates import infer_global, AbstractTemplate, infer, signature
3232
from numba.extending import lower_builtin, overload, intrinsic
33-
from numba import cgutils
33+
from numba.core import cgutils
3434
from sdc.str_ext import string_type
35-
from numba.targets.imputils import impl_ret_new_ref, impl_ret_borrowed
36-
from numba.targets.arrayobj import _empty_nd_impl
35+
from numba.core.imputils import impl_ret_new_ref, impl_ret_borrowed
36+
from numba.np.arrayobj import _empty_nd_impl
3737

3838
import cv2
3939
import numpy as np

sdc/datatypes/common_functions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
from pandas.core.indexing import IndexingError
3636

3737
import numba
38-
from numba.targets import quicksort
38+
from numba.misc import quicksort
3939
from numba import types
40-
from numba.errors import TypingError
40+
from numba.core.errors import TypingError
4141
from numba.extending import register_jitable
42-
from numba import numpy_support
42+
from numba.np import numpy_support
4343
from numba.typed import Dict
4444

4545
import sdc

sdc/datatypes/hpat_pandas_dataframe_functions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737

3838
from pandas.core.indexing import IndexingError
3939

40-
from numba import types, prange
41-
from numba.special import literally
40+
from numba import types
41+
from numba import literally
4242
from numba.typed import List, Dict
43-
from numba.errors import TypingError
43+
from numba.core.errors import TypingError
4444
from pandas.core.indexing import IndexingError
4545

4646
from sdc.hiframes.pd_dataframe_ext import DataFrameType

sdc/datatypes/hpat_pandas_dataframe_getitem_types.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727

2828
import pandas
2929

30-
from numba import types, cgutils
30+
from numba import types
31+
from numba.core import cgutils
3132
from numba.extending import models, overload, register_model, make_attribute_wrapper, intrinsic
32-
from numba.datamodel import register_default, StructModel
33-
from numba.typing.templates import signature
33+
from numba.core.datamodel import register_default, StructModel
34+
from numba.core.typing.templates import signature
3435

3536

3637
class DataFrameGetitemAccessorType(types.Type):

0 commit comments

Comments
 (0)