Skip to content
This repository was archived by the owner on Feb 2, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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
  • Loading branch information
PokhodenkoSA authored May 13, 2020
commit de000eeebb21bb1ff5563d8b09cf9795de48c0b6
2 changes: 1 addition & 1 deletion buildscripts/sdc-conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set NUMBA_VERSION = "==0.48" %}
{% set NUMBA_VERSION = "==0.49.0" %}
{% set PANDAS_VERSION = "==0.25.3" %}
{% set PYARROW_VERSION = "==0.15.1" %}

Expand Down
2 changes: 1 addition & 1 deletion docs/source/compilation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Output:

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


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
numpy>=1.16
pandas==0.25.3
pyarrow==0.15.1
numba==0.48
numba==0.49
4 changes: 2 additions & 2 deletions sdc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"""

# sdc.config.numba_compiler_define_nopython_pipeline_orig = \
# numba.compiler.DefaultPassBuilder.define_nopython_pipeline
# numba.compiler.DefaultPassBuilder.define_nopython_pipeline = \
# numba.core.compiler.DefaultPassBuilder.define_nopython_pipeline
# numba.core.compiler.DefaultPassBuilder.define_nopython_pipeline = \
# sdc.datatypes.hpat_pandas_dataframe_pass.sdc_nopython_pipeline_lite_register

import sdc.rewrites.dataframe_constructor
Expand Down
16 changes: 8 additions & 8 deletions sdc/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@
from sdc.hiframes.hiframes_typed import HiFramesTypedPass
from sdc.hiframes.dataframe_pass import DataFramePass
import numba
import numba.compiler
from numba.compiler import DefaultPassBuilder
import numba.core.compiler
from numba.core.compiler import DefaultPassBuilder
from numba import ir_utils, ir, postproc
from numba.targets.registry import CPUDispatcher
from numba.ir_utils import guard, get_definition
from numba.inline_closurecall import inline_closure_call
from numba.core.registry import CPUDispatcher
from numba.core.ir_utils import guard, get_definition
from numba.core.inline_closurecall import inline_closure_call
from numba.typed_passes import (NopythonTypeInference, AnnotateTypes, ParforPass, IRLegalization)
from numba.untyped_passes import (DeadBranchPrune, InlineInlinables, InlineClosureLikes)
from sdc import config
from sdc.distributed import DistributedPass

from numba.compiler_machinery import FunctionPass, register_pass
from numba.core.compiler_machinery import FunctionPass, register_pass

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


class SDCPipeline(numba.compiler.CompilerBase):
class SDCPipeline(numba.core.compiler.CompilerBase):
"""SDC compiler pipeline
"""

Expand All @@ -170,7 +170,7 @@ def __init__(self):
pass

def run_pass(self, state):
numba.parfor.lower_parfor_sequential(
numba.parfors.parfor.lower_parfor_sequential(
state.typingctx, state.func_ir, state.typemap, state.calltypes)

return True
Expand Down
8 changes: 4 additions & 4 deletions sdc/cv_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
import numba
import sdc
from numba import types
from numba.typing.templates import infer_global, AbstractTemplate, infer, signature
from numba.core.typing.templates import infer_global, AbstractTemplate, infer, signature
from numba.extending import lower_builtin, overload, intrinsic
from numba import cgutils
from numba.core import cgutils
from sdc.str_ext import string_type
from numba.targets.imputils import impl_ret_new_ref, impl_ret_borrowed
from numba.targets.arrayobj import _empty_nd_impl
from numba.core.imputils import impl_ret_new_ref, impl_ret_borrowed
from numba.np.arrayobj import _empty_nd_impl

import cv2
import numpy as np
Expand Down
6 changes: 3 additions & 3 deletions sdc/datatypes/common_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
from pandas.core.indexing import IndexingError

import numba
from numba.targets import quicksort
from numba.misc import quicksort
from numba import types
from numba.errors import TypingError
from numba.core.errors import TypingError
from numba.extending import register_jitable
from numba import numpy_support
from numba.np import numpy_support
from numba.typed import Dict

import sdc
Expand Down
6 changes: 3 additions & 3 deletions sdc/datatypes/hpat_pandas_dataframe_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@

from pandas.core.indexing import IndexingError

from numba import types, prange
from numba.special import literally
from numba import types
from numba import literally
from numba.typed import List, Dict
from numba.errors import TypingError
from numba.core.errors import TypingError
from pandas.core.indexing import IndexingError

from sdc.hiframes.pd_dataframe_ext import DataFrameType
Expand Down
7 changes: 4 additions & 3 deletions sdc/datatypes/hpat_pandas_dataframe_getitem_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@

import pandas

from numba import types, cgutils
from numba import types
from numba.core import cgutils
from numba.extending import models, overload, register_model, make_attribute_wrapper, intrinsic
from numba.datamodel import register_default, StructModel
from numba.typing.templates import signature
from numba.core.datamodel import register_default, StructModel
from numba.core.typing.templates import signature


class DataFrameGetitemAccessorType(types.Type):
Expand Down
Loading