Skip to content

Commit f7c9349

Browse files
authored
Merge branch 'master' into fix/SAT-8204-flatiter-indexing
2 parents 7f340cb + 0ca6e72 commit f7c9349

8 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/workflows/openssf-scorecard.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ permissions: read-all
2424
jobs:
2525
analysis:
2626
name: Scorecard analysis
27+
# disable the workflow to be run in forks
28+
if: github.event.repository.fork == false
2729
runs-on: ubuntu-latest
2830
timeout-minutes: 10
2931
permissions:
@@ -72,6 +74,6 @@ jobs:
7274

7375
# Upload the results to GitHub's code scanning dashboard.
7476
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
77+
uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
7678
with:
7779
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ repos:
128128
hooks:
129129
- id: actionlint
130130
- repo: https://github.com/BlankSpruce/gersemi-pre-commit
131-
rev: 0.28.0
131+
rev: 0.28.1
132132
hooks:
133133
- id: gersemi
134134
exclude: "dpnp/backend/cmake/Modules/"

dpnp/tensor/_ctors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def _asarray_from_numpy_ndarray(
121121
copy_q = normalize_queue_device(sycl_queue=None, device=sycl_queue)
122122
if ary.dtype.char not in "?bBhHiIlLqQefdFD":
123123
raise TypeError(
124-
f"Numpy array of data type {ary.dtype} is not supported. "
124+
f"NumPy array of data type {ary.dtype} is not supported. "
125125
"Please convert the input to an array with numeric data type."
126126
)
127127
if dtype is None:

dpnp/tensor/_print.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def set_print_options(
231231
`"-"`, `"+"`, or `" "`.
232232
Default: `"-"`.
233233
numpy (bool, optional): If `True,` then before other specified print
234-
options are set, a dictionary of Numpy's print options
234+
options are set, a dictionary of NumPy's print options
235235
will be used to initialize dpctl's print options.
236236
Default: "False"
237237
"""
@@ -412,7 +412,7 @@ def usm_ndarray_str(
412412
Default: `"-"`.
413413
numpy (bool, optional):
414414
If `True,` then before other specified print
415-
options are set, a dictionary of Numpy's print options
415+
options are set, a dictionary of NumPy's print options
416416
will be used to initialize dpctl's print options.
417417
Default: "False"
418418
separator (str, optional):

dpnp/tests/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def is_intel_numpy():
466466
Return True if Intel NumPy is used during testing.
467467
468468
The check is based on MKL backend name stored in Build Dependencies, where
469-
in case of Intel Numpy there "mkl" is expected at the beginning of the name
469+
in case of Intel NumPy there "mkl" is expected at the beginning of the name
470470
for both BLAS and LAPACK (the full name is "mkl-dynamic-ilp64-iomp").
471471
472472
"""

dpnp/tests/tensor/test_tensor_asarray.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_asarray_input_validation():
187187
# buffer to usm_ndarray requires a copy
188188
dpt.asarray(memoryview(np.arange(5)), copy=False)
189189
with pytest.raises(ValueError):
190-
# Numpy array to usm_ndarray requires a copy
190+
# NumPy array to usm_ndarray requires a copy
191191
dpt.asarray(np.arange(5), copy=False)
192192
with pytest.raises(ValueError):
193193
# Python sequence to usm_ndarray requires a copy

dpnp/tests/test_fft.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,29 +500,29 @@ def test_0D(self, dtype):
500500
a = dpnp.array(3, dtype=dtype) # 0-D input
501501

502502
# axes is None
503-
# For 0-D array, stock Numpy and dpnp return input array
503+
# For 0-D array, stock NumPy and dpnp return input array
504504
# while Intel NumPy return a complex zero
505505
result = dpnp.fft.fftn(a)
506506
expected = a.asnumpy()
507507
assert_dtype_allclose(result, expected)
508508

509509
# axes=()
510-
# For 0-D array with axes=(), stock Numpy and dpnp return input array
510+
# For 0-D array with axes=(), stock NumPy and dpnp return input array
511511
# Intel NumPy does not support empty axes and raises an Error
512512
result = dpnp.fft.fftn(a, axes=())
513513
expected = a.asnumpy()
514514
assert_dtype_allclose(result, expected)
515515

516516
# axes=(0,)
517-
# For 0-D array with non-empty axes, stock Numpy and dpnp raise
517+
# For 0-D array with non-empty axes, stock NumPy and dpnp raise
518518
# IndexError, while Intel NumPy raises ZeroDivisionError
519519
assert_raises(IndexError, dpnp.fft.fftn, a, axes=(0,))
520520

521521
@pytest.mark.parametrize("dtype", get_all_dtypes(no_none=True))
522522
def test_empty_axes(self, dtype):
523523
a = dpnp.ones((2, 3, 4), dtype=dtype)
524524

525-
# For axes=(), stock Numpy and dpnp return input array
525+
# For axes=(), stock NumPy and dpnp return input array
526526
# Intel NumPy does not support empty axes and raises an Error
527527
result = dpnp.fft.fftn(a, axes=())
528528
expected = a.asnumpy()

dpnp/tests/test_linalg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,7 @@ def test_lstsq(self, a_shape, b_shape, dtype):
18231823

18241824
result = dpnp.linalg.lstsq(a_dp, b_dp)
18251825
# if rcond is not set, FutureWarning is given.
1826-
# By default Numpy uses None for calculations
1826+
# By default NumPy uses None for calculations
18271827
expected = numpy.linalg.lstsq(a_np, b_np, rcond=None)
18281828

18291829
for param_dp, param_np in zip(result, expected):
@@ -1838,7 +1838,7 @@ def test_lstsq_diff_type(self, a_dtype, b_dtype):
18381838
b_dp = dpnp.array(b_np)
18391839

18401840
# if rcond is not set, FutureWarning is given.
1841-
# By default Numpy uses None for calculations
1841+
# By default NumPy uses None for calculations
18421842
expected = numpy.linalg.lstsq(a_np, b_np, rcond=None)
18431843
result = dpnp.linalg.lstsq(a_dp, b_dp)
18441844

@@ -1859,7 +1859,7 @@ def test_lstsq_empty(self, m, n, nrhs, dtype):
18591859

18601860
result = dpnp.linalg.lstsq(a_dp, b_dp)
18611861
# if rcond is not set, FutureWarning is given.
1862-
# By default Numpy uses None for calculations
1862+
# By default NumPy uses None for calculations
18631863
expected = numpy.linalg.lstsq(a_np, b_np, rcond=None)
18641864

18651865
for param_dp, param_np in zip(result, expected):

0 commit comments

Comments
 (0)