Skip to content

Commit d6e6981

Browse files
committed
(numba/dppy) Added check to not error out if OpenCL is absent
1 parent d772507 commit d6e6981

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

__init__.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55

66
from numba import config
77
import numba.testing
8-
from dppy.ocldrv import *
9-
from .device_init import *
8+
9+
from numba.dppy_config import *
10+
if dppy_present:
11+
from .device_init import *
12+
else:
13+
raise ImportError("Importing dppy failed")
1014

1115
def test(*args, **kwargs):
12-
if not is_available():
16+
if dppy_present and not is_available():
1317
dppy_error()
1418

1519
return numba.testing.test("numba.dppy.tests", *args, **kwargs)

tests/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
from numba.testing import SerialSuite
22
from numba.testing import load_testsuite
33
from os.path import dirname, join
4-
import dppy.ocldrv as ocldrv
4+
5+
6+
import numba.dppy_config as dppy_config
57

68
def load_tests(loader, tests, pattern):
79

810
suite = SerialSuite()
911
this_dir = dirname(__file__)
1012

11-
if ocldrv.is_available():
13+
if dppy_config.dppy_present and dppy_config.is_available():
1214
suite.addTests(load_testsuite(loader, join(this_dir, 'dppy')))
1315
else:
1416
print("skipped DPPY tests")

0 commit comments

Comments
 (0)