Skip to content

Commit eccb8df

Browse files
committed
Merge branch 'main' into never_copy
2 parents d0d75f3 + ff2e2a1 commit eccb8df

File tree

137 files changed

+5257
-3213
lines changed

Some content is hidden

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

137 files changed

+5257
-3213
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug report
22
description: Report a bug. For security vulnerabilities see Report a security vulnerability in the templates.
3-
title: "BUG: "
3+
title: "BUG: <Please write a comprehensive title after the 'BUG: ' prefix>"
44
labels: [00 - Bug]
55

66
body:
@@ -35,10 +35,12 @@ body:
3535
attributes:
3636
label: "Error message:"
3737
description: >
38-
Please include full error message, if any (starting from `Traceback: ...`).
38+
Please include full error message, if any.
3939
If you are reporting a segfault please include a GDB traceback,
4040
which you can generate by following
4141
[these instructions](https://github.com/numpy/numpy/blob/main/doc/source/dev/development_environment.rst#debugging).
42+
placeholder: |
43+
<< Full traceback starting from `Traceback: ...` >>
4244
render: shell
4345

4446
- type: textarea

.github/ISSUE_TEMPLATE/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Documentation
22
description: Report an issue related to the NumPy documentation.
3-
title: "DOC: "
3+
title: "DOC: <Please write a comprehensive title after the 'DOC: ' prefix>"
44
labels: [04 - Documentation]
55

66
body:

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature request
22
description: Check instructions for submitting your idea on the mailing list first.
3-
title: "ENH: "
3+
title: "ENH: <Please write a comprehensive title after the 'ENH: ' prefix>"
44

55
body:
66
- type: markdown

.github/ISSUE_TEMPLATE/post-install.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Post-install/importing issue
22
description: Report an issue if you have trouble importing or using NumPy after installation.
3+
title: "<Please write a comprehensive title here>"
34
labels: [32 - Installation]
45

56
body:
@@ -16,10 +17,12 @@ body:
1617
attributes:
1718
label: "Error message:"
1819
description: >
19-
Please include full error message, if any (starting from `Traceback: ...`).
20+
Please include full error message, if any.
2021
If you are reporting a segfault please include a GDB traceback,
2122
which you can generate by following
2223
[these instructions](https://github.com/numpy/numpy/blob/main/doc/source/dev/development_environment.rst#debugging).
24+
placeholder: |
25+
<< Full traceback starting from `Traceback: ...` >>
2326
render: shell
2427

2528
- type: textarea

.github/workflows/build_test.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,3 +277,35 @@ jobs:
277277
docker run --rm --interactive -v $(pwd):/numpy the_build /bin/bash -c "
278278
cd /numpy && python3 runtests.py -n -v -- -k test_simd
279279
"
280+
281+
sde_simd_avx512_test:
282+
# Intel Software Development Emulator (SDE) is used to run a given program
283+
# on a specific instruction set architecture and capture various performance details.
284+
# see https://www.intel.com/content/www/us/en/developer/articles/tool/software-development-emulator.html
285+
needs: [smoke_test]
286+
runs-on: ubuntu-latest
287+
steps:
288+
- uses: actions/checkout@v2
289+
with:
290+
submodules: recursive
291+
fetch-depth: 0
292+
- uses: actions/setup-python@v2
293+
with:
294+
python-version: ${{ env.PYTHON_VERSION }}
295+
- name: Install Intel SDE
296+
run: |
297+
curl -o /tmp/sde.tar.bz2 https://www.intel.com/content/dam/develop/external/us/en/documents/downloads/sde-external-8.69.1-2021-07-18-lin.tar.bz2
298+
mkdir /tmp/sde && tar -xvf /tmp/sde.tar.bz2 -C /tmp/sde/
299+
sudo mv /tmp/sde/* /opt/sde && sudo ln -s /opt/sde/sde64 /usr/bin/sde
300+
- name: Install dependencies
301+
run: python -m pip install -r test_requirements.txt
302+
- name: Build
303+
run: python setup.py build
304+
--simd-test="\$werror AVX512F AVX512_KNL AVX512_KNM AVX512_SKX AVX512_CLX AVX512_CNL AVX512_ICL"
305+
install
306+
# KNM implies KNL
307+
- name: Run SIMD tests (Xeon PHI)
308+
run: sde -knm -- python runtests.py -n -v -- -k test_simd
309+
# ICL implies SKX, CLX and CNL
310+
- name: Run SIMD tests (Ice Lake)
311+
run: sde -icl -- python runtests.py -n -v -- -k test_simd

.github/workflows/wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform }}
4141
needs: get_commit_message
4242
if: >-
43-
contains(needs.get_commit_message.outputs.message, '[cd build]') ||
44-
github.event.name == 'schedule' ||
45-
github.event.name == 'workflow_dispatch'
43+
contains(needs.get_commit_message.outputs.message, '[wheel build]') ||
44+
github.event_name == 'schedule' ||
45+
github.event_name == 'workflow_dispatch'
4646
runs-on: ${{ matrix.os }}
4747
strategy:
4848
# Ensure that a wheel builder finishes even if another fails

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ stages:
109109
# the docs even though i.e., numba uses another in their
110110
# azure config for mac os -- Microsoft has indicated
111111
# they will patch this issue
112-
vmImage: 'macOS-10.14'
112+
vmImage: 'macOS-1015'
113113
strategy:
114114
maxParallel: 3
115115
matrix:

doc/changelog/1.21.4-changelog.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
2+
Contributors
3+
============
4+
5+
A total of 7 people contributed to this release. People with a "+" by their
6+
names contributed a patch for the first time.
7+
8+
* Bas van Beek
9+
* Charles Harris
10+
* Isuru Fernando
11+
* Matthew Brett
12+
* Sayed Adel
13+
* Sebastian Berg
14+
* 傅立业(Chris Fu) +
15+
16+
Pull requests merged
17+
====================
18+
19+
A total of 9 pull requests were merged for this release.
20+
21+
* `#20278 <https://github.com/numpy/numpy/pull/20278>`__: BUG: Fix shadowed reference of ``dtype`` in type stub
22+
* `#20293 <https://github.com/numpy/numpy/pull/20293>`__: BUG: Fix headers for universal2 builds
23+
* `#20294 <https://github.com/numpy/numpy/pull/20294>`__: BUG: ``VOID_nonzero`` could sometimes mutate alignment flag
24+
* `#20295 <https://github.com/numpy/numpy/pull/20295>`__: BUG: Do not use nonzero fastpath on unaligned arrays
25+
* `#20296 <https://github.com/numpy/numpy/pull/20296>`__: BUG: Distutils patch to allow for 2 as a minor version (!)
26+
* `#20297 <https://github.com/numpy/numpy/pull/20297>`__: BUG, SIMD: Fix 64-bit/8-bit integer division by a scalar
27+
* `#20298 <https://github.com/numpy/numpy/pull/20298>`__: BUG, SIMD: Workaround broadcasting SIMD 64-bit integers on MSVC...
28+
* `#20300 <https://github.com/numpy/numpy/pull/20300>`__: REL: Prepare for the NumPy 1.21.4 release.
29+
* `#20302 <https://github.com/numpy/numpy/pull/20302>`__: TST: Fix a ``Arrayterator`` typing test failure

doc/neps/nep-0013-ufunc-overrides.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ in turn immediately raises :exc:`TypeError`, because one of its operands
556556
``arr.__array_ufunc__``, which will return :obj:`NotImplemented`, which
557557
we catch.
558558

559-
.. note :: the reason for not allowing in-place operations to return
559+
.. note:: the reason for not allowing in-place operations to return
560560
:obj:`NotImplemented` is that these cannot generically be replaced by
561561
a simple reverse operation: most array operations assume the contents
562562
of the instance are changed in-place, and do not expect a new

doc/neps/nep-0027-zero-rank-arrarys.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NEP 27 — Zero rank arrays
1010
:Created: 2006-06-10
1111
:Resolution: https://mail.python.org/pipermail/numpy-discussion/2018-October/078824.html
1212

13-
.. note ::
13+
.. note::
1414

1515
NumPy has both zero rank arrays and scalars. This design document, adapted
1616
from a `2006 wiki entry`_, describes what zero rank arrays are and why they

0 commit comments

Comments
 (0)