Skip to content

Commit 897bddd

Browse files
Merge branch 'master' into gold/2021
2 parents 0877c30 + 280d8e6 commit 897bddd

14 files changed

+496
-658
lines changed

conda-recipe/meta.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ requirements:
1111
- numpy >=1.15 # [win or osx or py>=38]
1212
- numpy 1.17 # [linux and py==37]
1313
- cython
14-
- cmake >=3.16.5
15-
- dpctl >=0.5.0a0
14+
- cmake 3.19
15+
- dpctl >=0.10
1616
- mkl-devel-dpcpp
1717
- tbb-devel
1818
- wheel
1919
build:
2020
- {{ compiler('dpcpp') }}
2121
run:
2222
- python
23-
- dpctl >=0.5.0a0
23+
- dpctl >=0.10
2424
- dpcpp_cpp_rt >=2021.1.1
2525
- mkl >=2021.1.1
2626
- mkl-dpcpp >=2021.1.1

dpnp/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242

4343
# from dpnp.dparray import dparray as ndarray
4444
from dpnp.dpnp_array import dpnp_array as ndarray
45+
from dpnp.dpnp_flatiter import flatiter as flatiter
46+
4547
from dpnp.dpnp_iface import *
4648
from dpnp.dpnp_iface import __all__ as _iface__all__
4749
from dpnp.dpnp_iface_types import *

dpnp/backend/kernels/dpnp_krnl_common.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,15 @@ void dpnp_eig_c(const void* array_in, void* result1, void* result2, size_t size)
401401
const std::int64_t scratchpad_size = mkl_lapack::syevd_scratchpad_size<double>(
402402
DPNP_QUEUE, oneapi::mkl::job::vec, oneapi::mkl::uplo::upper, size, lda);
403403

404+
// https://github.com/IntelPython/dpnp/issues/1005
405+
// Test tests/test_linalg.py::test_eig_arange raises 2 issues in dpnp_eig_c on CPU
406+
// 1. Call of mkl_lapack::syevd_scratchpad_size<double> returns wrong value that causes out of memory issue.
407+
// 2. Call of the function oneapi::mkl::lapack::syevd causes segfault.
408+
// Example of the command to reproduce the issues:
409+
// SYCL_DEVICE_FILTER=cpu pytest tests/test_linalg.py::test_eig_arange[2-float64]
410+
// High-level reason of the issues is numpy is imported before dpnp in third party tests.
411+
// Low-level reason of the issues could be related to MKL runtime library loaded during numpy import.
412+
404413
double* scratchpad = reinterpret_cast<double*>(dpnp_memory_alloc_c(scratchpad_size * sizeof(double)));
405414

406415
event = mkl_lapack::syevd(DPNP_QUEUE, // queue

0 commit comments

Comments
 (0)