(numba/dppy) Updated to use sycllite branch from dppy-backend

reazulhoque · reazulhoque · commit c05dc4ab93cd · 2020-06-29T15:22:15.000-05:00
diff --git a/__init__.py b/__init__.py
@@ -5,7 +5,7 @@
 
 from numba import config
 import numba.testing
-from dppy.core import *
+from dppy.ocldrv import *
 from .device_init import *
 
 def test(*args, **kwargs):
diff --git a/compiler.py b/compiler.py
@@ -10,7 +10,7 @@
 from types import FunctionType
 from inspect import signature
 
-import dppy.core as driver
+import dppy.ocldrv as driver
 from . import spirv_generator
 
 import os
diff --git a/device_init.py b/device_init.py
@@ -23,7 +23,7 @@
 from . import initialize
 
 from .decorators import kernel, func, autojit
-from dppy.core import runtime
+from dppy.ocldrv import runtime
 from . import target
 
 
diff --git a/dppy_host_fn_call_gen.py b/dppy_host_fn_call_gen.py
@@ -1,6 +1,6 @@
 from __future__ import print_function, division, absolute_import
 
-import dppy.core as driver
+import dppy.ocldrv as driver
 import llvmlite.llvmpy.core as lc
 import llvmlite.ir.values as liv
 import llvmlite.ir as lir
diff --git a/dppy_lowerer.py b/dppy_lowerer.py
@@ -47,7 +47,7 @@
 from .target import SPIR_GENERIC_ADDRSPACE
 from .dufunc_inliner import dufunc_inliner
 from . import dppy_host_fn_call_gen as dppy_call_gen
-import dppy.core as driver
+import dppy.ocldrv as driver
 
 
 def _print_block(block):
diff --git a/examples/dppy_func.py b/examples/dppy_func.py
@@ -3,7 +3,7 @@
 from numba import dppy
 import math
 
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.func
diff --git a/examples/matmul.py b/examples/matmul.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel
diff --git a/examples/pairwise_distance.py b/examples/pairwise_distance.py
@@ -7,7 +7,7 @@
 import timeit
 
 from numba import dppy
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 parser = argparse.ArgumentParser(description='Program to compute pairwise distance')
 
diff --git a/examples/sum-hybrid.py b/examples/sum-hybrid.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel
diff --git a/examples/sum.py b/examples/sum.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel
diff --git a/examples/sum2D.py b/examples/sum2D.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel
diff --git a/examples/sum_ndarray.py b/examples/sum_ndarray.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel(access_types={"read_only": ['a', 'b'], "write_only": ['c'], "read_write": []})
diff --git a/examples/sum_reduction.py b/examples/sum_reduction.py
@@ -5,7 +5,7 @@
 import time
 
 from numba import dppy
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel
diff --git a/examples/sum_reduction_ocl.py b/examples/sum_reduction_ocl.py
@@ -3,7 +3,7 @@
 from numba import dppy, int32
 import math
 
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 def sum_reduction_device_plus_host():
diff --git a/examples/sum_reduction_recursive_ocl.py b/examples/sum_reduction_recursive_ocl.py
@@ -3,7 +3,7 @@
 from numba import dppy, int32
 import math
 
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 def recursive_reduction(size, group_size,
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,7 +1,7 @@
 from numba.testing import SerialSuite
 from numba.testing import load_testsuite
 from os.path import dirname, join
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 def load_tests(loader, tests, pattern):
 
diff --git a/tests/dppy/test_arg_accessor.py b/tests/dppy/test_arg_accessor.py
@@ -5,7 +5,7 @@
 from numba import dppy
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel(access_types={"read_only": ['a', 'b'], "write_only": ['c'], "read_write": []})
diff --git a/tests/dppy/test_arg_types.py b/tests/dppy/test_arg_types.py
@@ -5,7 +5,7 @@
 from numba import dppy
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @dppy.kernel
diff --git a/tests/dppy/test_atomic_op.py b/tests/dppy/test_atomic_op.py
@@ -6,7 +6,7 @@
 from numba import dppy
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 def atomic_add(ary):
diff --git a/tests/dppy/test_barrier.py b/tests/dppy/test_barrier.py
@@ -4,7 +4,7 @@
 
 from numba import unittest_support as unittest
 from numba import dppy, float32
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
diff --git a/tests/dppy/test_black_scholes.py b/tests/dppy/test_black_scholes.py
@@ -7,7 +7,7 @@
 from numba import dppy
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 RISKFREE = 0.02
diff --git a/tests/dppy/test_caching.py b/tests/dppy/test_caching.py
@@ -4,7 +4,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
diff --git a/tests/dppy/test_device_array_args.py b/tests/dppy/test_device_array_args.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
diff --git a/tests/dppy/test_dppy_func.py b/tests/dppy/test_dppy_func.py
@@ -5,7 +5,7 @@
 from numba import dppy
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
diff --git a/tests/dppy/test_math_functions.py b/tests/dppy/test_math_functions.py
@@ -5,7 +5,7 @@
 import sys
 import numpy as np
 from numba import dppy
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 import math
diff --git a/tests/dppy/test_numpy_bit_twiddling_functions.py b/tests/dppy/test_numpy_bit_twiddling_functions.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 class TestNumpy_bit_twiddling_functions(DPPYTestCase):
diff --git a/tests/dppy/test_numpy_comparison_functions.py b/tests/dppy/test_numpy_comparison_functions.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 class TestNumpy_comparison_functions(DPPYTestCase):
     a = np.array([4,5,6])
diff --git a/tests/dppy/test_numpy_floating_functions.py b/tests/dppy/test_numpy_floating_functions.py
@@ -7,7 +7,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 class TestNumpy_floating_functions(DPPYTestCase):
     def test_isfinite(self):
diff --git a/tests/dppy/test_numpy_math_functions.py b/tests/dppy/test_numpy_math_functions.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 class TestNumpy_math_functions(DPPYTestCase):
     N = 10
diff --git a/tests/dppy/test_numpy_trigonomteric_functions.py b/tests/dppy/test_numpy_trigonomteric_functions.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 class TestNumpy_math_functions(DPPYTestCase):
     N = 10
diff --git a/tests/dppy/test_prange.py b/tests/dppy/test_prange.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 class TestPrange(DPPYTestCase):
diff --git a/tests/dppy/test_print.py b/tests/dppy/test_print.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 @unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
diff --git a/tests/dppy/test_sum_reduction.py b/tests/dppy/test_sum_reduction.py
@@ -7,7 +7,7 @@
 from numba import dppy
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 @dppy.kernel
 def reduction_kernel(A, R, stride):
diff --git a/tests/dppy/test_vectorize.py b/tests/dppy/test_vectorize.py
@@ -8,7 +8,7 @@
 from numba.dppy.testing import unittest
 from numba.dppy.testing import DPPYTestCase
 
-import dppy.core as ocldrv
+import dppy.ocldrv as ocldrv
 
 
 class TestVectorize(DPPYTestCase):
