Skip to content

Commit 8c01dcf

Browse files
Merge master into update_isclose
2 parents 9af0901 + ac795ab commit 8c01dcf

File tree

13 files changed

+54
-79
lines changed

13 files changed

+54
-79
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
sudo apt-get install -y nvidia-cuda-toolkit clinfo
103103
104104
- name: Checkout repo
105-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
105+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
106106
with:
107107
fetch-depth: 0
108108

@@ -248,7 +248,7 @@ jobs:
248248
timeout-minutes: 10
249249

250250
steps:
251-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
251+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
252252
with:
253253
fetch-depth: 0
254254

.github/workflows/check-onemath.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
access_token: ${{ github.token }}
3939

4040
- name: Checkout DPNP repo
41-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4242
with:
4343
fetch-depth: 0
4444

@@ -78,12 +78,12 @@ jobs:
7878

7979
steps:
8080
- name: Checkout DPNP repo
81-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
81+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8282
with:
8383
fetch-depth: 0
8484

8585
- name: Download artifact
86-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
86+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
8787
with:
8888
name: ${{ env.environment-file-name }}
8989
path: ${{ env.environment-file-loc }}
@@ -170,18 +170,18 @@ jobs:
170170

171171
steps:
172172
- name: Checkout DPNP repo
173-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
173+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
174174
with:
175175
fetch-depth: 0
176176

177177
- name: Download artifact
178-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
178+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
179179
with:
180180
name: ${{ env.environment-file-name }}
181181
path: ${{ env.environment-file-loc }}
182182

183183
- name: Checkout oneMKL repo
184-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
184+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
185185
with:
186186
repository: 'oneapi-src/oneMKL'
187187
ref: 'develop'

.github/workflows/conda-package.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
access_token: ${{ github.token }}
5555

5656
- name: Checkout DPNP repo
57-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
57+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5858
with:
5959
fetch-depth: 0
6060

@@ -140,13 +140,13 @@ jobs:
140140

141141
steps:
142142
- name: Checkout DPNP repo
143-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
143+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
144144
with:
145145
fetch-depth: ${{ env.fetch-depth }}
146146
path: ${{ env.dpnp-repo-path }}
147147

148148
- name: Download artifact
149-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
149+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
150150
with:
151151
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
152152
path: ${{ env.pkg-path-in-channel }}
@@ -268,13 +268,13 @@ jobs:
268268

269269
steps:
270270
- name: Checkout DPNP repo
271-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
271+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
272272
with:
273273
fetch-depth: ${{ env.fetch-depth }}
274274
path: ${{ env.dpnp-repo-path }}
275275

276276
- name: Download artifact
277-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
277+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
278278
with:
279279
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
280280
path: ${{ env.pkg-path-in-channel }}
@@ -425,17 +425,17 @@ jobs:
425425
426426
steps:
427427
- name: Checkout DPNP repo
428-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
428+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
429429
with:
430430
fetch-depth: ${{ env.fetch-depth }}
431431

432432
- name: Download artifact
433-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
433+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
434434
with:
435435
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ matrix.python }}
436436

437437
- name: Download wheels artifact
438-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
438+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
439439
with:
440440
name: ${{ env.package-name }} ${{ runner.os }} Wheels Python ${{ matrix.python }}
441441

@@ -513,13 +513,13 @@ jobs:
513513

514514
steps:
515515
- name: Checkout DPNP repo
516-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
516+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
517517
with:
518518
fetch-depth: ${{ env.fetch-depth }}
519519
path: ${{ env.dpnp-repo-path }}
520520

521521
- name: Download artifact
522-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
522+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
523523
with:
524524
name: ${{ env.package-name }} ${{ runner.os }} Python ${{ env.python-ver }}
525525
path: ${{ env.pkg-path-in-channel }}
@@ -585,7 +585,7 @@ jobs:
585585
python -c "import dpnp; print(dpnp.__version__)"
586586
587587
- name: Clone array API tests repo
588-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
588+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
589589
with:
590590
repository: 'data-apis/array-api-tests'
591591
path: ${{ env.array-api-tests-path }}
@@ -666,7 +666,7 @@ jobs:
666666

667667
steps:
668668
- name: Checkout DPNP repo
669-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
669+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
670670
with:
671671
fetch-depth: ${{ env.fetch-depth }}
672672

@@ -692,7 +692,7 @@ jobs:
692692
activate-environment: ${{ env.cleanup-env-name }}
693693

694694
- name: Checkout repo
695-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
695+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
696696
with:
697697
repository: IntelPython/devops-tools
698698
fetch-depth: ${{ env.fetch-depth }}

.github/workflows/generate_coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
sudo gem install coveralls-lcov
6363
6464
- name: Checkout repo
65-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
65+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6666
with:
6767
fetch-depth: 0
6868

.github/workflows/openssf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: "Checkout code"
37-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3838
with:
3939
persist-credentials: false
4040

@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
72+
uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
7373
with:
7474
sarif_file: results.sarif

.github/workflows/pre-commit-autoupdate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout DPNP repo
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Set up python
2525
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
pylint
3131
3232
- name: Checkout DPNP repo
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
# use commit hash to make "no-commit-to-branch" check passing
3636
ref: ${{ github.sha }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5151
* Avoided negating unsigned integers in ceil division used in `dpnp.resize` implementation [#2508](https://github.com/IntelPython/dpnp/pull/2508)
5252
* Fixed `dpnp.unique` with 1d input array and `axis=0`, `equal_nan=True` keywords passed where the produced result doesn't collapse the NaNs [#2530](https://github.com/IntelPython/dpnp/pull/2530)
5353
* Resolved issue when `dpnp.ndarray` constructor is called with `dpnp.ndarray.data` as `buffer` keyword [#2533](https://github.com/IntelPython/dpnp/pull/2533)
54+
* Fixed `dpnp.linalg.cond` to always return a real dtype [#2547](https://github.com/IntelPython/dpnp/pull/2547)
5455

5556
### Security
5657

dpnp/linalg/dpnp_utils_linalg.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1976,13 +1976,15 @@ def dpnp_cond(x, p=None):
19761976
else:
19771977
r = s[..., 0] / s[..., -1]
19781978
else:
1979-
result_t = _common_type(x)
19801979
# The result array will contain nans in the entries
19811980
# where inversion failed
19821981
invx = dpnp.linalg.inv(x)
19831982
r = dpnp.linalg.norm(x, p, axis=(-2, -1)) * dpnp.linalg.norm(
19841983
invx, p, axis=(-2, -1)
19851984
)
1985+
1986+
# condition number is always real
1987+
result_t = _real_type(_common_type(x), device=x.sycl_queue)
19861988
r = r.astype(result_t, copy=False)
19871989

19881990
# Convert nans to infs unless the original array had nan entries

dpnp/tests/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ def numpy_version():
483483
return numpy.lib.NumpyVersion(numpy.__version__)
484484

485485

486-
def requires_intel_mkl_version(version):
486+
def requires_intel_mkl_version(version): # pragma: no cover
487487
"""
488488
Check if Intel MKL is used and its version is greater than or
489489
equal to the specified one.

0 commit comments

Comments
 (0)