Skip to content

TYP: use TYPE_CHECKING for import_optional_dependency("numba") #44273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 29, 2021
Merged

TYP: use TYPE_CHECKING for import_optional_dependency("numba") #44273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d2026a
TYP: use TYPE_CHECKING for import_optional_dependency("numba")
simonjayhawkins Nov 1, 2021
48d3269
remove reportUntypedFunctionDecorator = false
simonjayhawkins Nov 2, 2021
f73c1e8
Merge branch 'master' into numba-import_optional_dependency
simonjayhawkins Nov 2, 2021
7514534
generated_jit
simonjayhawkins Nov 2, 2021
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
13 changes: 9 additions & 4 deletions pandas/core/_numba/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
from __future__ import annotations

from typing import Callable
from typing import (
TYPE_CHECKING,
Callable,
)

import numpy as np

Expand Down Expand Up @@ -42,10 +45,12 @@ def generate_shared_aggregator(
if cache_key in NUMBA_FUNC_CACHE:
return NUMBA_FUNC_CACHE[cache_key]

numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "column_looper" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def column_looper(
values: np.ndarray,
start: np.ndarray,
Expand Down
17 changes: 11 additions & 6 deletions pandas/core/groupby/numba_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import inspect
from typing import (
TYPE_CHECKING,
Any,
Callable,
)
Expand Down Expand Up @@ -90,10 +91,12 @@ def generate_numba_agg_func(
return NUMBA_FUNC_CACHE[cache_key]

numba_func = jit_user_function(func, nopython, nogil, parallel)
numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "group_agg" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def group_agg(
values: np.ndarray,
index: np.ndarray,
Expand Down Expand Up @@ -152,10 +155,12 @@ def generate_numba_transform_func(
return NUMBA_FUNC_CACHE[cache_key]

numba_func = jit_user_function(func, nopython, nogil, parallel)
numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "group_transform" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def group_transform(
values: np.ndarray,
index: np.ndarray,
Expand Down
11 changes: 8 additions & 3 deletions pandas/core/util/numba_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
"""Common utilities for Numba operations"""
# pyright: reportUntypedFunctionDecorator = false
from __future__ import annotations

import types
from typing import Callable
from typing import (
TYPE_CHECKING,
Callable,
)

import numpy as np

Expand Down Expand Up @@ -84,7 +86,10 @@ def jit_user_function(
function
Numba JITed function
"""
numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

if numba.extending.is_jitted(func):
# Don't jit a user passed jitted function
Expand Down
39 changes: 25 additions & 14 deletions pandas/core/window/numba_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# pyright: reportUntypedFunctionDecorator = false
from __future__ import annotations

import functools
from typing import (
TYPE_CHECKING,
Any,
Callable,
)
Expand Down Expand Up @@ -56,10 +56,12 @@ def generate_numba_apply_func(
return NUMBA_FUNC_CACHE[cache_key]

numba_func = jit_user_function(func, nopython, nogil, parallel)
numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "roll_apply" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def roll_apply(
values: np.ndarray,
begin: np.ndarray,
Expand Down Expand Up @@ -115,10 +117,12 @@ def generate_numba_ewm_func(
if cache_key in NUMBA_FUNC_CACHE:
return NUMBA_FUNC_CACHE[cache_key]

numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "ewma" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def ewm(
values: np.ndarray,
begin: np.ndarray,
Expand Down Expand Up @@ -217,10 +221,12 @@ def generate_numba_table_func(
return NUMBA_FUNC_CACHE[cache_key]

numba_func = jit_user_function(func, nopython, nogil, parallel)
numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "roll_table" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def roll_table(
values: np.ndarray,
begin: np.ndarray,
Expand Down Expand Up @@ -250,7 +256,10 @@ def roll_table(
# https://github.com/numba/numba/issues/1269
@functools.lru_cache(maxsize=None)
def generate_manual_numpy_nan_agg_with_axis(nan_func):
numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

@numba.jit(nopython=True, nogil=True, parallel=True)
def nan_agg_with_axis(table):
Expand Down Expand Up @@ -296,10 +305,12 @@ def generate_numba_ewm_table_func(
if cache_key in NUMBA_FUNC_CACHE:
return NUMBA_FUNC_CACHE[cache_key]

numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "ewm_table" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def ewm_table(
values: np.ndarray,
begin: np.ndarray,
Expand Down
9 changes: 6 additions & 3 deletions pandas/core/window/online.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import (
TYPE_CHECKING,
Dict,
Optional,
)
Expand Down Expand Up @@ -31,10 +32,12 @@ def generate_online_numba_ewma_func(engine_kwargs: Optional[Dict[str, bool]]):
if cache_key in NUMBA_FUNC_CACHE:
return NUMBA_FUNC_CACHE[cache_key]

numba = import_optional_dependency("numba")
if TYPE_CHECKING:
import numba
else:
numba = import_optional_dependency("numba")

# error: Untyped decorator makes function "online_ewma" untyped
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel) # type: ignore[misc]
@numba.jit(nopython=nopython, nogil=nogil, parallel=parallel)
def online_ewma(
values: np.ndarray,
deltas: np.ndarray,
Expand Down
1 change: 1 addition & 0 deletions typings/numba.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ def jit(
) -> Callable[[F], F]: ...

njit = jit
generated_jit = jit