From 11574d7371879c9d3e7dc7f2e056193c6b1a495d Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Thu, 12 Nov 2020 15:54:49 -0600 Subject: [PATCH 01/11] Add setup.py It is initial draft version. --- setup.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000000..36c282a39e --- /dev/null +++ b/setup.py @@ -0,0 +1,18 @@ +from setuptools import find_packages, setup + +packages = find_packages(include=["numba_dppy", "numba_dppy.*"]) + +install_requires = [ + 'numba', + 'dpctl', +] + +metadata = dict( + name="numba-dppy", + description="Numba extension for Intel CPU and GPU backend", + packages=packages, + install_requires=install_requires, +) + +setup(**metadata) + From 52ea82404d39b2aa8257480ce8dfc32ec3a50b96 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 13 Nov 2020 01:11:05 +0300 Subject: [PATCH 02/11] Replace numba.dppl with numba_dppy Now numba.dppl is placed in separate package numba_dppy. --- numba_dppy/__init__.py | 2 +- numba_dppy/codegen.py | 2 +- numba_dppy/dispatcher.py | 2 +- numba_dppy/dppl_lowerer.py | 12 ++++++------ numba_dppy/dppl_offload_dispatcher.py | 2 +- numba_dppy/dppl_passes.py | 2 +- numba_dppy/initialize.py | 2 +- numba_dppy/ocl/oclimpl.py | 4 ++-- numba_dppy/ocl/stubs.py | 2 +- numba_dppy/spirv_generator.py | 2 +- numba_dppy/target.py | 6 +++--- numba_dppy/target_dispatcher.py | 2 +- numba_dppy/tests/dppl/test_arg_accessor.py | 4 ++-- numba_dppy/tests/dppl/test_arg_types.py | 4 ++-- numba_dppy/tests/dppl/test_atomic_op.py | 6 +++--- numba_dppy/tests/dppl/test_barrier.py | 4 ++-- numba_dppy/tests/dppl/test_black_scholes.py | 4 ++-- numba_dppy/tests/dppl/test_caching.py | 4 ++-- numba_dppy/tests/dppl/test_device_array_args.py | 4 ++-- numba_dppy/tests/dppl/test_dpctl_api.py | 4 ++-- numba_dppy/tests/dppl/test_dpnp_functions.py | 6 +++--- numba_dppy/tests/dppl/test_dppl_fallback.py | 4 ++-- numba_dppy/tests/dppl/test_dppl_func.py | 4 ++-- numba_dppy/tests/dppl/test_math_functions.py | 4 ++-- .../dppl/test_numpy_bit_twiddling_functions.py | 4 ++-- .../dppl/test_numpy_comparison_functions.py | 4 ++-- .../tests/dppl/test_numpy_floating_functions.py | 4 ++-- .../tests/dppl/test_numpy_math_functions.py | 4 ++-- .../dppl/test_numpy_trigonomteric_functions.py | 4 ++-- .../tests/dppl/test_parfor_lower_message.py | 6 +++--- numba_dppy/tests/dppl/test_prange.py | 16 ++++++++-------- numba_dppy/tests/dppl/test_print.py | 4 ++-- numba_dppy/tests/dppl/test_sum_reduction.py | 4 ++-- numba_dppy/tests/dppl/test_vectorize.py | 4 ++-- numba_dppy/tests/dppl/test_with_context.py | 10 +++++----- 35 files changed, 78 insertions(+), 78 deletions(-) diff --git a/numba_dppy/__init__.py b/numba_dppy/__init__.py index 4b6588c393..5ea4c48a1e 100644 --- a/numba_dppy/__init__.py +++ b/numba_dppy/__init__.py @@ -516,4 +516,4 @@ def test(*args, **kwargs): if not dppl_present and not is_available(): dppl_error() - return numba.testing.test("numba.dppl.tests", *args, **kwargs) + return numba.testing.test("numba_dppy.tests", *args, **kwargs) diff --git a/numba_dppy/codegen.py b/numba_dppy/codegen.py index 3e57f49326..4e278d7ebc 100644 --- a/numba_dppy/codegen.py +++ b/numba_dppy/codegen.py @@ -41,7 +41,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.dppl.compiler). + # generated (in numba_dppy.compiler). return None diff --git a/numba_dppy/dispatcher.py b/numba_dppy/dispatcher.py index 251b3fd1c9..ba3ce907e7 100644 --- a/numba_dppy/dispatcher.py +++ b/numba_dppy/dispatcher.py @@ -5,7 +5,7 @@ #from numba.targets.descriptors import TargetDescriptor #from numba.targets.options import TargetOptions #from numba import dppl -from numba.dppl import kernel, autojit +from numba_dppy import kernel, autojit from .descriptor import dppl_target #from numba.npyufunc.deviceufunc import (UFuncMechanism, GenerializedUFunc, # GUFuncCallSteps) diff --git a/numba_dppy/dppl_lowerer.py b/numba_dppy/dppl_lowerer.py index b6801293c4..2dbee720c8 100644 --- a/numba_dppy/dppl_lowerer.py +++ b/numba_dppy/dppl_lowerer.py @@ -40,7 +40,7 @@ from .dufunc_inliner import dufunc_inliner from . import dppl_host_fn_call_gen as dppl_call_gen import dpctl -from numba.dppl.target import DPPLTargetContext +from numba_dppy.target import DPPLTargetContext def _print_block(block): @@ -329,7 +329,7 @@ def addrspace_from(params, def_addr): return addrspaces addrspaces = addrspace_from(parfor_params, - numba.dppl.target.SPIR_GLOBAL_ADDRSPACE) + numba_dppy.target.SPIR_GLOBAL_ADDRSPACE) if config.DEBUG_ARRAY_OPT >= 1: print("parfor_params = ", parfor_params, type(parfor_params)) @@ -607,7 +607,7 @@ def print_arg_with_addrspaces(args): print('after DUFunc inline'.center(80, '-')) gufunc_ir.dump() - kernel_func = numba.dppl.compiler.compile_kernel_parfor( + kernel_func = numba_dppy.compiler.compile_kernel_parfor( dpctl.get_current_queue(), gufunc_ir, gufunc_param_types, @@ -975,7 +975,7 @@ def relatively_deep_copy(obj, memo): from numba.core.types.functions import Function, Dispatcher from numba.core.bytecode import FunctionIdentity from numba.core.typing.templates import Signature - from numba.dppl.compiler import DPPLFunctionTemplate + from numba_dppy.compiler import DPPLFunctionTemplate from numba.core.compiler import CompileResult from numba.np.ufunc.dufunc import DUFunc from ctypes import _CFuncPtr @@ -1169,7 +1169,7 @@ def lower(self): self.base_lower = self.gpu_lower lowering.lower_extensions[parfor.Parfor].pop() except Exception as e: - if numba.dppl.compiler.DEBUG: + if numba_dppy.compiler.DEBUG: print("Failed to lower parfor on DPPL-device. Due to:\n", e) lowering.lower_extensions[parfor.Parfor].pop() if (lowering.lower_extensions[parfor.Parfor][-1] == numba.parfors.parfor_lowering._lower_parfor_parallel): @@ -1195,7 +1195,7 @@ def copy_block(block): def lower_parfor_rollback(lowerer, parfor): try: _lower_parfor_gufunc(lowerer, parfor) - if numba.dppl.compiler.DEBUG: + if numba_dppy.compiler.DEBUG: msg = "Parfor lowered on DPPL-device" print(msg, parfor.loc) except Exception as e: diff --git a/numba_dppy/dppl_offload_dispatcher.py b/numba_dppy/dppl_offload_dispatcher.py index 141dd16179..49a599589e 100644 --- a/numba_dppy/dppl_offload_dispatcher.py +++ b/numba_dppy/dppl_offload_dispatcher.py @@ -8,7 +8,7 @@ class DpplOffloadDispatcher(dispatcher.Dispatcher): def __init__(self, py_func, locals={}, targetoptions={}, impl_kind='direct', pipeline_class=compiler.Compiler): if dppl_config.dppl_present: - from numba.dppl.compiler import DPPLCompiler + from numba_dppy.compiler import DPPLCompiler targetoptions['parallel'] = True dispatcher.Dispatcher.__init__(self, py_func, locals=locals, targetoptions=targetoptions, impl_kind=impl_kind, pipeline_class=DPPLCompiler) diff --git a/numba_dppy/dppl_passes.py b/numba_dppy/dppl_passes.py index 6c44120f14..f9e2633c3c 100644 --- a/numba_dppy/dppl_passes.py +++ b/numba_dppy/dppl_passes.py @@ -33,7 +33,7 @@ def dpnp_available(): try: # import dpnp - from numba.dppl.dpnp_glue import dpnp_fptr_interface as dpnp_glue + from numba_dppy.dpnp_glue import dpnp_fptr_interface as dpnp_glue return True except: return False diff --git a/numba_dppy/initialize.py b/numba_dppy/initialize.py index 12d1ebebf2..90cb1f3c76 100644 --- a/numba_dppy/initialize.py +++ b/numba_dppy/initialize.py @@ -5,7 +5,7 @@ def init_jit(): - from numba.dppl.dispatcher import DPPLDispatcher + from numba_dppy.dispatcher import DPPLDispatcher return DPPLDispatcher def initialize_all(): diff --git a/numba_dppy/ocl/oclimpl.py b/numba_dppy/ocl/oclimpl.py index f7589174dd..b92dca7bae 100644 --- a/numba_dppy/ocl/oclimpl.py +++ b/numba_dppy/ocl/oclimpl.py @@ -11,9 +11,9 @@ from numba.core.imputils import Registry from numba.core import cgutils, types from numba.core.itanium_mangler import mangle_c, mangle, mangle_type -from numba.dppl import target +from numba_dppy import target from . import stubs -from numba.dppl.codegen import SPIR_DATA_LAYOUT +from numba_dppy.codegen import SPIR_DATA_LAYOUT registry = Registry() diff --git a/numba_dppy/ocl/stubs.py b/numba_dppy/ocl/stubs.py index f6c5e9f704..2ec95fa9c8 100644 --- a/numba_dppy/ocl/stubs.py +++ b/numba_dppy/ocl/stubs.py @@ -2,7 +2,7 @@ from numba.core import types, ir, typing from numba.core.rewrites.macros import Macro -from numba.dppl.target import SPIR_LOCAL_ADDRSPACE +from numba_dppy.target import SPIR_LOCAL_ADDRSPACE _stub_error = NotImplementedError("This is a stub.") diff --git a/numba_dppy/spirv_generator.py b/numba_dppy/spirv_generator.py index 5d6c1841c0..cee4672ded 100644 --- a/numba_dppy/spirv_generator.py +++ b/numba_dppy/spirv_generator.py @@ -7,7 +7,7 @@ import tempfile from numba import config -from numba.dppl.target import LINK_ATOMIC +from numba_dppy.target import LINK_ATOMIC def _raise_bad_env_path(msg, path, extra=None): diff --git a/numba_dppy/target.py b/numba_dppy/target.py index 7aae358645..f98b69afb8 100644 --- a/numba_dppy/target.py +++ b/numba_dppy/target.py @@ -74,7 +74,7 @@ def _init_data_model_manager(): def _replace_numpy_ufunc_with_opencl_supported_functions(): from numba.np.ufunc_db import _ufunc_db as ufunc_db - from numba.dppl.ocl.mathimpl import lower_ocl_impl, sig_mapper + from numba_dppy.ocl.mathimpl import lower_ocl_impl, sig_mapper ufuncs = [("fabs", np.fabs), ("exp", np.exp), ("log", np.log), ("log10", np.log10), ("expm1", np.expm1), ("log1p", np.log1p), @@ -97,7 +97,7 @@ class DPPLTargetContext(BaseContext): context_name = "dppl.jit" def init(self): - self._internal_codegen = codegen.JITSPIRVCodegen("numba.dppl.jit") + self._internal_codegen = codegen.JITSPIRVCodegen("numba_dppy.jit") self._target_data = (ll.create_target_data(codegen .SPIR_DATA_LAYOUT[utils.MACHINE_BITS])) # Override data model manager to SPIR model @@ -118,7 +118,7 @@ def init(self): def replace_numpy_ufunc_with_opencl_supported_functions(self): - from numba.dppl.ocl.mathimpl import lower_ocl_impl, sig_mapper + from numba_dppy.ocl.mathimpl import lower_ocl_impl, sig_mapper ufuncs = [("fabs", np.fabs), ("exp", np.exp), ("log", np.log), ("log10", np.log10), ("expm1", np.expm1), ("log1p", np.log1p), diff --git a/numba_dppy/target_dispatcher.py b/numba_dppy/target_dispatcher.py index ec754bf471..a721277f22 100644 --- a/numba_dppy/target_dispatcher.py +++ b/numba_dppy/target_dispatcher.py @@ -66,7 +66,7 @@ def get_current_disp(self): if parallel is False or (isinstance(parallel, dict) and parallel.get('offload') is False): raise UnsupportedError(f"Can't use 'with' context with parallel option '{parallel}'") - from numba.dppl import dppl_offload_dispatcher + from numba_dppy import dppl_offload_dispatcher if target is None: if dpctl.get_current_device_type() == dpctl.device_type.gpu: diff --git a/numba_dppy/tests/dppl/test_arg_accessor.py b/numba_dppy/tests/dppl/test_arg_accessor.py index 10a28bc962..05ce199b2d 100644 --- a/numba_dppy/tests/dppl/test_arg_accessor.py +++ b/numba_dppy/tests/dppl/test_arg_accessor.py @@ -3,8 +3,8 @@ import numpy as np from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_arg_types.py b/numba_dppy/tests/dppl/test_arg_types.py index e5d419bef0..2f935ac9c3 100644 --- a/numba_dppy/tests/dppl/test_arg_types.py +++ b/numba_dppy/tests/dppl/test_arg_types.py @@ -3,8 +3,8 @@ import numpy as np from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_atomic_op.py b/numba_dppy/tests/dppl/test_atomic_op.py index 1ea6e86f53..b38310bcbf 100644 --- a/numba_dppy/tests/dppl/test_atomic_op.py +++ b/numba_dppy/tests/dppl/test_atomic_op.py @@ -4,8 +4,8 @@ import numba from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl def atomic_add_int32(ary): @@ -124,7 +124,7 @@ def call_fn_for_datatypes(fn, result, input, global_size): @unittest.skipUnless(dpctl.has_gpu_queues(), 'test only on GPU system') -@unittest.skipUnless(numba.dppl.ocl.atomic_support_present(), 'test only when atomic support is present') +@unittest.skipUnless(numba_dppy.ocl.atomic_support_present(), 'test only when atomic support is present') class TestAtomicOp(DPPLTestCase): def test_atomic_add_global(self): @dppl.kernel diff --git a/numba_dppy/tests/dppl/test_barrier.py b/numba_dppy/tests/dppl/test_barrier.py index a3699518c4..551f3a5e0c 100644 --- a/numba_dppy/tests/dppl/test_barrier.py +++ b/numba_dppy/tests/dppl/test_barrier.py @@ -2,8 +2,8 @@ import numpy as np -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase from numba import dppl, float32 import dpctl diff --git a/numba_dppy/tests/dppl/test_black_scholes.py b/numba_dppy/tests/dppl/test_black_scholes.py index 41b596f009..006a8b89a3 100644 --- a/numba_dppy/tests/dppl/test_black_scholes.py +++ b/numba_dppy/tests/dppl/test_black_scholes.py @@ -5,8 +5,8 @@ import time from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_caching.py b/numba_dppy/tests/dppl/test_caching.py index a2ae0443b5..088730a4a3 100644 --- a/numba_dppy/tests/dppl/test_caching.py +++ b/numba_dppy/tests/dppl/test_caching.py @@ -5,8 +5,8 @@ import numpy as np from numba import dppl import dpctl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase def data_parallel_sum(a, b, c): diff --git a/numba_dppy/tests/dppl/test_device_array_args.py b/numba_dppy/tests/dppl/test_device_array_args.py index 20ab9fc76f..752002a0b8 100644 --- a/numba_dppy/tests/dppl/test_device_array_args.py +++ b/numba_dppy/tests/dppl/test_device_array_args.py @@ -6,8 +6,8 @@ import numpy as np from numba import dppl import dpctl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase @dppl.kernel def data_parallel_sum(a, b, c): diff --git a/numba_dppy/tests/dppl/test_dpctl_api.py b/numba_dppy/tests/dppl/test_dpctl_api.py index 5de5ab297e..bb72a35cf2 100644 --- a/numba_dppy/tests/dppl/test_dpctl_api.py +++ b/numba_dppy/tests/dppl/test_dpctl_api.py @@ -2,8 +2,8 @@ import numpy as np -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_dpnp_functions.py b/numba_dppy/tests/dppl/test_dpnp_functions.py index 724434c350..60436999f6 100644 --- a/numba_dppy/tests/dppl/test_dpnp_functions.py +++ b/numba_dppy/tests/dppl/test_dpnp_functions.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase def test_for_different_datatypes(fn, test_fn, dims, arg_count, tys, np_all=False, matrix=None): @@ -68,7 +68,7 @@ def test_for_dimensions(fn, test_fn, dims, tys, np_all=False): def ensure_dpnp(): try: # import dpnp - from numba.dppl.dpnp_glue import dpnp_fptr_interface as dpnp_glue + from numba_dppy.dpnp_glue import dpnp_fptr_interface as dpnp_glue return True except: return False diff --git a/numba_dppy/tests/dppl/test_dppl_fallback.py b/numba_dppy/tests/dppl/test_dppl_fallback.py index 680a30b92f..c08a2cc325 100644 --- a/numba_dppy/tests/dppl/test_dppl_fallback.py +++ b/numba_dppy/tests/dppl/test_dppl_fallback.py @@ -4,8 +4,8 @@ import numba from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase from numba.tests.support import captured_stderr import dpctl import sys diff --git a/numba_dppy/tests/dppl/test_dppl_func.py b/numba_dppy/tests/dppl/test_dppl_func.py index 910b33de7a..c4d6fc3406 100644 --- a/numba_dppy/tests/dppl/test_dppl_func.py +++ b/numba_dppy/tests/dppl/test_dppl_func.py @@ -3,8 +3,8 @@ import numpy as np from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_math_functions.py b/numba_dppy/tests/dppl/test_math_functions.py index 1f4824e8ba..386cd5403f 100644 --- a/numba_dppy/tests/dppl/test_math_functions.py +++ b/numba_dppy/tests/dppl/test_math_functions.py @@ -6,8 +6,8 @@ import numpy as np from numba import dppl import dpctl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import math @dppl.kernel diff --git a/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py b/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py index fbcd621669..abedcf190b 100644 --- a/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase class TestNumpy_bit_twiddling_functions(DPPLTestCase): diff --git a/numba_dppy/tests/dppl/test_numpy_comparison_functions.py b/numba_dppy/tests/dppl/test_numpy_comparison_functions.py index 2b43bf50b0..9161172058 100644 --- a/numba_dppy/tests/dppl/test_numpy_comparison_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_comparison_functions.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase class TestNumpy_comparison_functions(DPPLTestCase): a = np.array([4,5,6]) diff --git a/numba_dppy/tests/dppl/test_numpy_floating_functions.py b/numba_dppy/tests/dppl/test_numpy_floating_functions.py index 2deda7949a..a8c5728f62 100644 --- a/numba_dppy/tests/dppl/test_numpy_floating_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_floating_functions.py @@ -4,8 +4,8 @@ import sys import numpy as np from numba import dppl, njit -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase class TestNumpy_floating_functions(DPPLTestCase): diff --git a/numba_dppy/tests/dppl/test_numpy_math_functions.py b/numba_dppy/tests/dppl/test_numpy_math_functions.py index 170b3483ba..ecf0680683 100644 --- a/numba_dppy/tests/dppl/test_numpy_math_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_math_functions.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase class TestNumpy_math_functions(DPPLTestCase): diff --git a/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py b/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py index 13678dead6..56ab8eded5 100644 --- a/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase class TestNumpy_math_functions(DPPLTestCase): diff --git a/numba_dppy/tests/dppl/test_parfor_lower_message.py b/numba_dppy/tests/dppl/test_parfor_lower_message.py index b18ec56de4..395a3fd72f 100644 --- a/numba_dppy/tests/dppl/test_parfor_lower_message.py +++ b/numba_dppy/tests/dppl/test_parfor_lower_message.py @@ -1,7 +1,7 @@ import numpy as np import numba from numba import dppl, njit, prange -from numba.dppl.testing import unittest, DPPLTestCase +from numba_dppy.testing import unittest, DPPLTestCase from numba.tests.support import captured_stdout import dpctl.ocldrv as ocldrv @@ -20,13 +20,13 @@ def prange_example(): @unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system') class TestParforMessage(DPPLTestCase): def test_parfor_message(self): - numba.dppl.compiler.DEBUG = 1 + numba_dppy.compiler.DEBUG = 1 jitted = njit(parallel={'offload':True})(prange_example) with captured_stdout() as got: jitted() - numba.dppl.compiler.DEBUG = 0 + numba_dppy.compiler.DEBUG = 0 self.assertTrue('Parfor lowered on DPPL-device' in got.getvalue()) diff --git a/numba_dppy/tests/dppl/test_prange.py b/numba_dppy/tests/dppl/test_prange.py index 7d567b096d..50e77b175e 100644 --- a/numba_dppy/tests/dppl/test_prange.py +++ b/numba_dppy/tests/dppl/test_prange.py @@ -6,8 +6,8 @@ import numpy as np import numba from numba import dppl, njit, prange -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase from numba.tests.support import captured_stdout @@ -105,8 +105,8 @@ def prange_example(): return a - old_debug = numba.dppl.compiler.DEBUG - numba.dppl.compiler.DEBUG = 1 + old_debug = numba_dppy.compiler.DEBUG + numba_dppy.compiler.DEBUG = 1 jitted = njit(parallel={'offload':True})(prange_example) with captured_stdout() as got: @@ -114,7 +114,7 @@ def prange_example(): res = prange_example() - numba.dppl.compiler.DEBUG = old_debug + numba_dppy.compiler.DEBUG = old_debug self.assertEqual(got.getvalue().count('Parfor lowered on DPPL-device'), 2) self.assertEqual(got.getvalue().count('Failed to lower parfor on DPPL-device'), 0) @@ -133,8 +133,8 @@ def prange_example(): return a - old_debug = numba.dppl.compiler.DEBUG - numba.dppl.compiler.DEBUG = 1 + old_debug = numba_dppy.compiler.DEBUG + numba_dppy.compiler.DEBUG = 1 jitted = njit(parallel={'offload':True})(prange_example) with captured_stdout() as got: @@ -142,7 +142,7 @@ def prange_example(): res = prange_example() - numba.dppl.compiler.DEBUG = old_debug + numba_dppy.compiler.DEBUG = old_debug self.assertEqual(got.getvalue().count('Parfor lowered on DPPL-device'), 2) self.assertEqual(got.getvalue().count('Failed to lower parfor on DPPL-device'), 0) diff --git a/numba_dppy/tests/dppl/test_print.py b/numba_dppy/tests/dppl/test_print.py index 5da4bdd7fb..7fdb5b4d77 100644 --- a/numba_dppy/tests/dppl/test_print.py +++ b/numba_dppy/tests/dppl/test_print.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit, prange -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_sum_reduction.py b/numba_dppy/tests/dppl/test_sum_reduction.py index e4c09ca8e9..5fb5ca7f02 100644 --- a/numba_dppy/tests/dppl/test_sum_reduction.py +++ b/numba_dppy/tests/dppl/test_sum_reduction.py @@ -5,8 +5,8 @@ import time from numba import dppl -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase import dpctl @dppl.kernel diff --git a/numba_dppy/tests/dppl/test_vectorize.py b/numba_dppy/tests/dppl/test_vectorize.py index efadcf3f0b..08ef0c448f 100644 --- a/numba_dppy/tests/dppl/test_vectorize.py +++ b/numba_dppy/tests/dppl/test_vectorize.py @@ -5,8 +5,8 @@ import sys import numpy as np from numba import dppl, njit, vectorize -from numba.dppl.testing import unittest -from numba.dppl.testing import DPPLTestCase +from numba_dppy.testing import unittest +from numba_dppy.testing import DPPLTestCase class TestVectorize(DPPLTestCase): diff --git a/numba_dppy/tests/dppl/test_with_context.py b/numba_dppy/tests/dppl/test_with_context.py index 4990e00f27..0ea2023ae5 100644 --- a/numba_dppy/tests/dppl/test_with_context.py +++ b/numba_dppy/tests/dppl/test_with_context.py @@ -3,7 +3,7 @@ from numba import dppl, njit from numba.core import errors from numba.tests.support import captured_stdout -from numba.dppl.testing import DPPLTestCase, unittest +from numba_dppy.testing import DPPLTestCase, unittest import dpctl @@ -21,7 +21,7 @@ def func(b): a = np.ones((64), dtype=np.float64) nested_func(a, b) - numba.dppl.compiler.DEBUG = 1 + numba_dppy.compiler.DEBUG = 1 expected = np.ones((64), dtype=np.float64) got_gpu = np.ones((64), dtype=np.float64) @@ -29,7 +29,7 @@ def func(b): with dpctl.device_context("opencl:gpu"): func(got_gpu) - numba.dppl.compiler.DEBUG = 0 + numba_dppy.compiler.DEBUG = 0 func(expected) np.testing.assert_array_equal(expected, got_gpu) @@ -47,7 +47,7 @@ def func(b): a = np.ones((64), dtype=np.float64) nested_func(a, b) - numba.dppl.compiler.DEBUG = 1 + numba_dppy.compiler.DEBUG = 1 expected = np.ones((64), dtype=np.float64) got_cpu = np.ones((64), dtype=np.float64) @@ -55,7 +55,7 @@ def func(b): with dpctl.device_context("opencl:cpu"): func(got_cpu) - numba.dppl.compiler.DEBUG = 0 + numba_dppy.compiler.DEBUG = 0 func(expected) np.testing.assert_array_equal(expected, got_cpu) From 705faec88e7b631733480f1b0eecd7d4e8f5afb2 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 13 Nov 2020 01:22:26 +0300 Subject: [PATCH 03/11] Import numba_dppy as dppl Previousply it was `from numba import dppl`. Now it is `import numba_dppy as dppl`. --- numba_dppy/__init__.py | 2 +- numba_dppy/dispatcher.py | 2 +- numba_dppy/dppl_lowerer.py | 2 +- numba_dppy/examples/dppl_func.py | 2 +- numba_dppy/examples/dppl_with_context.py | 3 ++- numba_dppy/examples/matmul.py | 2 +- numba_dppy/examples/pairwise_distance.py | 2 +- numba_dppy/examples/sum-hybrid.py | 2 +- numba_dppy/examples/sum.py | 2 +- numba_dppy/examples/sum2D.py | 2 +- numba_dppy/examples/sum_ndarray.py | 2 +- numba_dppy/examples/sum_reduction.py | 2 +- numba_dppy/examples/sum_reduction_ocl.py | 3 ++- numba_dppy/examples/sum_reduction_recursive_ocl.py | 3 ++- numba_dppy/ocl/ocldecl.py | 2 +- numba_dppy/testing.py | 2 +- numba_dppy/tests/dppl/test_arg_accessor.py | 2 +- numba_dppy/tests/dppl/test_arg_types.py | 2 +- numba_dppy/tests/dppl/test_atomic_op.py | 2 +- numba_dppy/tests/dppl/test_barrier.py | 3 ++- numba_dppy/tests/dppl/test_black_scholes.py | 2 +- numba_dppy/tests/dppl/test_caching.py | 2 +- numba_dppy/tests/dppl/test_device_array_args.py | 2 +- numba_dppy/tests/dppl/test_dpnp_functions.py | 3 ++- numba_dppy/tests/dppl/test_dppl_fallback.py | 2 +- numba_dppy/tests/dppl/test_dppl_func.py | 2 +- numba_dppy/tests/dppl/test_math_functions.py | 2 +- numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py | 3 ++- numba_dppy/tests/dppl/test_numpy_comparison_functions.py | 3 ++- numba_dppy/tests/dppl/test_numpy_floating_functions.py | 3 ++- numba_dppy/tests/dppl/test_numpy_math_functions.py | 3 ++- numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py | 3 ++- numba_dppy/tests/dppl/test_parfor_lower_message.py | 3 ++- numba_dppy/tests/dppl/test_prange.py | 3 ++- numba_dppy/tests/dppl/test_print.py | 3 ++- numba_dppy/tests/dppl/test_sum_reduction.py | 2 +- numba_dppy/tests/dppl/test_vectorize.py | 3 ++- numba_dppy/tests/dppl/test_with_context.py | 3 ++- 38 files changed, 53 insertions(+), 38 deletions(-) diff --git a/numba_dppy/__init__.py b/numba_dppy/__init__.py index 5ea4c48a1e..7f6abdacdd 100644 --- a/numba_dppy/__init__.py +++ b/numba_dppy/__init__.py @@ -164,7 +164,7 @@ def foo(in, out): --------------------------------------------------------------------------- import numpy as np - from numba import dppl + import numba_dppy as dppl import dpctl @dppl.kernel diff --git a/numba_dppy/dispatcher.py b/numba_dppy/dispatcher.py index ba3ce907e7..4fa61d01b6 100644 --- a/numba_dppy/dispatcher.py +++ b/numba_dppy/dispatcher.py @@ -4,7 +4,7 @@ #from numba.targets.descriptors import TargetDescriptor #from numba.targets.options import TargetOptions -#from numba import dppl +#import numba_dppy as dppl from numba_dppy import kernel, autojit from .descriptor import dppl_target #from numba.npyufunc.deviceufunc import (UFuncMechanism, GenerializedUFunc, diff --git a/numba_dppy/dppl_lowerer.py b/numba_dppy/dppl_lowerer.py index 2dbee720c8..cfe85be4bd 100644 --- a/numba_dppy/dppl_lowerer.py +++ b/numba_dppy/dppl_lowerer.py @@ -12,7 +12,7 @@ from numba.core import (compiler, ir, types, sigutils, lowering, funcdesc, config) from numba.parfors import parfor -from numba import dppl +import numba_dppy as dppl from numba.core.ir_utils import (add_offset_to_labels, replace_var_names, remove_dels, diff --git a/numba_dppy/examples/dppl_func.py b/numba_dppy/examples/dppl_func.py index 3856af8144..ec3f0bcbfe 100644 --- a/numba_dppy/examples/dppl_func.py +++ b/numba_dppy/examples/dppl_func.py @@ -1,6 +1,6 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import math import dpctl diff --git a/numba_dppy/examples/dppl_with_context.py b/numba_dppy/examples/dppl_with_context.py index 9931a4552f..15625791d1 100644 --- a/numba_dppy/examples/dppl_with_context.py +++ b/numba_dppy/examples/dppl_with_context.py @@ -1,5 +1,6 @@ import numpy as np -from numba import dppl, njit, prange +from numba import njit, prange +import numba_dppy as dppl import dpctl @njit diff --git a/numba_dppy/examples/matmul.py b/numba_dppy/examples/matmul.py index 37f879b18c..21426efad9 100644 --- a/numba_dppy/examples/matmul.py +++ b/numba_dppy/examples/matmul.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/pairwise_distance.py b/numba_dppy/examples/pairwise_distance.py index cad1f66e4a..0c8d1b991e 100644 --- a/numba_dppy/examples/pairwise_distance.py +++ b/numba_dppy/examples/pairwise_distance.py @@ -6,7 +6,7 @@ import argparse import timeit -from numba import dppl +import numba_dppy as dppl import dpctl import dpctl._memory as dpctl_mem diff --git a/numba_dppy/examples/sum-hybrid.py b/numba_dppy/examples/sum-hybrid.py index fc5671e11b..b387cd3743 100644 --- a/numba_dppy/examples/sum-hybrid.py +++ b/numba_dppy/examples/sum-hybrid.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum.py b/numba_dppy/examples/sum.py index 7471e7fb54..fb10dcaf91 100644 --- a/numba_dppy/examples/sum.py +++ b/numba_dppy/examples/sum.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum2D.py b/numba_dppy/examples/sum2D.py index 74a6b29e2e..f81e51759d 100644 --- a/numba_dppy/examples/sum2D.py +++ b/numba_dppy/examples/sum2D.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum_ndarray.py b/numba_dppy/examples/sum_ndarray.py index 32d79738c5..f8dfb5999c 100644 --- a/numba_dppy/examples/sum_ndarray.py +++ b/numba_dppy/examples/sum_ndarray.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum_reduction.py b/numba_dppy/examples/sum_reduction.py index 5210a997d2..5b68644487 100644 --- a/numba_dppy/examples/sum_reduction.py +++ b/numba_dppy/examples/sum_reduction.py @@ -4,7 +4,7 @@ import math import time -from numba import dppl +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum_reduction_ocl.py b/numba_dppy/examples/sum_reduction_ocl.py index 23bead94e1..73d55eb8ae 100644 --- a/numba_dppy/examples/sum_reduction_ocl.py +++ b/numba_dppy/examples/sum_reduction_ocl.py @@ -1,6 +1,7 @@ import sys import numpy as np -from numba import dppl, int32 +from numba import int32 +import numba_dppy as dppl import math import dpctl diff --git a/numba_dppy/examples/sum_reduction_recursive_ocl.py b/numba_dppy/examples/sum_reduction_recursive_ocl.py index 92514fbcb8..d1ecfb0945 100644 --- a/numba_dppy/examples/sum_reduction_recursive_ocl.py +++ b/numba_dppy/examples/sum_reduction_recursive_ocl.py @@ -1,6 +1,7 @@ import sys import numpy as np -from numba import dppl, int32 +from numba import int32 +import numba_dppy as dppl import math import dpctl diff --git a/numba_dppy/ocl/ocldecl.py b/numba_dppy/ocl/ocldecl.py index de28352571..ae9ec233c7 100644 --- a/numba_dppy/ocl/ocldecl.py +++ b/numba_dppy/ocl/ocldecl.py @@ -4,7 +4,7 @@ from numba.core.typing.templates import (AttributeTemplate, ConcreteTemplate, AbstractTemplate, MacroTemplate, signature, Registry) -from numba import dppl +import numba_dppy as dppl registry = Registry() intrinsic = registry.register diff --git a/numba_dppy/testing.py b/numba_dppy/testing.py index 0ca5048aaf..0da0eaabaf 100644 --- a/numba_dppy/testing.py +++ b/numba_dppy/testing.py @@ -43,6 +43,6 @@ def captured_dppl_stdout(): # Prevent accidentally capturing previously output text sys.stdout.flush() - from numba import dppl + import numba_dppy as dppl with redirect_c_stdout() as stream: yield DPPLTextCapture(stream) diff --git a/numba_dppy/tests/dppl/test_arg_accessor.py b/numba_dppy/tests/dppl/test_arg_accessor.py index 05ce199b2d..7f361180f0 100644 --- a/numba_dppy/tests/dppl/test_arg_accessor.py +++ b/numba_dppy/tests/dppl/test_arg_accessor.py @@ -2,7 +2,7 @@ import numpy as np -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_arg_types.py b/numba_dppy/tests/dppl/test_arg_types.py index 2f935ac9c3..22f0bbf024 100644 --- a/numba_dppy/tests/dppl/test_arg_types.py +++ b/numba_dppy/tests/dppl/test_arg_types.py @@ -2,7 +2,7 @@ import numpy as np -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_atomic_op.py b/numba_dppy/tests/dppl/test_atomic_op.py index b38310bcbf..7bc3ac2c46 100644 --- a/numba_dppy/tests/dppl/test_atomic_op.py +++ b/numba_dppy/tests/dppl/test_atomic_op.py @@ -3,7 +3,7 @@ import numpy as np import numba -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_barrier.py b/numba_dppy/tests/dppl/test_barrier.py index 551f3a5e0c..741e6ee5ac 100644 --- a/numba_dppy/tests/dppl/test_barrier.py +++ b/numba_dppy/tests/dppl/test_barrier.py @@ -4,7 +4,8 @@ from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase -from numba import dppl, float32 +from numba import float32 +import numba_dppy as dppl import dpctl diff --git a/numba_dppy/tests/dppl/test_black_scholes.py b/numba_dppy/tests/dppl/test_black_scholes.py index 006a8b89a3..0a7d0823b3 100644 --- a/numba_dppy/tests/dppl/test_black_scholes.py +++ b/numba_dppy/tests/dppl/test_black_scholes.py @@ -4,7 +4,7 @@ import math import time -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_caching.py b/numba_dppy/tests/dppl/test_caching.py index 088730a4a3..27d0e67c75 100644 --- a/numba_dppy/tests/dppl/test_caching.py +++ b/numba_dppy/tests/dppl/test_caching.py @@ -3,7 +3,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_device_array_args.py b/numba_dppy/tests/dppl/test_device_array_args.py index 752002a0b8..9668ebae13 100644 --- a/numba_dppy/tests/dppl/test_device_array_args.py +++ b/numba_dppy/tests/dppl/test_device_array_args.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_dpnp_functions.py b/numba_dppy/tests/dppl/test_dpnp_functions.py index 60436999f6..c9aa931da9 100644 --- a/numba_dppy/tests/dppl/test_dpnp_functions.py +++ b/numba_dppy/tests/dppl/test_dpnp_functions.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_dppl_fallback.py b/numba_dppy/tests/dppl/test_dppl_fallback.py index c08a2cc325..b7d30283a4 100644 --- a/numba_dppy/tests/dppl/test_dppl_fallback.py +++ b/numba_dppy/tests/dppl/test_dppl_fallback.py @@ -3,7 +3,7 @@ import numpy as np import numba -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase from numba.tests.support import captured_stderr diff --git a/numba_dppy/tests/dppl/test_dppl_func.py b/numba_dppy/tests/dppl/test_dppl_func.py index c4d6fc3406..6c0b3533da 100644 --- a/numba_dppy/tests/dppl/test_dppl_func.py +++ b/numba_dppy/tests/dppl/test_dppl_func.py @@ -2,7 +2,7 @@ import numpy as np -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_math_functions.py b/numba_dppy/tests/dppl/test_math_functions.py index 386cd5403f..97bdc010a8 100644 --- a/numba_dppy/tests/dppl/test_math_functions.py +++ b/numba_dppy/tests/dppl/test_math_functions.py @@ -4,7 +4,7 @@ import sys import numpy as np -from numba import dppl +import numba_dppy as dppl import dpctl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py b/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py index abedcf190b..dbeaa02964 100644 --- a/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_comparison_functions.py b/numba_dppy/tests/dppl/test_numpy_comparison_functions.py index 9161172058..613cc1aaa9 100644 --- a/numba_dppy/tests/dppl/test_numpy_comparison_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_comparison_functions.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_floating_functions.py b/numba_dppy/tests/dppl/test_numpy_floating_functions.py index a8c5728f62..d5eb6eaca0 100644 --- a/numba_dppy/tests/dppl/test_numpy_floating_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_floating_functions.py @@ -3,7 +3,8 @@ import sys import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_math_functions.py b/numba_dppy/tests/dppl/test_numpy_math_functions.py index ecf0680683..dc71e2f856 100644 --- a/numba_dppy/tests/dppl/test_numpy_math_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_math_functions.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py b/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py index 56ab8eded5..2619a97752 100644 --- a/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_parfor_lower_message.py b/numba_dppy/tests/dppl/test_parfor_lower_message.py index 395a3fd72f..6989ea1a8a 100644 --- a/numba_dppy/tests/dppl/test_parfor_lower_message.py +++ b/numba_dppy/tests/dppl/test_parfor_lower_message.py @@ -1,6 +1,7 @@ import numpy as np import numba -from numba import dppl, njit, prange +from numba import njit, prange +import numba_dppy as dppl from numba_dppy.testing import unittest, DPPLTestCase from numba.tests.support import captured_stdout import dpctl.ocldrv as ocldrv diff --git a/numba_dppy/tests/dppl/test_prange.py b/numba_dppy/tests/dppl/test_prange.py index 50e77b175e..4d9d28d2d5 100644 --- a/numba_dppy/tests/dppl/test_prange.py +++ b/numba_dppy/tests/dppl/test_prange.py @@ -5,7 +5,8 @@ import sys import numpy as np import numba -from numba import dppl, njit, prange +from numba import njit, prange +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase from numba.tests.support import captured_stdout diff --git a/numba_dppy/tests/dppl/test_print.py b/numba_dppy/tests/dppl/test_print.py index 7fdb5b4d77..31eacd5b4f 100644 --- a/numba_dppy/tests/dppl/test_print.py +++ b/numba_dppy/tests/dppl/test_print.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit, prange +from numba import njit, prange +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_sum_reduction.py b/numba_dppy/tests/dppl/test_sum_reduction.py index 5fb5ca7f02..30ab5448ce 100644 --- a/numba_dppy/tests/dppl/test_sum_reduction.py +++ b/numba_dppy/tests/dppl/test_sum_reduction.py @@ -4,7 +4,7 @@ import math import time -from numba import dppl +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_vectorize.py b/numba_dppy/tests/dppl/test_vectorize.py index 08ef0c448f..d2672b0d34 100644 --- a/numba_dppy/tests/dppl/test_vectorize.py +++ b/numba_dppy/tests/dppl/test_vectorize.py @@ -4,7 +4,8 @@ import sys import numpy as np -from numba import dppl, njit, vectorize +from numba import njit, vectorize +import numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_with_context.py b/numba_dppy/tests/dppl/test_with_context.py index 0ea2023ae5..8c2789c18d 100644 --- a/numba_dppy/tests/dppl/test_with_context.py +++ b/numba_dppy/tests/dppl/test_with_context.py @@ -1,6 +1,7 @@ import numba import numpy as np -from numba import dppl, njit +from numba import njit +import numba_dppy as dppl from numba.core import errors from numba.tests.support import captured_stdout from numba_dppy.testing import DPPLTestCase, unittest From c193477ae3e1399137e234942d95bda4d203462e Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 13 Nov 2020 01:35:31 +0300 Subject: [PATCH 04/11] Import numba_dppy with its name and as dppl There are many places in code which access to `numba_dppy`. Previously it was `numba.dppl`. It was accessible because `from numba import dppl`. --- numba_dppy/__init__.py | 2 +- numba_dppy/dispatcher.py | 2 +- numba_dppy/dppl_lowerer.py | 2 +- numba_dppy/examples/dppl_func.py | 2 +- numba_dppy/examples/dppl_with_context.py | 2 +- numba_dppy/examples/matmul.py | 2 +- numba_dppy/examples/pairwise_distance.py | 2 +- numba_dppy/examples/sum-hybrid.py | 2 +- numba_dppy/examples/sum.py | 2 +- numba_dppy/examples/sum2D.py | 2 +- numba_dppy/examples/sum_ndarray.py | 2 +- numba_dppy/examples/sum_reduction.py | 2 +- numba_dppy/examples/sum_reduction_ocl.py | 2 +- numba_dppy/examples/sum_reduction_recursive_ocl.py | 2 +- numba_dppy/ocl/ocldecl.py | 2 +- numba_dppy/testing.py | 2 +- numba_dppy/tests/dppl/test_arg_accessor.py | 2 +- numba_dppy/tests/dppl/test_arg_types.py | 2 +- numba_dppy/tests/dppl/test_atomic_op.py | 2 +- numba_dppy/tests/dppl/test_barrier.py | 2 +- numba_dppy/tests/dppl/test_black_scholes.py | 2 +- numba_dppy/tests/dppl/test_caching.py | 2 +- numba_dppy/tests/dppl/test_device_array_args.py | 2 +- numba_dppy/tests/dppl/test_dpnp_functions.py | 2 +- numba_dppy/tests/dppl/test_dppl_fallback.py | 2 +- numba_dppy/tests/dppl/test_dppl_func.py | 2 +- numba_dppy/tests/dppl/test_math_functions.py | 2 +- numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py | 2 +- numba_dppy/tests/dppl/test_numpy_comparison_functions.py | 2 +- numba_dppy/tests/dppl/test_numpy_floating_functions.py | 2 +- numba_dppy/tests/dppl/test_numpy_math_functions.py | 2 +- numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py | 2 +- numba_dppy/tests/dppl/test_parfor_lower_message.py | 2 +- numba_dppy/tests/dppl/test_prange.py | 2 +- numba_dppy/tests/dppl/test_print.py | 2 +- numba_dppy/tests/dppl/test_sum_reduction.py | 2 +- numba_dppy/tests/dppl/test_vectorize.py | 2 +- numba_dppy/tests/dppl/test_with_context.py | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/numba_dppy/__init__.py b/numba_dppy/__init__.py index 7f6abdacdd..7d52138691 100644 --- a/numba_dppy/__init__.py +++ b/numba_dppy/__init__.py @@ -164,7 +164,7 @@ def foo(in, out): --------------------------------------------------------------------------- import numpy as np - import numba_dppy as dppl + import numba_dppy, numba_dppy as dppl import dpctl @dppl.kernel diff --git a/numba_dppy/dispatcher.py b/numba_dppy/dispatcher.py index 4fa61d01b6..a4c32ec7ec 100644 --- a/numba_dppy/dispatcher.py +++ b/numba_dppy/dispatcher.py @@ -4,7 +4,7 @@ #from numba.targets.descriptors import TargetDescriptor #from numba.targets.options import TargetOptions -#import numba_dppy as dppl +#import numba_dppy, numba_dppy as dppl from numba_dppy import kernel, autojit from .descriptor import dppl_target #from numba.npyufunc.deviceufunc import (UFuncMechanism, GenerializedUFunc, diff --git a/numba_dppy/dppl_lowerer.py b/numba_dppy/dppl_lowerer.py index cfe85be4bd..51fb072551 100644 --- a/numba_dppy/dppl_lowerer.py +++ b/numba_dppy/dppl_lowerer.py @@ -12,7 +12,7 @@ from numba.core import (compiler, ir, types, sigutils, lowering, funcdesc, config) from numba.parfors import parfor -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba.core.ir_utils import (add_offset_to_labels, replace_var_names, remove_dels, diff --git a/numba_dppy/examples/dppl_func.py b/numba_dppy/examples/dppl_func.py index ec3f0bcbfe..ec86681457 100644 --- a/numba_dppy/examples/dppl_func.py +++ b/numba_dppy/examples/dppl_func.py @@ -1,6 +1,6 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import math import dpctl diff --git a/numba_dppy/examples/dppl_with_context.py b/numba_dppy/examples/dppl_with_context.py index 15625791d1..c830e81ec6 100644 --- a/numba_dppy/examples/dppl_with_context.py +++ b/numba_dppy/examples/dppl_with_context.py @@ -1,6 +1,6 @@ import numpy as np from numba import njit, prange -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl @njit diff --git a/numba_dppy/examples/matmul.py b/numba_dppy/examples/matmul.py index 21426efad9..35bef5be8a 100644 --- a/numba_dppy/examples/matmul.py +++ b/numba_dppy/examples/matmul.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/pairwise_distance.py b/numba_dppy/examples/pairwise_distance.py index 0c8d1b991e..cc5c232c92 100644 --- a/numba_dppy/examples/pairwise_distance.py +++ b/numba_dppy/examples/pairwise_distance.py @@ -6,7 +6,7 @@ import argparse import timeit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl import dpctl._memory as dpctl_mem diff --git a/numba_dppy/examples/sum-hybrid.py b/numba_dppy/examples/sum-hybrid.py index b387cd3743..418976f53a 100644 --- a/numba_dppy/examples/sum-hybrid.py +++ b/numba_dppy/examples/sum-hybrid.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum.py b/numba_dppy/examples/sum.py index fb10dcaf91..f97b8243cb 100644 --- a/numba_dppy/examples/sum.py +++ b/numba_dppy/examples/sum.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum2D.py b/numba_dppy/examples/sum2D.py index f81e51759d..00be613d2b 100644 --- a/numba_dppy/examples/sum2D.py +++ b/numba_dppy/examples/sum2D.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum_ndarray.py b/numba_dppy/examples/sum_ndarray.py index f8dfb5999c..6486be0275 100644 --- a/numba_dppy/examples/sum_ndarray.py +++ b/numba_dppy/examples/sum_ndarray.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum_reduction.py b/numba_dppy/examples/sum_reduction.py index 5b68644487..3e00f95631 100644 --- a/numba_dppy/examples/sum_reduction.py +++ b/numba_dppy/examples/sum_reduction.py @@ -4,7 +4,7 @@ import math import time -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/examples/sum_reduction_ocl.py b/numba_dppy/examples/sum_reduction_ocl.py index 73d55eb8ae..e2605a7bbc 100644 --- a/numba_dppy/examples/sum_reduction_ocl.py +++ b/numba_dppy/examples/sum_reduction_ocl.py @@ -1,7 +1,7 @@ import sys import numpy as np from numba import int32 -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import math import dpctl diff --git a/numba_dppy/examples/sum_reduction_recursive_ocl.py b/numba_dppy/examples/sum_reduction_recursive_ocl.py index d1ecfb0945..11f5023a3b 100644 --- a/numba_dppy/examples/sum_reduction_recursive_ocl.py +++ b/numba_dppy/examples/sum_reduction_recursive_ocl.py @@ -1,7 +1,7 @@ import sys import numpy as np from numba import int32 -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import math import dpctl diff --git a/numba_dppy/ocl/ocldecl.py b/numba_dppy/ocl/ocldecl.py index ae9ec233c7..1af90a6884 100644 --- a/numba_dppy/ocl/ocldecl.py +++ b/numba_dppy/ocl/ocldecl.py @@ -4,7 +4,7 @@ from numba.core.typing.templates import (AttributeTemplate, ConcreteTemplate, AbstractTemplate, MacroTemplate, signature, Registry) -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl registry = Registry() intrinsic = registry.register diff --git a/numba_dppy/testing.py b/numba_dppy/testing.py index 0da0eaabaf..11090ebedc 100644 --- a/numba_dppy/testing.py +++ b/numba_dppy/testing.py @@ -43,6 +43,6 @@ def captured_dppl_stdout(): # Prevent accidentally capturing previously output text sys.stdout.flush() - import numba_dppy as dppl + import numba_dppy, numba_dppy as dppl with redirect_c_stdout() as stream: yield DPPLTextCapture(stream) diff --git a/numba_dppy/tests/dppl/test_arg_accessor.py b/numba_dppy/tests/dppl/test_arg_accessor.py index 7f361180f0..ecc5d839bb 100644 --- a/numba_dppy/tests/dppl/test_arg_accessor.py +++ b/numba_dppy/tests/dppl/test_arg_accessor.py @@ -2,7 +2,7 @@ import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_arg_types.py b/numba_dppy/tests/dppl/test_arg_types.py index 22f0bbf024..fc2eae105d 100644 --- a/numba_dppy/tests/dppl/test_arg_types.py +++ b/numba_dppy/tests/dppl/test_arg_types.py @@ -2,7 +2,7 @@ import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_atomic_op.py b/numba_dppy/tests/dppl/test_atomic_op.py index 7bc3ac2c46..9825c707d1 100644 --- a/numba_dppy/tests/dppl/test_atomic_op.py +++ b/numba_dppy/tests/dppl/test_atomic_op.py @@ -3,7 +3,7 @@ import numpy as np import numba -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_barrier.py b/numba_dppy/tests/dppl/test_barrier.py index 741e6ee5ac..aeff16dd40 100644 --- a/numba_dppy/tests/dppl/test_barrier.py +++ b/numba_dppy/tests/dppl/test_barrier.py @@ -5,7 +5,7 @@ from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase from numba import float32 -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl diff --git a/numba_dppy/tests/dppl/test_black_scholes.py b/numba_dppy/tests/dppl/test_black_scholes.py index 0a7d0823b3..3d9581bb54 100644 --- a/numba_dppy/tests/dppl/test_black_scholes.py +++ b/numba_dppy/tests/dppl/test_black_scholes.py @@ -4,7 +4,7 @@ import math import time -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_caching.py b/numba_dppy/tests/dppl/test_caching.py index 27d0e67c75..6a6a7967a5 100644 --- a/numba_dppy/tests/dppl/test_caching.py +++ b/numba_dppy/tests/dppl/test_caching.py @@ -3,7 +3,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_device_array_args.py b/numba_dppy/tests/dppl/test_device_array_args.py index 9668ebae13..024e3723a9 100644 --- a/numba_dppy/tests/dppl/test_device_array_args.py +++ b/numba_dppy/tests/dppl/test_device_array_args.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_dpnp_functions.py b/numba_dppy/tests/dppl/test_dpnp_functions.py index c9aa931da9..bbffb30c3f 100644 --- a/numba_dppy/tests/dppl/test_dpnp_functions.py +++ b/numba_dppy/tests/dppl/test_dpnp_functions.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_dppl_fallback.py b/numba_dppy/tests/dppl/test_dppl_fallback.py index b7d30283a4..adb7ae868b 100644 --- a/numba_dppy/tests/dppl/test_dppl_fallback.py +++ b/numba_dppy/tests/dppl/test_dppl_fallback.py @@ -3,7 +3,7 @@ import numpy as np import numba -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase from numba.tests.support import captured_stderr diff --git a/numba_dppy/tests/dppl/test_dppl_func.py b/numba_dppy/tests/dppl/test_dppl_func.py index 6c0b3533da..0f64046082 100644 --- a/numba_dppy/tests/dppl/test_dppl_func.py +++ b/numba_dppy/tests/dppl/test_dppl_func.py @@ -2,7 +2,7 @@ import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_math_functions.py b/numba_dppy/tests/dppl/test_math_functions.py index 97bdc010a8..977fe85fef 100644 --- a/numba_dppy/tests/dppl/test_math_functions.py +++ b/numba_dppy/tests/dppl/test_math_functions.py @@ -4,7 +4,7 @@ import sys import numpy as np -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl import dpctl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py b/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py index dbeaa02964..5e3cd9ba24 100644 --- a/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_bit_twiddling_functions.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_comparison_functions.py b/numba_dppy/tests/dppl/test_numpy_comparison_functions.py index 613cc1aaa9..0bd7dcbb69 100644 --- a/numba_dppy/tests/dppl/test_numpy_comparison_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_comparison_functions.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_floating_functions.py b/numba_dppy/tests/dppl/test_numpy_floating_functions.py index d5eb6eaca0..62b76b1ade 100644 --- a/numba_dppy/tests/dppl/test_numpy_floating_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_floating_functions.py @@ -4,7 +4,7 @@ import sys import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_math_functions.py b/numba_dppy/tests/dppl/test_numpy_math_functions.py index dc71e2f856..ddbb568ede 100644 --- a/numba_dppy/tests/dppl/test_numpy_math_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_math_functions.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py b/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py index 2619a97752..8f61f941c9 100644 --- a/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py +++ b/numba_dppy/tests/dppl/test_numpy_trigonomteric_functions.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_parfor_lower_message.py b/numba_dppy/tests/dppl/test_parfor_lower_message.py index 6989ea1a8a..728d46ddf3 100644 --- a/numba_dppy/tests/dppl/test_parfor_lower_message.py +++ b/numba_dppy/tests/dppl/test_parfor_lower_message.py @@ -1,7 +1,7 @@ import numpy as np import numba from numba import njit, prange -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest, DPPLTestCase from numba.tests.support import captured_stdout import dpctl.ocldrv as ocldrv diff --git a/numba_dppy/tests/dppl/test_prange.py b/numba_dppy/tests/dppl/test_prange.py index 4d9d28d2d5..f1ceb3b2ce 100644 --- a/numba_dppy/tests/dppl/test_prange.py +++ b/numba_dppy/tests/dppl/test_prange.py @@ -6,7 +6,7 @@ import numpy as np import numba from numba import njit, prange -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase from numba.tests.support import captured_stdout diff --git a/numba_dppy/tests/dppl/test_print.py b/numba_dppy/tests/dppl/test_print.py index 31eacd5b4f..ca1e47978a 100644 --- a/numba_dppy/tests/dppl/test_print.py +++ b/numba_dppy/tests/dppl/test_print.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit, prange -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_sum_reduction.py b/numba_dppy/tests/dppl/test_sum_reduction.py index 30ab5448ce..3095497a66 100644 --- a/numba_dppy/tests/dppl/test_sum_reduction.py +++ b/numba_dppy/tests/dppl/test_sum_reduction.py @@ -4,7 +4,7 @@ import math import time -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase import dpctl diff --git a/numba_dppy/tests/dppl/test_vectorize.py b/numba_dppy/tests/dppl/test_vectorize.py index d2672b0d34..12dc7b5ed3 100644 --- a/numba_dppy/tests/dppl/test_vectorize.py +++ b/numba_dppy/tests/dppl/test_vectorize.py @@ -5,7 +5,7 @@ import sys import numpy as np from numba import njit, vectorize -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba_dppy.testing import unittest from numba_dppy.testing import DPPLTestCase diff --git a/numba_dppy/tests/dppl/test_with_context.py b/numba_dppy/tests/dppl/test_with_context.py index 8c2789c18d..4e34c939cb 100644 --- a/numba_dppy/tests/dppl/test_with_context.py +++ b/numba_dppy/tests/dppl/test_with_context.py @@ -1,7 +1,7 @@ import numba import numpy as np from numba import njit -import numba_dppy as dppl +import numba_dppy, numba_dppy as dppl from numba.core import errors from numba.tests.support import captured_stdout from numba_dppy.testing import DPPLTestCase, unittest From ce7d960124106a94d16db9aeb15a9654383d980f Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 13 Nov 2020 14:58:58 +0300 Subject: [PATCH 05/11] Add version, url, author and classifiers to setup.py This parameters are necessary for PyPI. --- setup.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 36c282a39e..af363407ef 100644 --- a/setup.py +++ b/setup.py @@ -3,16 +3,30 @@ packages = find_packages(include=["numba_dppy", "numba_dppy.*"]) install_requires = [ - 'numba', - 'dpctl', + "numba", + "dpctl", ] metadata = dict( name="numba-dppy", + version="0.0.1", description="Numba extension for Intel CPU and GPU backend", + url="https://github.com/IntelPython/numba-dppy", packages=packages, install_requires=install_requires, + author="Intel Corporation", + classifiers=[ + "Development Status :: 4 - Beta", + "Environment :: GPU", + "Environment :: Plugins", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Operating System :: OS Independent", + "Programming Language :: Cython", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: Implementation :: CPython", + "Topic :: Software Development :: Compilers", + ], ) setup(**metadata) - From 10483bdcdcd60919188d1ead0e797316085580f5 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 13 Nov 2020 15:31:36 +0300 Subject: [PATCH 06/11] Add conda-recipe --- conda-recipe/bld.bat | 16 ++++++++++++++ conda-recipe/build.sh | 15 +++++++++++++ conda-recipe/meta.yaml | 46 +++++++++++++++++++++++++++++++++++++++ conda-recipe/run_test.bat | 4 ++++ conda-recipe/run_test.sh | 7 ++++++ 5 files changed, 88 insertions(+) create mode 100644 conda-recipe/bld.bat create mode 100644 conda-recipe/build.sh create mode 100644 conda-recipe/meta.yaml create mode 100644 conda-recipe/run_test.bat create mode 100644 conda-recipe/run_test.sh diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat new file mode 100644 index 0000000000..6587ed920e --- /dev/null +++ b/conda-recipe/bld.bat @@ -0,0 +1,16 @@ +%PYTHON% setup.py install +if errorlevel 1 exit 1 + +echo "Activating oneAPI compiler environment..." +call "%ONEAPI_ROOT%\compiler\latest\env\vars.bat" +if errorlevel 1 exit 1 +REM conda uses %ERRORLEVEL% but FPGA scripts can set it. So it should be reseted. +set ERRORLEVEL= + +echo on + +set "CC=clang.exe" + +%CC% -flto -target spir64-unknown-unknown -c -x cl -emit-llvm -cl-std=CL2.0 -Xclang -finclude-default-header numba/dppl/ocl/atomics/atomic_ops.cl -o numba/dppl/ocl/atomics/atomic_ops.bc +llvm-spirv -o numba/dppl/ocl/atomics/atomic_ops.spir numba/dppl/ocl/atomics/atomic_ops.bc +xcopy numba\dppl\ocl\atomics\atomic_ops.spir %SP_DIR%\numba\dppl\ocl\atomics /E /Y diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh new file mode 100644 index 0000000000..b31981dd3d --- /dev/null +++ b/conda-recipe/build.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +${PYTHON} setup.py install + + +if [ ! -z "${ONEAPI_ROOT}" ]; then + source ${ONEAPI_ROOT}/compiler/latest/env/vars.sh + export CC=clang +else + echo "DPCPP is needed to build OpenCL kernel. Abort!" +fi + +$CC -flto -target spir64-unknown-unknown -c -x cl -emit-llvm -cl-std=CL2.0 -Xclang -finclude-default-header numba/dppl/ocl/atomics/atomic_ops.cl -o numba/dppl/ocl/atomics/atomic_ops.bc +llvm-spirv -o numba/dppl/ocl/atomics/atomic_ops.spir numba/dppl/ocl/atomics/atomic_ops.bc +cp numba/dppl/ocl/atomics/atomic_ops.spir ${SP_DIR}/numba/dppl/ocl/atomics/ diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml new file mode 100644 index 0000000000..aa638b57b2 --- /dev/null +++ b/conda-recipe/meta.yaml @@ -0,0 +1,46 @@ +package: + name: "numba-dppy" + version: {{ GIT_DESCRIBE_TAG }} + +source: + path: .. + +build: + number: {{ GIT_DESCRIBE_NUMBER }} + script_env: + - ONEAPI_ROOT + +requirements: + build: + - {{ compiler('cxx') }} + host: + - python + - setuptools + - cython + - llvm-spirv + run: + - python + - numba >=0.51 + - dpctl + - spirv-tools + - llvm-spirv + - dpnp + +about: + home: https://github.com/IntelPython/numba-dppy + license: BSD-2-Clause + license_file: LICENSE + summary: "Numba extension for Intel CPU and GPU backend" + description: | + LEGAL NOTICE: Use of this software package is subject to the + software license agreement (as set forth above, in the license section of + the installed Conda package and/or the README file) and all notices, + disclaimers or license terms for third party or open source software + included in or with the software. +

+ EULA: BSD-2-Clause +

+ +extra: + recipe-maintainers: + - PokhodenkoSA diff --git a/conda-recipe/run_test.bat b/conda-recipe/run_test.bat new file mode 100644 index 0000000000..17e8140115 --- /dev/null +++ b/conda-recipe/run_test.bat @@ -0,0 +1,4 @@ +python -m numba.runtests -b -v -m -- numba_dppy.tests +IF %ERRORLEVEL% NEQ 0 exit /B 1 + +exit /B 0 diff --git a/conda-recipe/run_test.sh b/conda-recipe/run_test.sh new file mode 100644 index 0000000000..27b1d4722f --- /dev/null +++ b/conda-recipe/run_test.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -ex + +python -m numba.runtests -b -v -m -- numba_dppy.tests + +exit 0 From df722e89f8539a96e97e7e41beaaee032978d19a Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 16 Nov 2020 04:30:34 -0600 Subject: [PATCH 07/11] Use dppy in dispatcher_registry and TargetDispatcher `dispatcher_registry.ondemand['dppl'] = init_jit` can be used only one time. So `dppl` was renamed to `dppy`. Also in class TargetDispatcher field `target_dppl = 'dppl'` renamed to `dppy`. --- numba_dppy/initialize.py | 2 +- numba_dppy/target_dispatcher.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/numba_dppy/initialize.py b/numba_dppy/initialize.py index 90cb1f3c76..c8ba56220a 100644 --- a/numba_dppy/initialize.py +++ b/numba_dppy/initialize.py @@ -10,7 +10,7 @@ def init_jit(): def initialize_all(): from numba.core.registry import dispatcher_registry - dispatcher_registry.ondemand['dppl'] = init_jit + dispatcher_registry.ondemand['dppy'] = init_jit import dpctl import glob diff --git a/numba_dppy/target_dispatcher.py b/numba_dppy/target_dispatcher.py index a721277f22..40b9d589d9 100644 --- a/numba_dppy/target_dispatcher.py +++ b/numba_dppy/target_dispatcher.py @@ -10,7 +10,7 @@ class TargetDispatcher(serialize.ReduceMixin, metaclass=dispatcher.DispatcherMet target_offload_gpu = '__dppl_offload_gpu__' target_offload_cpu = '__dppl_offload_cpu__' - target_dppl = 'dppl' + target_dppl = 'dppy' def __init__(self, py_func, wrapper, target, parallel_options, compiled=None): From bfb4fb35b7614e5e50ee363a8beb9e7080cdff00 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 16 Nov 2020 07:05:05 -0600 Subject: [PATCH 08/11] Use --single-version-externally-managed This flag configure installation of `numba_dppy` as folder in `site-packages`. The folder is required for installing compiled spirv code to it. --- conda-recipe/bld.bat | 2 +- conda-recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 6587ed920e..8b755cde18 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -1,4 +1,4 @@ -%PYTHON% setup.py install +%PYTHON% setup.py install --single-version-externally-managed --record=record.txt if errorlevel 1 exit 1 echo "Activating oneAPI compiler environment..." diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index b31981dd3d..eb7081114f 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -${PYTHON} setup.py install +${PYTHON} setup.py install --single-version-externally-managed --record=record.txt if [ ! -z "${ONEAPI_ROOT}" ]; then From b7f8c3ca02068ae2e03baa395d70f0884b7d4b25 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 16 Nov 2020 07:08:12 -0600 Subject: [PATCH 09/11] Add compilation of SPIRV code --- conda-recipe/bld.bat | 6 +++--- conda-recipe/build.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 8b755cde18..ce7809780c 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -11,6 +11,6 @@ echo on set "CC=clang.exe" -%CC% -flto -target spir64-unknown-unknown -c -x cl -emit-llvm -cl-std=CL2.0 -Xclang -finclude-default-header numba/dppl/ocl/atomics/atomic_ops.cl -o numba/dppl/ocl/atomics/atomic_ops.bc -llvm-spirv -o numba/dppl/ocl/atomics/atomic_ops.spir numba/dppl/ocl/atomics/atomic_ops.bc -xcopy numba\dppl\ocl\atomics\atomic_ops.spir %SP_DIR%\numba\dppl\ocl\atomics /E /Y +%CC% -flto -target spir64-unknown-unknown -c -x cl -emit-llvm -cl-std=CL2.0 -Xclang -finclude-default-header numba_dppy/ocl/atomics/atomic_ops.cl -o numba_dppy/ocl/atomics/atomic_ops.bc +llvm-spirv -o numba_dppy/ocl/atomics/atomic_ops.spir numba_dppy/ocl/atomics/atomic_ops.bc +xcopy numba_dppy\ocl\atomics\atomic_ops.spir %SP_DIR%\numba_dppy\ocl\atomics /E /Y diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index eb7081114f..ae3422c46a 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -10,6 +10,6 @@ else echo "DPCPP is needed to build OpenCL kernel. Abort!" fi -$CC -flto -target spir64-unknown-unknown -c -x cl -emit-llvm -cl-std=CL2.0 -Xclang -finclude-default-header numba/dppl/ocl/atomics/atomic_ops.cl -o numba/dppl/ocl/atomics/atomic_ops.bc -llvm-spirv -o numba/dppl/ocl/atomics/atomic_ops.spir numba/dppl/ocl/atomics/atomic_ops.bc -cp numba/dppl/ocl/atomics/atomic_ops.spir ${SP_DIR}/numba/dppl/ocl/atomics/ +${CC} -flto -target spir64-unknown-unknown -c -x cl -emit-llvm -cl-std=CL2.0 -Xclang -finclude-default-header numba_dppy/ocl/atomics/atomic_ops.cl -o numba_dppy/ocl/atomics/atomic_ops.bc +llvm-spirv -o numba_dppy/ocl/atomics/atomic_ops.spir numba_dppy/ocl/atomics/atomic_ops.bc +cp numba_dppy/ocl/atomics/atomic_ops.spir ${SP_DIR}/numba_dppy/ocl/atomics/ From 6522bfda3bde079bcb05eeb3dcd364df8d23735e Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 16 Nov 2020 07:09:35 -0600 Subject: [PATCH 10/11] Add dependency to numba and dpctl in conda recipe --- conda-recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index aa638b57b2..62fe7ff61d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,5 +1,5 @@ package: - name: "numba-dppy" + name: numba-dppy version: {{ GIT_DESCRIBE_TAG }} source: @@ -18,6 +18,8 @@ requirements: - setuptools - cython - llvm-spirv + - numba + - dpctl run: - python - numba >=0.51 From df5b6a565b7dfb98df499c54bac9448effcb2adc Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Mon, 16 Nov 2020 07:10:19 -0600 Subject: [PATCH 11/11] Add MANIFEST.in --- MANIFEST.in | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000000..e9635a5f83 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +include MANIFEST.in +include README.md setup.py LICENSE + +recursive-include numba_dppy *.cl +