Skip to content

Add support of DPNP backend linking with sycl6.lib on Win #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 8, 2022
Merged

Add support of DPNP backend linking with sycl6.lib on Win #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a55e9
Add support of DPNP backend linking with sycl6.lib on Win
antonwolfy Nov 8, 2022
a00be8c
Skip arange tests from cupy with default int
antonwolfy Nov 8, 2022
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
9 changes: 8 additions & 1 deletion tests/skipped_tests_gpu.tbl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_cons
tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_construction_from_tuple
tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_extraction_from_nested_list
tests/third_party/cupy/creation_tests/test_matrix.py::TestMatrix::test_diag_extraction_from_nested_tuple
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_logspace_zero_num

tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_4_{shape=(3, 3), val=(2,), wrap=True}::test_1darray
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_4_{shape=(3, 3), val=(2,), wrap=True}::test_fill_diagonal
tests/third_party/cupy/indexing_tests/test_insert.py::TestFillDiagonal_param_5_{shape=(3, 3), val=(2,), wrap=False}::test_1darray
Expand Down Expand Up @@ -664,6 +664,7 @@ tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_asco
tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_asfortranarray_cuda_array_zero_dim
tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_asfortranarray_cuda_array_zero_dim_dtype
tests/third_party/cupy/creation_tests/test_from_data.py::TestFromData::test_fromfile

tests/third_party/cupy/creation_tests/test_ranges.py::TestMeshgrid_param_0_{copy=False, indexing='xy', sparse=False}::test_meshgrid0
tests/third_party/cupy/creation_tests/test_ranges.py::TestMeshgrid_param_0_{copy=False, indexing='xy', sparse=False}::test_meshgrid1
tests/third_party/cupy/creation_tests/test_ranges.py::TestMeshgrid_param_0_{copy=False, indexing='xy', sparse=False}::test_meshgrid2
Expand Down Expand Up @@ -699,13 +700,19 @@ tests/third_party/cupy/creation_tests/test_ranges.py::TestMgrid::test_mgrid5
tests/third_party/cupy/creation_tests/test_ranges.py::TestOgrid::test_ogrid3
tests/third_party/cupy/creation_tests/test_ranges.py::TestOgrid::test_ogrid4
tests/third_party/cupy/creation_tests/test_ranges.py::TestOgrid::test_ogrid5

tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_array_start_stop
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_array_start_stop_axis1
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_arange_negative_size
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_arange_no_dtype_int

tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_float_underflow
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_mixed_start_stop
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_mixed_start_stop2
tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_linspace_start_stop_list

tests/third_party/cupy/creation_tests/test_ranges.py::TestRanges::test_logspace_zero_num

tests/third_party/cupy/fft_tests/test_fft.py::TestFft2_param_1_{axes=None, norm=None, s=(1, None), shape=(3, 4)}::test_fft2
tests/third_party/cupy/fft_tests/test_fft.py::TestFft2_param_7_{axes=(), norm=None, s=None, shape=(3, 4)}::test_fft2
tests/third_party/cupy/fft_tests/test_fft.py::TestFft2_param_7_{axes=(), norm=None, s=None, shape=(3, 4)}::test_ifft2
Expand Down
10 changes: 9 additions & 1 deletion utils/command_build_clib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import os
import sys

from ctypes.util import find_library as find_shared_lib
from setuptools.command import build_clib
from distutils import log
from distutils.dep_util import newer_group
Expand Down Expand Up @@ -151,7 +152,14 @@
_mathlibs = ["mkl_sycl", "mkl_intel_ilp64", "mkl_sequential",
"mkl_core", "sycl", "OpenCL", "pthread", "m", "dl"]
elif IS_WIN:
_mathlibs = ["mkl_sycl_dll", "mkl_intel_ilp64_dll", "mkl_tbb_thread_dll", "mkl_core_dll", "sycl", "OpenCL", "tbb"]
_sycl_lib = None
for lib in {"sycl", "sycl6", "sycl7"}:
if find_shared_lib(lib):
_sycl_lib = lib
if not _sycl_lib:
raise EnvironmentError("DPNP: sycl library is not found")

_mathlibs = ["mkl_sycl_dll", "mkl_intel_ilp64_dll", "mkl_tbb_thread_dll", "mkl_core_dll", _sycl_lib, "OpenCL", "tbb"]

"""
Final set of arguments for extentions
Expand Down