@@ -25,42 +25,8 @@ while [ "$1" != "" ]; do
     shift
 done
 
-OPENCL_INCLUDE=""
-if [ -z "$OPENCL_HOME" ]; then
-    OPENCL_INCLUDE=""
-else
-    OPENCL_INCLUDE=-I${OPENCL_HOME}/include
-fi
-
 set -x
 
-cd numba/dppy/dppy_driver
-
-$CC ${DEBUG_FLAGS} -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -fPIC ${OPENCL_INCLUDE} -c opencllite.c -o opencllite.o
-#gcc -g -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 "opencllite failed to build...exiting"
-    cd ../../..
-    exit $gcc_ret
-fi
-
-ar rcs libdpglue.a opencllite.o
-
-#gcc -L. -shared -o libdpglue.so -Wl,--whole-archive -lopencllite
-$CC ${DEBUG_FLAGS} -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -shared -fPIC ${OPENCL_INCLUDE} -o libdpglue_so.so opencllite.c
-#gcc -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 "opencllite failed to build...exiting"
-    cd ../../..
-    exit $gcc_ret
-fi
-
-cd ../../..
-
 python setup.py clean --all
-python setup.py build_ext --inplace
+python setup.py build --inplace
 python setup.py develop
@@ -1,22 +1,5 @@
 #!/bin/bash
 
-OPENCL_INCLUDE=""
-if [ -z "$OPENCL_HOME" ]; then
-    OPENCL_INCLUDE=-I/usr/include
-else
-    OPENCL_INCLUDE=-I${OPENCL_HOME}/include
-fi
-
-SRC_PATH="${SRC_DIR}/numba/dppy/dppy_driver"
-
-$CC -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -fPIC ${OPENCL_INCLUDE} -c ${SRC_PATH}/opencllite.c -o ${SRC_PATH}/opencllite.o
-
-ar rcs ${SRC_PATH}/libdpglue.a ${SRC_PATH}/opencllite.o
-
-$CC -Wall -Wextra -Winit-self -Wuninitialized -Wmissing-declarations -std=c99 -fdiagnostics-color=auto -shared -fPIC ${OPENCL_INCLUDE} -o ${SRC_PATH}/libdpglue_so.so ${SRC_PATH}/opencllite.c
-
-cp ${SRC_PATH}/libdpglue_so.so $PREFIX/lib/
-
 $PYTHON buildscripts/remove_unwanted_files.py
 
-MACOSX_DEPLOYMENT_TARGET=10.10 $PYTHON setup.py build_ext --inplace install --single-version-externally-managed --record=record.txt
+MACOSX_DEPLOYMENT_TARGET=10.10 $PYTHON setup.py build install --single-version-externally-managed --record=record.txt
@@ -17,8 +17,6 @@ build:
     # optional dependency: required only when omp is chosen as the backend for
     # the threading layer
     - lib/libiomp5.dylib # [osx]
-  script_env:
-    - OEPNCL_HOME
 
 requirements:
   # build and run dependencies are duplicated to avoid setuptools issues
@@ -30,25 +28,25 @@ requirements:
     - llvm-openmp              # [osx]
     - intel-openmp             # [osx]
   host:
-    - python
-    - numpy
+    - python >=3.5
+    - numpy >=1.17
     - setuptools
     # On channel https://anaconda.org/numba/
-    - llvmlite 0.31.*
+    - llvmlite >=0.31.*
     - funcsigs                 # [py27]
     - singledispatch           # [py27]
     # TBB devel version is to match TBB libs
     - tbb-devel >=2018.0.5     # [not ((armv6l or armv7l or aarch64) or (win and py27))]
-    - cffi >=1.0.0
+    - dppy
   run:
-    - python >=3.6
-    - numpy >=1.15
+    - python >=3.5
+    - numpy >=1.17
     - setuptools
     # On channel https://anaconda.org/numba/
-    - llvmlite 0.31.*
+    - llvmlite >=0.31.*
     - funcsigs                 # [py27]
     - singledispatch           # [py27]
-    - cffi >=1.0.0
+    - dppy
   run_constrained:
     # If TBB is present it must be at least this version from Anaconda due to
     # build flag issues triggering UB
 
@@ -5,7 +5,7 @@
 
 from numba import config
 import numba.testing
-from .dppy_driver.driver import *
+from dppy.core import *
 from .device_init import *
 
 def test(*args, **kwargs):
 
@@ -4,11 +4,13 @@
 
 from numba.typing.templates import ConcreteTemplate
 from numba import types, compiler, ir
-from .dppy_driver import driver
 from numba.typing.templates import AbstractTemplate
 from numba import ctypes_support as ctypes
-from numba.dppy.dppy_driver import spirv_generator
 from types import FunctionType
+
+import dppy.core as driver
+from . import spirv_generator
+
 import os
 
 DEBUG=os.environ.get('NUMBA_DPPY_DEBUG', None)
@@ -23,7 +25,7 @@ def _raise_no_device_found_error():
 
 def _raise_invalid_kernel_enqueue_args():
     error_message = ("Incorrect number of arguments for enquing dppy.kernel. "
-                     "Usage: dppy_driver.device_env, global size, local size. "
+                     "Usage: device_env, global size, local size. "
                      "The local size argument is optional.")
     raise ValueError(error_message)
 
@@ -178,7 +180,7 @@ def forall(self, nelem, local_size=64, queue=None):
     def __getitem__(self, args):
         """Mimick CUDA python's square-bracket notation for configuration.
         This assumes the argument to be:
-            `dppy_driver.device_env, global size, local size`
+            `device_env, global size, local size`
         """
         ls = None
         nargs = len(args)
 
@@ -18,7 +18,7 @@
 from . import initialize
 
 from .decorators import kernel, autojit
-from .dppy_driver.driver import runtime
+from dppy.core import runtime
 from . import target