Skip to content

Commit b76e6e6

Browse files
authored
Merge branch 'master' into fix-vecmat-win-failure
2 parents eb268f1 + b93b328 commit b76e6e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2191
-862
lines changed

.github/workflows/check-onemath.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
build-with-oneapi-env: 'environments/build_with_oneapi.yml'
1616
dpctl-pkg-env: 'environments/dpctl_pkg.yml'
1717
oneapi-pkgs-env: 'environments/oneapi_pkgs.yml'
18+
test-pkg-env: 'environments/test.yml'
1819
test-env-name: 'test_onemath'
1920
rerun-tests-on-failure: 'true'
2021
rerun-tests-max-attempts: 2
@@ -49,7 +50,10 @@ jobs:
4950

5051
- name: Merge conda env files
5152
run: |
52-
conda-merge ${{ env.dpctl-pkg-env }} ${{ env.oneapi-pkgs-env }} ${{ env.build-with-oneapi-env }} > ${{ env.environment-file }}
53+
conda-merge ${{ env.dpctl-pkg-env }} \
54+
${{ env.oneapi-pkgs-env }} \
55+
${{ env.build-with-oneapi-env }} \
56+
${{ env.test-pkg-env }} > ${{ env.environment-file }}
5357
cat ${{ env.environment-file }}
5458
5559
- name: Upload artifact

.github/workflows/cron-run-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ jobs:
8484
id: install_dpnp
8585
continue-on-error: true
8686
run: |
87-
mamba install ${{ env.package-name }}=${{ steps.find_latest_tag.outputs.tag }} pytest ${{ env.channels-list }}
87+
mamba install ${{ env.package-name }}=${{ steps.find_latest_tag.outputs.tag }} pytest scipy ${{ env.channels-list }}
8888
8989
- name: ReInstall dpnp
9090
if: steps.install_dpnp.outcome == 'failure'
9191
run: |
92-
mamba install ${{ env.package-name }}=${{ steps.find_latest_tag.outputs.tag }} pytest ${{ env.channels-list }}
92+
mamba install ${{ env.package-name }}=${{ steps.find_latest_tag.outputs.tag }} pytest scipy ${{ env.channels-list }}
9393
9494
- name: List installed packages
9595
run: mamba list

.github/workflows/generate_coverage.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
environment-file: 'environments/environment.yml'
2626
build-with-oneapi-env: 'environments/build_with_oneapi.yml'
2727
coverage-env: 'environments/coverage.yml'
28+
test-pkg-env: 'environments/test.yml'
2829
oneapi-pkgs-env: ''
2930
# Enable env when it's required to use only conda packages without OneAPI installation
3031
# oneapi-pkgs-env: '${{ github.workspace }}/environments/oneapi_pkgs.yml'
@@ -73,7 +74,10 @@ jobs:
7374

7475
- name: Merge conda env files
7576
run: |
76-
conda-merge ${{ env.build-with-oneapi-env }} ${{ env.coverage-env }} ${{ env.oneapi-pkgs-env }} > ${{ env.environment-file }}
77+
conda-merge ${{ env.build-with-oneapi-env }} \
78+
${{ env.coverage-env }} \
79+
${{ env.oneapi-pkgs-env }} \
80+
${{ env.test-pkg-env }} > ${{ env.environment-file }}
7781
cat ${{ env.environment-file }}
7882
7983
- name: Setup miniconda

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
75+
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
7676
with:
7777
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ repos:
6060
additional_dependencies:
6161
- tomli
6262
- repo: https://github.com/psf/black
63-
rev: 25.1.0
63+
rev: 25.9.0
6464
hooks:
6565
- id: black
6666
exclude: "dpnp/_version.py"
@@ -113,7 +113,7 @@ repos:
113113
"--disable=redefined-builtin",
114114
"--disable=unused-wildcard-import"
115115
]
116-
files: '^dpnp/(dpnp_iface.*|fft|linalg|dpnp_array)'
116+
files: '^dpnp/(dpnp_iface.*|fft|linalg|special|dpnp_array)'
117117
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
118118
rev: v2.15.0
119119
hooks:

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
* Added implementation of `dpnp.ndarray.data` and `dpnp.ndarray.data.ptr` attributes [#2521](https://github.com/IntelPython/dpnp/pull/2521)
1717
* Added `dpnp.ndarray.__contains__` method [#2534](https://github.com/IntelPython/dpnp/pull/2534)
1818
* Added implementation of `dpnp.linalg.lu_factor` (SciPy-compatible) [#2557](https://github.com/IntelPython/dpnp/pull/2557), [#2565](https://github.com/IntelPython/dpnp/pull/2565)
19+
* Added implementation of `dpnp.piecewise` [#2550](https://github.com/IntelPython/dpnp/pull/2550)
1920

2021
### Changed
2122

@@ -28,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2829
* Aligned the license expression with `PEP-639` [#2511](https://github.com/IntelPython/dpnp/pull/2511)
2930
* Bumped oneMKL version up to `v0.8` [#2514](https://github.com/IntelPython/dpnp/pull/2514)
3031
* Removed the use of class template argument deduction for alias template to conform to the C++17 standard [#2517](https://github.com/IntelPython/dpnp/pull/2517)
31-
* Changed th order of individual FFTs over `axes` for `dpnp.fft.irfftn` to be in forward order [#2524](https://github.com/IntelPython/dpnp/pull/2524)
32+
* Changed the order of individual FFTs over `axes` for `dpnp.fft.irfftn` to be in forward order [#2524](https://github.com/IntelPython/dpnp/pull/2524)
3233
* Replaced the use of `numpy.testing.suppress_warnings` with appropriate calls from the warnings module [#2529](https://github.com/IntelPython/dpnp/pull/2529)
3334
* Improved documentations of `dpnp.ndarray` class and added a page with description of supported constants [#2422](https://github.com/IntelPython/dpnp/pull/2422)
3435
* Updated `dpnp.size` to accept tuple of ints for `axes` argument [#2536](https://github.com/IntelPython/dpnp/pull/2536)
@@ -40,6 +41,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4041
* Refactored backend implementation of `dpnp.linalg.solve` to use oneMKL LAPACK `gesv` directly [#2558](https://github.com/IntelPython/dpnp/pull/2558)
4142
* Improved performance of `dpnp.isclose` function by implementing a dedicated kernel for scalar `rtol` and `atol` arguments [#2540](https://github.com/IntelPython/dpnp/pull/2540)
4243
* Extended `dpnp.pad` to support `pad_width` keyword as a dictionary [#2535](https://github.com/IntelPython/dpnp/pull/2535)
44+
* Redesigned `dpnp.erf` function through pybind11 extension of OneMKL call or dedicated kernel in `ufunc` namespace [#2551](https://github.com/IntelPython/dpnp/pull/2551)
45+
* Improved performance of batched implementation of `dpnp.linalg.det` and `dpnp.linalg.slogdet` [#2572](https://github.com/IntelPython/dpnp/pull/2572)
4346

4447
### Deprecated
4548

conda-recipe/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ test:
6363
requires:
6464
- pytest
6565
- setuptools
66+
- scipy
6667

6768
about:
6869
home: https://github.com/IntelPython/dpnp

doc/reference/special.rst

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
Special Functions
2-
=================
1+
.. currentmodule:: dpnp.special
32

4-
.. https://docs.scipy.org/doc/scipy/reference/special.html
3+
Special functions (:mod:`dpnp.special`)
4+
=======================================
55

6-
Error Function
7-
--------------
6+
.. Hint:: `SciPy API Reference: Special functions (scipy.special) <https://docs.scipy.org/doc/scipy/reference/special.html>`_
7+
8+
Error function and Fresnel integrals
9+
------------------------------------
810

911
.. autosummary::
1012
:toctree: generated/
1113
:nosignatures:
1214

13-
dpnp.erf
14-
dpnp.erfc
15-
dpnp.erfcx
16-
dpnp.erfinv
17-
dpnp.erfcinv
15+
erf
16+
erfc
17+
erfcx
18+
erfi
19+
erfinv
20+
erfcinv

dpnp/backend/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
set(DPNP_SRC
2727
kernels/dpnp_krnl_arraycreation.cpp
2828
kernels/dpnp_krnl_common.cpp
29-
kernels/dpnp_krnl_elemwise.cpp
3029
kernels/dpnp_krnl_mathematical.cpp
3130
kernels/dpnp_krnl_random.cpp
3231
kernels/dpnp_krnl_sorting.cpp

dpnp/backend/extensions/lapack/getrs.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ std::pair<sycl::event, sycl::event>
166166
const dpctl::tensor::usm_ndarray &a_array,
167167
const dpctl::tensor::usm_ndarray &ipiv_array,
168168
const dpctl::tensor::usm_ndarray &b_array,
169+
oneapi::mkl::transpose trans,
169170
const std::vector<sycl::event> &depends)
170171
{
171172
const int a_array_nd = a_array.get_ndim();
@@ -264,12 +265,6 @@ std::pair<sycl::event, sycl::event>
264265
const std::int64_t lda = std::max<size_t>(1UL, n);
265266
const std::int64_t ldb = std::max<size_t>(1UL, n);
266267

267-
// Use transpose::T if the LU-factorized array is passed as C-contiguous.
268-
// For F-contiguous we use transpose::N.
269-
oneapi::mkl::transpose trans = is_a_array_c_contig
270-
? oneapi::mkl::transpose::T
271-
: oneapi::mkl::transpose::N;
272-
273268
char *a_array_data = a_array.get_data();
274269
char *b_array_data = b_array.get_data();
275270
char *ipiv_array_data = ipiv_array.get_data();

0 commit comments

Comments
 (0)