Skip to content

Commit 98a9213

Browse files
authored
Vendor in targetconfig, event, funcdesc, descriptors for CUDA-specific changes (#456)
This PR vendors in `targetconfig`, `event`, `funcdesc`, `descriptors` from `numba.core` for CUDA-Specific customization.
1 parent caf1558 commit 98a9213

File tree

14 files changed

+1186
-21
lines changed

14 files changed

+1186
-21
lines changed

numba_cuda/numba/cuda/compiler.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@
99
from numba.core import ir as numba_ir
1010
from numba.core import (
1111
types,
12-
funcdesc,
1312
config,
1413
bytecode,
1514
)
1615
from numba.cuda.core.options import ParallelOptions
1716
from numba.core.compiler_lock import global_compiler_lock
1817
from numba.core.errors import NumbaWarning, NumbaInvalidConfigWarning
1918
from numba.cuda.core.interpreter import Interpreter
20-
from numba.cuda.core import inline_closurecall
2119

2220
from numba.cuda import cgutils, typing, lowering, nvvmutils, utils
2321
from numba.cuda.api import get_current_device
2422
from numba.cuda.codegen import ExternalCodeLibrary
25-
from numba.cuda.core import sigutils, postproc
23+
from numba.cuda.core import inline_closurecall, sigutils, postproc, funcdesc
2624
from numba.cuda.cudadrv import nvvm, nvrtc
2725
from numba.cuda.descriptor import cuda_target
2826
from numba.cuda.flags import CUDAFlags

numba_cuda/numba/cuda/core/compiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from numba.core.errors import CompilerError
99

1010
from numba.cuda.core.untyped_passes import ExtractByteCode, FixupArgs
11-
from numba.core.targetconfig import ConfigStack
11+
from numba.cuda.core.targetconfig import ConfigStack
1212

1313

1414
class _CompileStatus(object):

numba_cuda/numba/cuda/core/compiler_machinery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from numba.cuda.core.tracing import event
1515
from numba.cuda.core.postproc import PostProcessor
1616
from numba.cuda.core.ir_utils import enforce_no_dels, legalize_single_scope
17-
import numba.core.event as ev
17+
import numba.cuda.core.event as ev
1818

1919
import numba.cuda.core.compiler_machinery as nccm
2020

@@ -330,7 +330,7 @@ def debug_print(pass_name, print_condition, printable_condition):
330330
return_type=str(internal_state.return_type),
331331
)
332332
errctx = errors.new_error_context(f"Pass {pss.name()}")
333-
with ev.trigger_event("numba:run_pass", data=ev_details), errctx:
333+
with ev.trigger_event("numba-cuda:run_pass", data=ev_details), errctx:
334334
with SimpleTimer() as init_time:
335335
mutated |= check(pss.run_initialization, internal_state)
336336
with SimpleTimer() as pass_time:

0 commit comments

Comments
 (0)