Skip to content

Commit 9154330

Browse files
Merge master into inskip_qr_tests
2 parents 707c5a0 + 4b64466 commit 9154330

Some content is hidden

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

47 files changed

+977
-109
lines changed

.github/workflows/check-onemath.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
cat ${{ env.environment-file }}
5858
5959
- name: Upload artifact
60-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
60+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6161
with:
6262
name: ${{ env.environment-file-name }}
6363
path: ${{ env.environment-file }}
@@ -87,7 +87,7 @@ jobs:
8787
fetch-depth: 0
8888

8989
- name: Download artifact
90-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
90+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
9191
with:
9292
name: ${{ env.environment-file-name }}
9393
path: ${{ env.environment-file-loc }}
@@ -181,7 +181,7 @@ jobs:
181181
fetch-depth: 0
182182

183183
- name: Download artifact
184-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
184+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
185185
with:
186186
name: ${{ env.environment-file-name }}
187187
path: ${{ env.environment-file-loc }}

.github/workflows/conda-package.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ jobs:
102102
MAX_BUILD_CMPL_MKL_VERSION: '2026.0a0'
103103

104104
- name: Upload artifact
105-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
105+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
106106
with:
107107
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
108108
path: ${{ env.CONDA_BLD }}${{ env.package-name }}-*.conda
109109

110110
- name: Upload wheels artifact
111-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
111+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
112112
with:
113113
name: ${{ env.package-name }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
114114
path: ${{ env.WHEELS_OUTPUT_FOLDER }}${{ env.package-name }}-*.whl
@@ -151,7 +151,7 @@ jobs:
151151
path: ${{ env.dpnp-repo-path }}
152152

153153
- name: Download artifact
154-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
154+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
155155
with:
156156
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
157157
path: ${{ env.pkg-path-in-channel }}
@@ -280,7 +280,7 @@ jobs:
280280
path: ${{ env.dpnp-repo-path }}
281281

282282
- name: Download artifact
283-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
283+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
284284
with:
285285
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
286286
path: ${{ env.pkg-path-in-channel }}
@@ -439,12 +439,12 @@ jobs:
439439
fetch-depth: ${{ env.fetch-depth }}
440440

441441
- name: Download artifact
442-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
442+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
443443
with:
444444
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
445445

446446
- name: Download wheels artifact
447-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
447+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
448448
with:
449449
name: ${{ env.package-name }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
450450

@@ -528,7 +528,7 @@ jobs:
528528
path: ${{ env.dpnp-repo-path }}
529529

530530
- name: Download artifact
531-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
531+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
532532
with:
533533
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ env.python-ver }}
534534
path: ${{ env.pkg-path-in-channel }}

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6565
# format to the repository Actions tab.
6666
- name: "Upload artifact"
67-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
67+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6868
with:
6969
name: SARIF file
7070
path: results.sarif

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/PyCQA/bandit
5-
rev: '1.9.3'
5+
rev: '1.9.4'
66
hooks:
77
- id: bandit
88
pass_filenames: false

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
2626
* Added implementation of `dpnp.ndarray.__bytes__` method [#2671](https://github.com/IntelPython/dpnp/pull/2671)
2727
* Added implementation of `dpnp.divmod` [#2674](https://github.com/IntelPython/dpnp/pull/2674)
2828
* Added implementation of `dpnp.isin` function [#2595](https://github.com/IntelPython/dpnp/pull/2595)
29+
* Added implementation of `dpnp.scipy.linalg.lu` (SciPy-compatible) [#2787](https://github.com/IntelPython/dpnp/pull/2787)
2930

3031
### Changed
3132

dpnp/dpnp_algo/dpnp_fill.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
)
3939

4040
import dpnp
41+
from dpnp.exceptions import ExecutionPlacementError
4142

4243

4344
def dpnp_fill(arr, val):
@@ -50,7 +51,7 @@ def dpnp_fill(arr, val):
5051
if val.shape != ():
5152
raise ValueError("`val` must be a scalar or 0D-array")
5253
if dpu.get_execution_queue((exec_q, val.sycl_queue)) is None:
53-
raise dpu.ExecutionPlacementError(
54+
raise ExecutionPlacementError(
5455
"Input arrays have incompatible queues."
5556
)
5657
a_val = dpt.astype(val, arr.dtype)

dpnp/dpnp_array.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939

4040
import dpctl.tensor as dpt
4141
import dpctl.tensor._type_utils as dtu
42-
from dpctl.tensor._numpy_helper import AxisError
4342

4443
import dpnp
4544

4645
from . import memory as dpm
46+
from .exceptions import AxisError
4747

4848

4949
def _get_unwrapped_index_key(key):

dpnp/dpnp_iface_histograms.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ def bincount(x, weights=None, minlength=0):
306306
307307
For full documentation refer to :obj:`numpy.bincount`.
308308
309-
Warning
310-
-------
309+
Warnings
310+
--------
311311
This function synchronizes in order to calculate binning edges.
312312
This may harm performance in some applications.
313313
@@ -504,8 +504,8 @@ def histogram(a, bins=10, range=None, density=None, weights=None):
504504
505505
For full documentation refer to :obj:`numpy.histogram`.
506506
507-
Warning
508-
-------
507+
Warnings
508+
--------
509509
This function may synchronize in order to check a monotonically increasing
510510
array of bin edges. This may harm performance in some applications.
511511
@@ -675,8 +675,8 @@ def histogram_bin_edges(a, bins=10, range=None, weights=None):
675675
676676
For full documentation refer to :obj:`numpy.histogram_bin_edges`.
677677
678-
Warning
679-
-------
678+
Warnings
679+
--------
680680
This function may synchronize in order to check a monotonically increasing
681681
array of bin edges. This may harm performance in some applications.
682682
@@ -767,8 +767,8 @@ def histogram2d(x, y, bins=10, range=None, density=None, weights=None):
767767
768768
For full documentation refer to :obj:`numpy.histogram2d`.
769769
770-
Warning
771-
-------
770+
Warnings
771+
--------
772772
This function may synchronize in order to check a monotonically increasing
773773
array of bin edges. This may harm performance in some applications.
774774
@@ -1100,8 +1100,8 @@ def histogramdd(sample, bins=10, range=None, density=None, weights=None):
11001100
11011101
For full documentation refer to :obj:`numpy.histogramdd`.
11021102
1103-
Warning
1104-
-------
1103+
Warnings
1104+
--------
11051105
This function may synchronize in order to check a monotonically increasing
11061106
array of bin edges. This may harm performance in some applications.
11071107

dpnp/dpnp_iface_indexing.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
)
6464
from .dpnp_array import dpnp_array
6565
from .dpnp_utils import call_origin, get_usm_allocations
66+
from .exceptions import ExecutionPlacementError
6667

6768

6869
def _ravel_multi_index_checks(multi_index, dims, order):
@@ -129,7 +130,7 @@ def _choose_run(inds, chcs, q, usm_type, out=None, mode=0):
129130
)
130131

131132
if dpu.get_execution_queue((q, out.sycl_queue)) is None:
132-
raise dpu.ExecutionPlacementError(
133+
raise ExecutionPlacementError(
133134
"Input and output allocation queues are not compatible"
134135
)
135136

@@ -291,7 +292,7 @@ def _take_index(x, inds, axis, q, usm_type, out=None, mode=0):
291292
)
292293

293294
if dpu.get_execution_queue((q, out.sycl_queue)) is None:
294-
raise dpu.ExecutionPlacementError(
295+
raise ExecutionPlacementError(
295296
"Input and output allocation queues are not compatible"
296297
)
297298

dpnp/dpnp_iface_logic.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
from .dpnp_array import dpnp_array
5757
from .dpnp_utils import get_usm_allocations
58+
from .exceptions import ExecutionPlacementError
5859

5960

6061
def _isclose_scalar_tol(a, b, rtol, atol, equal_nan):
@@ -1267,7 +1268,7 @@ def isin(
12671268
)
12681269
is None
12691270
):
1270-
raise dpu.ExecutionPlacementError(
1271+
raise ExecutionPlacementError(
12711272
"Input arrays have incompatible allocation queues"
12721273
)
12731274
usm_element = dpnp.get_usm_ndarray(element)

0 commit comments

Comments
 (0)