numba-cuda 0.21.1__cp313-cp313-win_amd64.whl → 0.24.0__cp313-cp313-win_amd64.whl

numba_cuda/numba/cuda/core/analysis.py

@@ -38,13 +38,16 @@ def compute_use_defs(blocks):
                 func = ir_extension_usedefs[type(stmt)]
                 func(stmt, use_set, def_set)
                 continue
-            if isinstance(stmt, ir.Assign):
-                if isinstance(stmt.value, ir.Inst):
+            if isinstance(stmt, ir.assign_types):
+                if isinstance(stmt.value, ir.inst_types):
                     rhs_set = set(var.name for var in stmt.value.list_vars())
-                elif isinstance(stmt.value, ir.Var):
+                elif isinstance(stmt.value, ir.var_types):
                     rhs_set = set([stmt.value.name])
-                elif isinstance(
-                    stmt.value, (ir.Arg, ir.Const, ir.Global, ir.FreeVar)
+                elif (
+                    isinstance(stmt.value, ir.arg_types)
+                    or isinstance(stmt.value, ir.const_types)
+                    or isinstance(stmt.value, ir.global_types)
+                    or isinstance(stmt.value, ir.freevar_types)
                 ):
                     rhs_set = ()
                 else:
@@ -326,7 +329,7 @@ def rewrite_semantic_constants(func_ir, called_args):
         if getattr(val, "op", None) == "getattr":
             if val.attr == "ndim":
                 arg_def = guard(get_definition, func_ir, val.value)
-                if isinstance(arg_def, ir.Arg):
+                if isinstance(arg_def, ir.arg_types):
                     argty = called_args[arg_def.index]
                     if isinstance(argty, types.Array):
                         rewrite_statement(func_ir, stmt, argty.ndim)
@@ -337,17 +340,17 @@ def rewrite_semantic_constants(func_ir, called_args):
             func = guard(get_definition, func_ir, val.func)
             if (
                 func is not None
-                and isinstance(func, ir.Global)
+                and isinstance(func, ir.global_types)
                 and getattr(func, "value", None) is len
             ):
                 (arg,) = val.args
                 arg_def = guard(get_definition, func_ir, arg)
-                if isinstance(arg_def, ir.Arg):
+                if isinstance(arg_def, ir.arg_types):
                     argty = called_args[arg_def.index]
                     if isinstance(argty, types.BaseTuple):
                         rewrite_statement(func_ir, stmt, argty.count)
                 elif (
-                    isinstance(arg_def, ir.Expr)
+                    isinstance(arg_def, ir.expr_types)
                     and arg_def.op == "typed_getitem"
                 ):
                     argty = arg_def.dtype
@@ -358,9 +361,9 @@ def rewrite_semantic_constants(func_ir, called_args):
 
     for blk in func_ir.blocks.values():
         for stmt in blk.body:
-            if isinstance(stmt, ir.Assign):
+            if isinstance(stmt, ir.assign_types):
                 val = stmt.value
-                if isinstance(val, ir.Expr):
+                if isinstance(val, ir.expr_types):
                     rewrite_array_ndim(val, func_ir, called_args)
                     rewrite_tuple_len(val, func_ir, called_args)
 
@@ -391,7 +394,7 @@ def find_literally_calls(func_ir, argtypes):
     for blk in func_ir.blocks.values():
         for assign in blk.find_exprs(op="call"):
             var = ir_utils.guard(ir_utils.get_definition, func_ir, assign.func)
-            if isinstance(var, (ir.Global, ir.FreeVar)):
+            if isinstance(var, ir.global_types + ir.freevar_types):
                 fnobj = var.value
             else:
                 fnobj = ir_utils.guard(
@@ -401,7 +404,7 @@ def find_literally_calls(func_ir, argtypes):
                 # Found
                 [arg] = assign.args
                 defarg = func_ir.get_definition(arg)
-                if isinstance(defarg, ir.Arg):
+                if isinstance(defarg, ir.arg_types):
                     argindex = defarg.index
                     marked_args.add(argindex)
                     first_loc.setdefault(argindex, assign.loc)
@@ -473,14 +476,14 @@ def dead_branch_prune(func_ir, called_args):
         branches = []
         for blk in func_ir.blocks.values():
             branch_or_jump = blk.body[-1]
-            if isinstance(branch_or_jump, ir.Branch):
+            if isinstance(branch_or_jump, ir.branch_types):
                 branch = branch_or_jump
                 pred = guard(get_definition, func_ir, branch.cond.name)
                 if pred is not None and getattr(pred, "op", None) == "call":
                     function = guard(get_definition, func_ir, pred.func)
                     if (
                         function is not None
-                        and isinstance(function, ir.Global)
+                        and isinstance(function, ir.global_types)
                         and function.value is bool
                     ):
                         condition = guard(get_definition, func_ir, pred.args[0])
@@ -539,7 +542,9 @@ def dead_branch_prune(func_ir, called_args):
         try:
             # Just to prevent accidents, whilst already guarded, ensure this
             # is an ir.Const
-            if not isinstance(pred, (ir.Const, ir.FreeVar, ir.Global)):
+            if not isinstance(
+                pred, ir.const_types + ir.freevar_types + ir.global_types
+            ):
                 raise TypeError("Expected constant Numba IR node")
             take_truebr = bool(pred.value)
         except TypeError:
@@ -584,8 +589,11 @@ def dead_branch_prune(func_ir, called_args):
     phi2asgn = dict()
     for lbl, blk in func_ir.blocks.items():
         for stmt in blk.body:
-            if isinstance(stmt, ir.Assign):
-                if isinstance(stmt.value, ir.Expr) and stmt.value.op == "phi":
+            if isinstance(stmt, ir.assign_types):
+                if (
+                    isinstance(stmt.value, ir.expr_types)
+                    and stmt.value.op == "phi"
+                ):
                     phi2lbl[stmt.value] = lbl
                     phi2asgn[stmt.value] = stmt
 
@@ -599,12 +607,12 @@ def dead_branch_prune(func_ir, called_args):
 
     for branch, condition, blk in branch_info:
         const_conds = []
-        if isinstance(condition, ir.Expr) and condition.op == "binop":
+        if isinstance(condition, ir.expr_types) and condition.op == "binop":
             prune = prune_by_value
             for arg in [condition.lhs, condition.rhs]:
                 resolved_const = Unknown()
                 arg_def = guard(get_definition, func_ir, arg)
-                if isinstance(arg_def, ir.Arg):
+                if isinstance(arg_def, ir.arg_types):
                     # it's an e.g. literal argument to the function
                     resolved_const = resolve_input_arg_const(arg_def.index)
                     prune = prune_by_type
@@ -668,7 +676,7 @@ def dead_branch_prune(func_ir, called_args):
     for _, cond, blk in branch_info:
         if cond in deadcond:
             for x in blk.body:
-                if isinstance(x, ir.Assign) and x.value is cond:
+                if isinstance(x, ir.assign_types) and x.value is cond:
                     # rewrite the condition as a true/false bit
                     nullified_info = nullified_conditions[deadcond.index(cond)]
                     # only do a rewrite of conditions, predicates need to retain

numba_cuda/numba/cuda/core/annotations/pretty_annotate.py

@@ -273,7 +273,7 @@ class Annotate:
         ann = function.get_annotation_info(signature=signature)
         self.ann = ann
 
-        for k, v in ann.items():
+        for v in ann.values():
             res = hllines(reform_code(v), style)
             rest = htlines(reform_code(v), style)
             v["pygments_lines"] = [

numba_cuda/numba/cuda/core/annotations/type_annotations.py

@@ -94,16 +94,16 @@ class TypeAnnotation(object):
             for inst in blk.body:
                 lineno = inst.loc.line
 
-                if isinstance(inst, ir.Assign):
+                if isinstance(inst, ir.assign_types):
                     if found_lifted_loop:
                         atype = "XXX Lifted Loop XXX"
                         found_lifted_loop = False
                     elif (
-                        isinstance(inst.value, ir.Expr)
+                        isinstance(inst.value, ir.expr_types)
                         and inst.value.op == "call"
                     ):
                         atype = self.calltypes[inst.value]
-                    elif isinstance(inst.value, ir.Const) and isinstance(
+                    elif isinstance(inst.value, ir.const_types) and isinstance(
                         inst.value.value, LiftedLoop
                     ):
                         atype = "XXX Lifted Loop XXX"
@@ -113,7 +113,7 @@ class TypeAnnotation(object):
                         atype = self.typemap.get(inst.target.name, "<missing>")
 
                     aline = "%s = %s  :: %s" % (inst.target, inst.value, atype)
-                elif isinstance(inst, ir.SetItem):
+                elif isinstance(inst, ir.setitem_types):
                     atype = self.calltypes[inst]
                     aline = "%s  :: %s" % (inst, atype)
                 else:

numba_cuda/numba/cuda/core/base.py

@@ -63,11 +63,11 @@ class OverloadSelector(object):
         """
         Select all compatible signatures and their implementation.
         """
-        out = {}
-        for ver_sig, impl in self.versions:
-            if self._match_arglist(ver_sig, sig):
-                out[ver_sig] = impl
-        return out
+        return {
+            ver_sig: impl
+            for ver_sig, impl in self.versions
+            if self._match_arglist(ver_sig, sig)
+        }
 
     def _best_signature(self, candidates):
         """
@@ -933,7 +933,12 @@ class BaseContext(object):
         If *caching* evaluates True, the function keeps the compiled function
         for reuse in *.cached_internal_func*.
         """
-        cache_key = (impl.__code__, sig, type(self.error_model))
+        cache_key = (
+            impl.__code__,
+            sig,
+            type(self.error_model),
+            self.enable_nrt,
+        )
         if not caching:
             cached = None
         else:
@@ -1317,11 +1322,7 @@ class _wrap_missing_loc(object):
             # ignore attributes if not available (i.e fix py2.7)
             attrs = "__name__", "libs"
             for attr in attrs:
-                try:
-                    val = getattr(fn, attr)
-                except AttributeError:
-                    pass
-                else:
+                if (val := getattr(fn, attr, None)) is not None:
                     setattr(wrapper, attr, val)
 
             return wrapper

numba_cuda/numba/cuda/core/bytecode.py

@@ -14,7 +14,7 @@ from numba.cuda import utils
 from numba.cuda.utils import PYVERSION
 
 
-if PYVERSION in ((3, 12), (3, 13)):
+if PYVERSION in ((3, 12), (3, 13), (3, 14)):
     from opcode import _inline_cache_entries
 
     # Instruction/opcode length in bytes
@@ -112,7 +112,7 @@ class ByteCodeInst(object):
         # https://bugs.python.org/issue27129
         # https://github.com/python/cpython/pull/25069
         assert self.is_jump
-        if PYVERSION in ((3, 13),):
+        if PYVERSION in ((3, 13), (3, 14)):
             if self.opcode in (
                 dis.opmap[k]
                 for k in ["JUMP_BACKWARD", "JUMP_BACKWARD_NO_INTERRUPT"]
@@ -141,7 +141,7 @@ class ByteCodeInst(object):
         else:
             raise NotImplementedError(PYVERSION)
 
-        if PYVERSION in ((3, 10), (3, 11), (3, 12), (3, 13)):
+        if PYVERSION in ((3, 10), (3, 11), (3, 12), (3, 13), (3, 14)):
             if self.opcode in JREL_OPS:
                 return self.next + self.arg * 2
             else:
@@ -179,7 +179,7 @@ NO_ARG_LEN = 1
 OPCODE_NOP = dis.opname.index("NOP")
 
 
-if PYVERSION in ((3, 13),):
+if PYVERSION in ((3, 13), (3, 14)):
 
     def _unpack_opargs(code):
         buf = []
@@ -418,7 +418,7 @@ class _ByteCode(object):
 
 
 def _fix_LOAD_GLOBAL_arg(arg):
-    if PYVERSION in ((3, 11), (3, 12), (3, 13)):
+    if PYVERSION in ((3, 11), (3, 12), (3, 13), (3, 14)):
         return arg >> 1
     elif PYVERSION in (
         (3, 9),
@@ -452,12 +452,13 @@ class ByteCodePy311(_ByteCode):
         """
         Returns the exception entry for the given instruction offset
         """
-        candidates = []
-        for ent in self.exception_entries:
-            if ent.start <= offset < ent.end:
-                candidates.append((ent.depth, ent))
+        candidates = [
+            (ent.depth, ent)
+            for ent in self.exception_entries
+            if ent.start <= offset < ent.end
+        ]
         if candidates:
-            ent = max(candidates)[1]
+            _, ent = max(candidates)
             return ent
 
 
@@ -592,7 +593,7 @@ class ByteCodePy312(ByteCodePy311):
                 if not next_inst.opname == "FOR_ITER":
                     continue
 
-                if PYVERSION in ((3, 13),):
+                if PYVERSION in ((3, 13), (3, 14)):
                     # Check end of pattern, two instructions.
                     # Check for the corresponding END_FOR, exception table end
                     # is non-inclusive, so subtract one.
@@ -601,8 +602,14 @@ class ByteCodePy312(ByteCodePy311):
                     if not curr_inst.opname == "END_FOR":
                         continue
                     next_inst = self.table[self.ordered_offsets[index - 1]]
-                    if not next_inst.opname == "POP_TOP":
-                        continue
+                    if PYVERSION in ((3, 13),):
+                        if not next_inst.opname == "POP_TOP":
+                            continue
+                    elif PYVERSION in ((3, 14),):
+                        if not next_inst.opname == "POP_ITER":
+                            continue
+                    else:
+                        raise NotImplementedError(PYVERSION)
                     # END_FOR must be followed by SWAP(2)
                     next_inst = self.table[self.ordered_offsets[index]]
                     if not next_inst.opname == "SWAP" and next_inst.arg == 2:
@@ -646,6 +653,7 @@ if PYVERSION == (3, 11):
 elif PYVERSION in (
     (3, 12),
     (3, 13),
+    (3, 14),
 ):
     ByteCode = ByteCodePy312
 elif PYVERSION < (3, 11):