Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,17 @@ Make sure the following dependencies of NUMBA-PyDPPL are installed
in your conda environemtn:

- llvmlite =0.33
- pydppl =0.2
- spirv-tools
- llvm-spirv
- llvmdev
- dpCtl =0.3

Make sure the dependencies are installed with consistent version of LLVM 10.

Install PyDPPL backend
***********************
NUMBA-PyDPPL also depend on PyDPPL backend. It can be found `here <https://github.com/IntelPython/PyDPPL>`_.
Please run `build_for_develop.sh` to install PyDPPL backend in development mode
or install PyDPPL from package.
Install dpCtl backend
*********************
NUMBA-PyDPPL also depend on dpCtl backend. It can be found `here <https://github.com/IntelPython/dpCtl>`_.
Please install dpCtl from package.

Install NUMBA-PyDPPL
********************
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/condarecipe.pydppl/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ requirements:
- llvmlite >=0.31.*
# TBB devel version is to match TBB libs
- tbb-devel >=2019.5 # [not ((armv6l or armv7l or aarch64) or (win and py27))]
- pydppl
- dpctl
run:
- python >=3.6
- numpy >=1.17
- setuptools
# On channel https://anaconda.org/numba/
- llvmlite >=0.31.*
- pydppl
- dpctl
- spirv-tools
- llvm-spirv
run_constrained:
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from types import FunctionType
from inspect import signature

import dppl.ocldrv as driver
import dpctl.ocldrv as driver
from . import spirv_generator

import os
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/device_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from . import initialize

from .decorators import kernel, func, autojit
from dppl.ocldrv import runtime
from dpctl.ocldrv import runtime
from . import target


Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/dppl_host_fn_call_gen.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function, division, absolute_import

import dppl.ocldrv as driver
import dpctl.ocldrv as driver
import llvmlite.llvmpy.core as lc
import llvmlite.ir.values as liv
import llvmlite.ir as lir
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/dppl_lowerer.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
from .target import SPIR_GENERIC_ADDRSPACE
from .dufunc_inliner import dufunc_inliner
from . import dppl_host_fn_call_gen as dppl_call_gen
import dppl.ocldrv as driver
import dpctl.ocldrv as driver
from numba.dppl.target import DPPLTargetContext


Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/dppy_func.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from numba import dppl
import math

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.func
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/matmul.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/pairwise_distance.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import timeit

from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv

parser = argparse.ArgumentParser(description='Program to compute pairwise distance')

Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum-hybrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum2D.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum_ndarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel(access_types={"read_only": ['a', 'b'], "write_only": ['c'], "read_write": []})
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum_reduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import time

from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum_reduction_ocl.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from numba import dppl, int32
import math

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


def sum_reduction_device_plus_host():
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/examples/sum_reduction_recursive_ocl.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from numba import dppl, int32
import math

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


def recursive_reduction(size, group_size,
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_arg_accessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel(access_types={"read_only": ['a', 'b'], "write_only": ['c'], "read_write": []})
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_arg_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@dppl.kernel
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_atomic_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


def atomic_add(ary):
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_barrier.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
from numba import dppl, float32
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_black_scholes.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


RISKFREE = 0.02
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_caching.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_device_array_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_dppl_fallback.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv
import sys
import io

Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_dppl_func.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_math_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import numpy as np
from numba import dppl
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import math
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


class TestNumpy_bit_twiddling_functions(DPPLTestCase):
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_numpy_comparison_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv

class TestNumpy_comparison_functions(DPPLTestCase):
a = np.array([4,5,6])
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_numpy_floating_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv

class TestNumpy_floating_functions(DPPLTestCase):
def test_isfinite(self):
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_numpy_math_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv

class TestNumpy_math_functions(DPPLTestCase):
N = 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv

class TestNumpy_math_functions(DPPLTestCase):
N = 10
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_prange.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


class TestPrange(DPPLTestCase):
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_print.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_pydppl_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


@unittest.skipUnless(ocldrv.has_gpu_device, 'test only on GPU system')
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_sum_reduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from numba import dppl
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase
import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv

@dppl.kernel
def reduction_kernel(A, R, stride):
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl/tests/dppl/test_vectorize.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from numba.dppl.testing import unittest
from numba.dppl.testing import DPPLTestCase

import dppl.ocldrv as ocldrv
import dpctl.ocldrv as ocldrv


class TestVectorize(DPPLTestCase):
Expand Down
2 changes: 1 addition & 1 deletion numba/dppl_config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dppl_present = False

try:
from dppl.ocldrv import *
from dpctl.ocldrv import *
except:
pass
else:
Expand Down