Rename oneapi to dppy

Author: Diptorup Deb

build_for_conda.sh

@@ -1,24 +1,25 @@
 #!/bin/sh
+set -x
 
 find . -name "*.so" -exec rm {} \;
 
-cd numba/oneapi/oneapidriver
+cd numba/dppy/dppy_driver
 
-gcc -g -DDEBUG -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -pedantic-errors -fPIC -c numba_oneapi_glue.c -o numba_oneapi_glue.o
+gcc -g -DDEBUG -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -pedantic-errors -fPIC -c opencllite.c -o opencllite.o
 gcc_ret=$?
 if [ $gcc_ret -ne 0 ]; then
-    echo "numba_oneapi_glue failed to build...exiting"
+    echo "opencllite failed to build...exiting"
     cd ../../..
     exit $gcc_ret
 fi
-ar rcs libnumbaoneapiglue.a numba_oneapi_glue.o
+ar rcs libdpglue.a opencllite.o
 
-#gcc -L. -shared -o libnumbaoneapiglue.so -Wl,--whole-archive -lnumbaoneapiglue
+#gcc -L. -shared -o libdpglue.so -Wl,--whole-archive -lopencllite
 
-gcc -DDEBUG -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -pedantic-errors -shared -fPIC -o libnumbaoneapiglue_so.so numba_oneapi_glue.c
+gcc -DDEBUG -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -pedantic-errors -shared -fPIC -o libdpglue_so.so opencllite.c
 gcc_ret=$?
 if [ $gcc_ret -ne 0 ]; then
-    echo "numba_oneapi_glue_so failed to build...exiting"
+    echo "opencllite failed to build...exiting"
     cd ../../..
     exit $gcc_ret
 fi

numba/oneapi/.gitignore renamed to numba/dppy/.gitignore

@@ -42,7 +42,7 @@ def _finalize_specific(self):
 
     def get_asm_str(self):
         # Return nothing: we can only dump assembler code when it is later
-        # generated (in numba.oneapi.compiler).
+        # generated (in numba.dppy.compiler).
         return None
 
 

numba/oneapi/__init__.py renamed to numba/dppy/__init__.py

@@ -4,27 +4,27 @@
 
 from numba.typing.templates import ConcreteTemplate
 from numba import types, compiler, ir
-from .oneapidriver import driver
+from .dppy_driver import driver
 from numba.typing.templates import AbstractTemplate
 from numba import ctypes_support as ctypes
-from numba.oneapi.oneapidriver import spirv_generator
+from numba.dppy.dppy_driver import spirv_generator
 from types import FunctionType
 import os
 
-DEBUG=os.environ.get('NUMBA_ONEAPI_DEBUG', None)
+DEBUG=os.environ.get('NUMBA_DPPY_DEBUG', None)
 
 def _raise_no_device_found_error():
     error_message = ("No OpenCL device specified. "
                      "Usage : jit_fn[device, globalsize, localsize](...)")
     raise ValueError(error_message)
 
 
-def compile_with_oneapi(pyfunc, return_type, args, debug):
+def compile_with_dppy(pyfunc, return_type, args, debug):
     # First compilation will trigger the initialization of the OpenCL backend.
-    from .descriptor import OneAPITargetDesc
+    from .descriptor import DPPyTargetDesc
 
-    typingctx = OneAPITargetDesc.typingctx
-    targetctx = OneAPITargetDesc.targetctx
+    typingctx = DPPyTargetDesc.typingctx
+    targetctx = DPPyTargetDesc.targetctx
     # TODO handle debug flag
     flags = compiler.Flags()
     # Do not compile (generate native code), just lower (to LLVM)
@@ -62,23 +62,23 @@ def compile_with_oneapi(pyfunc, return_type, args, debug):
 def compile_kernel(device, pyfunc, args, debug=False):
     if DEBUG:
         print("compile_kernel", args)
-    cres = compile_with_oneapi(pyfunc, types.void, args, debug=debug)
+    cres = compile_with_dppy(pyfunc, types.void, args, debug=debug)
     func = cres.library.get_function(cres.fndesc.llvm_func_name)
     kernel = cres.target_context.prepare_ocl_kernel(func, cres.signature.args)
-    oclkern = OneAPIKernel(device_env=device,
-                           llvm_module=kernel.module,
-                           name=kernel.name,
-                           argtypes=cres.signature.args)
+    oclkern = DPPyKernel(device_env=device,
+                         llvm_module=kernel.module,
+                         name=kernel.name,
+                         argtypes=cres.signature.args)
     return oclkern
 
 
 def compile_kernel_parfor(device, func_ir, args, debug=False):
     if DEBUG:
         print("compile_kernel_parfor", args)
-    cres = compile_with_oneapi(func_ir, types.void, args, debug=debug)
+    cres = compile_with_dppy(func_ir, types.void, args, debug=debug)
     func = cres.library.get_function(cres.fndesc.llvm_func_name)
     kernel = cres.target_context.prepare_ocl_kernel(func, cres.signature.args)
-    oclkern = OneAPIKernel(device_env=device,
+    oclkern = Kernel(device_env=device,
                            llvm_module=kernel.module,
                            name=kernel.name,
                            argtypes=cres.signature.args)
@@ -97,7 +97,7 @@ def _ensure_size_or_append(val, size):
         val.append(1)
 
 
-class OneAPIKernelBase(object):
+class DPPyKernelBase(object):
     """Define interface for configurable kernels
     """
 
@@ -183,13 +183,13 @@ def __getitem__(self, args):
 #        return context, device, program, kernel
 
 
-class OneAPIKernel(OneAPIKernelBase):
+class DPPyKernel(DPPyKernelBase):
     """
     A OCL kernel object
     """
 
     def __init__(self, device_env, llvm_module, name, argtypes):
-        super(OneAPIKernel, self).__init__()
+        super(DPPyKernel, self).__init__()
         self._llvm_module = llvm_module
         self.assembly = self.binary = llvm_module.__str__()
         self.entry_name = name
@@ -200,7 +200,7 @@ def __init__(self, device_env, llvm_module, name, argtypes):
         #                                 binary=self.binary)
         # First-time compilation using SPIRV-Tools
         self.spirv_bc = spirv_generator.llvm_to_spirv(self.binary)
-        #print("OneAPIKernel:", self.spirv_bc, type(self.spirv_bc))
+        #print("DPPyKernel:", self.spirv_bc, type(self.spirv_bc))
         # create a program
         self.program = driver.Program(device_env, self.spirv_bc)
         #  create a kernel
@@ -336,16 +336,16 @@ def _unpack_argument(self, ty, val, queue, retr, kernelargs):
             raise NotImplementedError(ty, val)
 
 
-class AutoJitOneAPIKernel(OneAPIKernelBase):
+class AutoJitDPPyKernel(DPPyKernelBase):
     def __init__(self, func):
 
-        super(AutoJitOneAPIKernel, self).__init__()
+        super(AutoJitDPPyKernel, self).__init__()
         self.py_func = func
         self.definitions = {}
 
-        from .descriptor import OneAPITargetDesc
+        from .descriptor import DPPyTargetDesc
 
-        self.typingctx = OneAPITargetDesc.typingctx
+        self.typingctx = DPPyTargetDesc.typingctx
 
     def __call__(self, *args):
         if self.device_env is None:

numba/oneapi/codegen.py renamed to numba/dppy/codegen.py

@@ -1,11 +1,10 @@
 from __future__ import print_function, absolute_import, division
 from numba import sigutils, types
-from .compiler import (compile_kernel, AutoJitOneAPIKernel)
+from .compiler import (compile_kernel, AutoJitDPPyKernel)
 
 
 def jit(signature=None, debug=False):
-    """JIT compile a python function conforming using the
-    Numba-OneAPI backend
+    """JIT compile a python function conforming using the DPPy backend
     """
     if signature is None:
         return autojit(debug=False)
@@ -23,8 +22,7 @@ def autojit(debug=False):
 def _kernel_jit(signature, debug):
     argtypes, restype = sigutils.normalize_signature(signature)
     if restype is not None and restype != types.void:
-        msg = ("OneAPI/OpenCL kernel must have void return type "
-               "but got {restype}")
+        msg = ("DPPy kernel must have void return type but got {restype}")
         raise TypeError(msg.format(restype=restype))
 
     def _wrapped(pyfunc):
@@ -34,4 +32,4 @@ def _wrapped(pyfunc):
 
 
 def _kernel_autojit(pyfunc):
-    return AutoJitOneAPIKernel(pyfunc)
+    return AutoJitDPPyKernel(pyfunc)

numba/oneapi/compiler.py renamed to numba/dppy/compiler.py

@@ -1,14 +1,14 @@
 from __future__ import print_function, division, absolute_import
 from numba.targets.descriptors import TargetDescriptor
 from numba.targets.options import TargetOptions
-from .target import OneAPITargetContext, OneAPITypingContext
+from .target import DPPyTargetContext, DPPyTypingContext
 
 
 class CPUTargetOptions(TargetOptions):
     OPTIONS = {}
 
 
-class OneAPITargetDesc(TargetDescriptor):
+class DPPyTargetDesc(TargetDescriptor):
     options = CPUTargetOptions
-    typingctx = OneAPITypingContext()
-    targetctx = OneAPITargetContext(typingctx)
+    typingctx = DPPyTypingContext()
+    targetctx = DPPyTargetContext(typingctx)

numba/oneapi/decorators.py renamed to numba/dppy/decorators.py

@@ -14,12 +14,12 @@
 #    shared,
     sub_group_barrier,
 )
-#from .oneapidriver.error import OneAPISupportError
+
 from . import initialize
 from .errors import KernelRuntimeError
 
 from .decorators import jit, autojit
-from .oneapidriver.driver import runtime
+from .dppy_driver.driver import runtime
 
 
 def is_available():

numba/oneapi/descriptor.py renamed to numba/dppy/descriptor.py

@@ -5,7 +5,7 @@
 from numba.targets.descriptors import TargetDescriptor
 from numba.targets.options import TargetOptions
 from numba import ocl
-from numba.oneapi import jit, autojit
+from numba.dppy import jit, autojit
 from .descriptor import OCLTargetDesc
 from numba.npyufunc.deviceufunc import (UFuncMechanism, GenerializedUFunc,
                                         GUFuncCallSteps)