Skip to content

Commit 94ef514

Browse files
authored
Add support of DPNP backend linking with sycl6.lib on Win (#1225)
* Add support of DPNP backend linking with sycl6.lib on Win * Skip arange tests from cupy with default int
1 parent 666f672 commit 94ef514

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

tests/skipped_tests_gpu.tbl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_cons
232232
tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_construction_from_tuple
233233
tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_extraction_from_nested_list
234234
tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_extraction_from_nested_tuple
235-
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_logspace_zero_num
235+
236236
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_4_{shape=(3, 3), val=(2,), wrap=True}::test_1darray
237237
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_4_{shape=(3, 3), val=(2,), wrap=True}::test_fill_diagonal
238238
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_5_{shape=(3, 3), val=(2,), wrap=False}::test_1darray
@@ -664,6 +664,7 @@ tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_asco
664664
tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_asfortranarray_cuda_array_zero_dim
665665
tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_asfortranarray_cuda_array_zero_dim_dtype
666666
tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_fromfile
667+
667668
tests/third_party/cupy/creation_tests/test_ranges.py::TestMeshgrid_param_0_{copy=False, indexing='xy', sparse=False}::test_meshgrid0
668669
tests/third_party/cupy/creation_tests/test_ranges.py::TestMeshgrid_param_0_{copy=False, indexing='xy', sparse=False}::test_meshgrid1
669670
tests/third_party/cupy/creation_tests/test_ranges.py::TestMeshgrid_param_0_{copy=False, indexing='xy', sparse=False}::test_meshgrid2
@@ -699,13 +700,19 @@ tests/third_party/cupy/creation_tests/test_ranges.py::TestMgrid::test_mgrid5
699700
tests/third_party/cupy/creation_tests/test_ranges.py::TestOgrid::test_ogrid3
700701
tests/third_party/cupy/creation_tests/test_ranges.py::TestOgrid::test_ogrid4
701702
tests/third_party/cupy/creation_tests/test_ranges.py::TestOgrid::test_ogrid5
703+
702704
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_array_start_stop
703705
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_array_start_stop_axis1
706+
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_arange_negative_size
707+
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_arange_no_dtype_int
708+
704709
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_float_underflow
705710
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_mixed_start_stop
706711
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_mixed_start_stop2
707712
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_start_stop_list
708713

714+
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_logspace_zero_num
715+
709716
tests/third_party/cupy/fft_tests/test_fft.py::TestFft2_param_1_{axes=None, norm=None, s=(1, None), shape=(3, 4)}::test_fft2
710717
tests/third_party/cupy/fft_tests/test_fft.py::TestFft2_param_7_{axes=(), norm=None, s=None, shape=(3, 4)}::test_fft2
711718
tests/third_party/cupy/fft_tests/test_fft.py::TestFft2_param_7_{axes=(), norm=None, s=None, shape=(3, 4)}::test_ifft2

utils/command_build_clib.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import os
3737
import sys
3838

39+
from ctypes.util import find_library as find_shared_lib
3940
from setuptools.command import build_clib
4041
from distutils import log
4142
from distutils.dep_util import newer_group
@@ -151,7 +152,14 @@
151152
_mathlibs = ["mkl_sycl", "mkl_intel_ilp64", "mkl_sequential",
152153
"mkl_core", "sycl", "OpenCL", "pthread", "m", "dl"]
153154
elif IS_WIN:
154-
_mathlibs = ["mkl_sycl_dll", "mkl_intel_ilp64_dll", "mkl_tbb_thread_dll", "mkl_core_dll", "sycl", "OpenCL", "tbb"]
155+
_sycl_lib = None
156+
for lib in {"sycl", "sycl6", "sycl7"}:
157+
if find_shared_lib(lib):
158+
_sycl_lib = lib
159+
if not _sycl_lib:
160+
raise EnvironmentError("DPNP: sycl library is not found")
161+
162+
_mathlibs = ["mkl_sycl_dll", "mkl_intel_ilp64_dll", "mkl_tbb_thread_dll", "mkl_core_dll", _sycl_lib, "OpenCL", "tbb"]
155163

156164
"""
157165
Final set of arguments for extentions

0 commit comments

Comments
 (0)