Skip to content

Commit cbd746e

Browse files
authored
Merge branch 'master' into add-sphinxcontrib.spelling-as-extension
2 parents f4412cc + 8d04592 commit cbd746e

23 files changed

+1617
-594
lines changed

.github/workflows/build-sphinx.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ jobs:
9191
sudo apt-get install -y nvidia-cuda-toolkit clinfo
9292
9393
- name: Checkout repo
94-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
94+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
9595
with:
9696
fetch-depth: 0
9797

9898
# https://github.com/marketplace/actions/setup-miniconda
9999
- name: Setup miniconda
100-
uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
100+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
101101
with:
102102
auto-update-conda: true
103103
python-version: ${{ env.python-ver }}
@@ -209,7 +209,7 @@ jobs:
209209
runs-on: ubuntu-20.04
210210

211211
steps:
212-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
212+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
213213
with:
214214
fetch-depth: 0
215215

.github/workflows/conda-package.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ env:
2222
test_dparray.py
2323
test_copy.py
2424
test_fft.py
25+
test_histogram.py
2526
test_linalg.py
2627
test_logic.py
2728
test_manipulation.py
@@ -49,6 +50,7 @@ env:
4950
third_party/cupy/math_tests
5051
third_party/cupy/sorting_tests/test_sort.py
5152
third_party/cupy/sorting_tests/test_count.py
53+
third_party/cupy/statistics_tests/test_histogram.py
5254
third_party/cupy/statistics_tests/test_meanvar.py
5355
VER_JSON_NAME: 'version.json'
5456
VER_SCRIPT1: "import json; f = open('version.json', 'r'); j = json.load(f); f.close(); "
@@ -82,12 +84,12 @@ jobs:
8284
access_token: ${{ github.token }}
8385

8486
- name: Checkout DPNP repo
85-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
87+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
8688
with:
8789
fetch-depth: 0
8890

8991
- name: Setup miniconda
90-
uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
92+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
9193
with:
9294
auto-update-conda: true
9395
python-version: ${{ matrix.python }}
@@ -123,7 +125,7 @@ jobs:
123125
run: conda build --no-test --python ${{ matrix.python }} --numpy 1.23 ${{ env.CHANNELS }} conda-recipe
124126

125127
- name: Upload artifact
126-
uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
128+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
127129
with:
128130
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
129131
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
@@ -156,7 +158,7 @@ jobs:
156158

157159
steps:
158160
- name: Download artifact
159-
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4.1.5
161+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
160162
with:
161163
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
162164
path: ${{ env.pkg-path-in-channel }}
@@ -167,7 +169,7 @@ jobs:
167169
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
168170
169171
- name: Setup miniconda
170-
uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
172+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
171173
with:
172174
auto-update-conda: true
173175
python-version: ${{ matrix.python }}
@@ -271,7 +273,7 @@ jobs:
271273

272274
steps:
273275
- name: Download artifact
274-
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4.1.5
276+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
275277
with:
276278
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
277279
path: ${{ env.pkg-path-in-channel }}
@@ -291,7 +293,7 @@ jobs:
291293
dir ${{ env.extracted-pkg-path }}
292294
293295
- name: Setup miniconda
294-
uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
296+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
295297
with:
296298
auto-update-conda: true
297299
python-version: ${{ matrix.python }}
@@ -417,12 +419,12 @@ jobs:
417419
418420
steps:
419421
- name: Download artifact
420-
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d # v4.1.5
422+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
421423
with:
422424
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
423425

424426
- name: Setup miniconda
425-
uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
427+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
426428
with:
427429
auto-update-conda: true
428430
python-version: ${{ matrix.python }}
@@ -445,7 +447,7 @@ jobs:
445447
run:
446448
shell: bash -el {0}
447449
steps:
448-
- uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
450+
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
449451
with:
450452
run-post: false
451453
channel-priority: "disabled"
@@ -456,7 +458,7 @@ jobs:
456458
run: conda install anaconda-client
457459

458460
- name: Checkout repo
459-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
461+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
460462
with:
461463
repository: IntelPython/devops-tools
462464
fetch-depth: 0

.github/workflows/generate_coverage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
access_token: ${{ github.token }}
3333

3434
- name: Checkout repo
35-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
35+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
3636
with:
3737
fetch-depth: 0
3838

@@ -57,7 +57,7 @@ jobs:
5757
sudo apt-get install lcov
5858
5959
- name: Setup miniconda
60-
uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
60+
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
6161
with:
6262
auto-update-conda: true
6363
python-version: ${{ env.python-ver }}

.github/workflows/openssf-scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: "Checkout code"
36-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
36+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
3737
with:
3838
persist-credentials: false
3939

@@ -60,14 +60,14 @@ jobs:
6060
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6161
# format to the repository Actions tab.
6262
- name: "Upload artifact"
63-
uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
63+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
6464
with:
6565
name: SARIF file
6666
path: results.sarif
6767
retention-days: 14
6868

6969
# Upload the results to GitHub's code scanning dashboard.
7070
- name: "Upload to code-scanning"
71-
uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
71+
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
7272
with:
7373
sarif_file: results.sarif

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pylint
2727
2828
- name: Checkout DPNP repo
29-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
29+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
3030

3131
- name: Set up python
3232
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0

doc/reference/statistics.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,25 @@ Averages and variances
2727
dpnp.median
2828
dpnp.average
2929
dpnp.mean
30-
dpnp.var
3130
dpnp.std
31+
dpnp.var
3232
dpnp.nanmean
3333
dpnp.nanvar
3434
dpnp.nanstd
3535

3636

37+
Correlations
38+
------------
39+
40+
.. autosummary::
41+
:toctree: generated/
42+
:nosignatures:
43+
44+
dpnp.corrcoef
45+
dpnp.cov
46+
dpnp.correlate
47+
48+
3749
Histograms
3850
----------
3951

@@ -47,15 +59,3 @@ Histograms
4759
dpnp.bincount
4860
dpnp.histogram_bin_edges
4961
dpnp.digitize
50-
51-
52-
Correlations
53-
------------
54-
55-
.. autosummary::
56-
:toctree: generated/
57-
:nosignatures:
58-
59-
dpnp.corrcoef
60-
dpnp.cov
61-
dpnp.correlate

dpnp/dpnp_iface.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@
7878
from dpnp.dpnp_iface_bitwise import __all__ as __all__bitwise
7979
from dpnp.dpnp_iface_counting import *
8080
from dpnp.dpnp_iface_counting import __all__ as __all__counting
81+
from dpnp.dpnp_iface_histograms import *
82+
from dpnp.dpnp_iface_histograms import __all__ as __all__histograms
8183
from dpnp.dpnp_iface_indexing import *
8284
from dpnp.dpnp_iface_indexing import __all__ as __all__indexing
8385
from dpnp.dpnp_iface_libmath import *
@@ -111,6 +113,7 @@
111113
__all__ += __all__arraycreation
112114
__all__ += __all__bitwise
113115
__all__ += __all__counting
116+
__all__ += __all__histograms
114117
__all__ += __all__indexing
115118
__all__ += __all__libmath
116119
__all__ += __all__linearalgebra

0 commit comments

Comments
 (0)