Skip to content

Commit eb68f63

Browse files
committed
merge with master branch and resolve conflicts
2 parents 9c28750 + d522480 commit eb68f63

File tree

392 files changed

+4318
-3653
lines changed

Some content is hidden

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

392 files changed

+4318
-3653
lines changed

.github/workflows/array-api-skips.txt

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# array API tests to be skipped
2+
3+
# no 'uint8' dtype
4+
array_api_tests/test_array_object.py::test_getitem_masking
5+
6+
# missing unique-like functions
7+
array_api_tests/test_has_names.py::test_has_names[set-unique_all]
8+
array_api_tests/test_has_names.py::test_has_names[set-unique_counts]
9+
array_api_tests/test_has_names.py::test_has_names[set-unique_inverse]
10+
array_api_tests/test_has_names.py::test_has_names[set-unique_values]
11+
array_api_tests/test_set_functions.py::test_unique_all
12+
array_api_tests/test_set_functions.py::test_unique_counts
13+
array_api_tests/test_set_functions.py::test_unique_inverse
14+
array_api_tests/test_set_functions.py::test_unique_values
15+
array_api_tests/test_signatures.py::test_func_signature[unique_all]
16+
array_api_tests/test_signatures.py::test_func_signature[unique_counts]
17+
array_api_tests/test_signatures.py::test_func_signature[unique_inverse]
18+
array_api_tests/test_signatures.py::test_func_signature[unique_values]
19+
20+
# no '__array_namespace_info__' function
21+
array_api_tests/test_has_names.py::test_has_names[info-__array_namespace_info__]
22+
array_api_tests/test_inspection_functions.py::test_array_namespace_info
23+
array_api_tests/test_inspection_functions.py::test_array_namespace_info_dtypes
24+
array_api_tests/test_searching_functions.py::test_searchsorted
25+
array_api_tests/test_signatures.py::test_func_signature[__array_namespace_info__]
26+
array_api_tests/test_signatures.py::test_info_func_signature[capabilities]
27+
array_api_tests/test_signatures.py::test_info_func_signature[default_device]
28+
array_api_tests/test_signatures.py::test_info_func_signature[default_dtypes]
29+
array_api_tests/test_signatures.py::test_info_func_signature[devices]
30+
array_api_tests/test_signatures.py::test_info_func_signature[dtypes]
31+
32+
# do not return a namedtuple
33+
array_api_tests/test_linalg.py::test_eigh
34+
array_api_tests/test_linalg.py::test_slogdet
35+
array_api_tests/test_linalg.py::test_svd
36+
37+
# hypothesis found failures
38+
array_api_tests/test_linalg.py::test_qr
39+
array_api_tests/test_operators_and_elementwise_functions.py::test_clip
40+
41+
# unexpected result is returned
42+
array_api_tests/test_operators_and_elementwise_functions.py::test_asin
43+
array_api_tests/test_operators_and_elementwise_functions.py::test_asinh
44+
45+
# missing 'correction' keyword argument
46+
array_api_tests/test_signatures.py::test_func_signature[std]
47+
array_api_tests/test_signatures.py::test_func_signature[var]
48+
49+
# wrong shape is returned
50+
array_api_tests/test_linalg.py::test_vecdot
51+
array_api_tests/test_linalg.py::test_linalg_vecdot
52+
53+
# tuple index out of range
54+
array_api_tests/test_linalg.py::test_linalg_matmul
55+
56+
# arrays have different values
57+
array_api_tests/test_linalg.py::test_linalg_tensordot

.github/workflows/build-sphinx.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build-and-deploy:
2626
name: Build and Deploy Docs
2727

28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929

3030
permissions:
3131
# Needed to cancel any previous runs that are not completed for a given workflow
@@ -89,7 +89,6 @@ jobs:
8989
run: |
9090
sudo apt-get install enchant-2
9191
92-
# https://github.com/marketplace/actions/checkout
9392
- name: Install nvidia-cuda support drivers
9493
run: |
9594
sudo add-apt-repository ppa:graphics-drivers/ppa
@@ -102,8 +101,20 @@ jobs:
102101
with:
103102
fetch-depth: 0
104103

105-
# https://github.com/marketplace/actions/setup-miniconda
106104
- name: Setup miniconda
105+
id: setup_miniconda
106+
continue-on-error: true
107+
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
108+
with:
109+
miniforge-version: latest
110+
use-mamba: 'true'
111+
channels: conda-forge
112+
conda-remove-defaults: 'true'
113+
python-version: ${{ env.python-ver }}
114+
activate-environment: 'docs'
115+
116+
- name: ReSetup miniconda
117+
if: steps.setup_miniconda.outcome == 'failure'
107118
uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
108119
with:
109120
miniforge-version: latest

.github/workflows/check-mkl-interfaces.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ env:
2828
2929
jobs:
3030
test_by_tag:
31-
name: Run on ['${{ matrix.os }}', python='${{ matrix.python }}'] with oneMKL tag
31+
name: Run tests with oneMKL tag
3232

3333
strategy:
3434
matrix:
35-
python: ['3.12']
35+
python: ['3.13']
3636
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
3737

3838
permissions:
@@ -108,7 +108,7 @@ jobs:
108108
id: run_tests
109109
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
110110
with:
111-
timeout_minutes: 10
111+
timeout_minutes: 12
112112
max_attempts: ${{ env.RUN_TESTS_MAX_ATTEMPTS }}
113113
retry_on: any
114114
command: |
@@ -121,11 +121,11 @@ jobs:
121121
SYCL_CACHE_PERSISTENT: 1
122122

123123
test_by_branch:
124-
name: Run on ['${{ matrix.os }}', python='${{ matrix.python }}'] with oneMKL develop branch
124+
name: Run tests with oneMKL develop branch
125125

126126
strategy:
127127
matrix:
128-
python: ['3.12']
128+
python: ['3.13']
129129
os: [ubuntu-22.04] # windows-2019 - no DFT support for Windows in oneMKL
130130

131131
permissions:
@@ -216,7 +216,7 @@ jobs:
216216
id: run_tests
217217
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
218218
with:
219-
timeout_minutes: 10
219+
timeout_minutes: 12
220220
max_attempts: ${{ env.RUN_TESTS_MAX_ATTEMPTS }}
221221
retry_on: any
222222
command: |

0 commit comments

Comments
 (0)