8000 Merge pull request #29116 from charris/test-vs2022 · numpy/numpy@4ec55c5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4ec55c5

Browse files
charrischarris
authored
Merge pull request #29116 from charris/test-vs2022
MAINT: Update to vs2022 in NumPy 2.3.x [wheel build]
2 parents a33c0e0 + d522ac2 commit 4ec55c5

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

‎.github/workflows/wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ jobs:
8989
# targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile
9090
- [macos-13, macosx_x86_64, accelerate]
9191
- [macos-14, macosx_arm64, accelerate] # always use accelerate
92-
- [windows-2019, win_amd64, ""]
93-
- [windows-2019, win32, ""]
92+
- [windows-2022, win_amd64, ""]
93+
- [windows-2022, win32, ""]
9494
- [windows-11-arm, win_arm64, ""]
9595
python: ["cp311", "cp312", "cp313", "cp313t", "pp311"]
9696
exclude:
9797
# Don't build PyPy 32-bit windows
98-
- buildplat: [windows-2019, win32, ""]
98+
- buildplat: [windows-2022, win32, ""]
9999
python: "pp311"
100100
# Don't build PyPy arm64 windows
101101
- buildplat: [windows-11-arm, win_arm64, ""]

‎.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ permissions:
1616
jobs:
1717
python64bit_openblas:
1818
name: x86-64, LP64 OpenBLAS
19-
runs-on: windows-2019
19+
runs-on: windows-2022
2020
# To enable this job on a fork, comment out:
2121
if: github.repository == 'numpy/numpy'
2222
strategy:
@@ -92,7 +92,7 @@ jobs:
9292
fail-fast: false
9393
matrix:
9494
include:
95-
- os: windows-2019
95+
- os: windows-2022
9696
architecture: x86
9797
- os: windows-11-arm
9898
architecture: arm64

‎.github/workflows/windows_arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515

1616
jobs:
1717
windows_arm:
18-
runs-on: windows-2019
18+
runs-on: windows-2022
1919

2020
# To enable this job on a fork, comment out:
2121
if: github.repository == 'numpy/numpy'

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ stages:
7575
- job: Windows
7676
timeoutInMinutes: 120
7777
pool:
78-
vmImage: 'windows-2019'
78+
vmImage: 'windows-2022'
7979
strategy:
8080
maxParallel: 3
8181
matrix:

‎meson_cpu/x86/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ if compiler_id == 'msvc'
212212
endif
213213
endforeach
214214
FMA3.update(args: {'val': '/arch:AVX2', 'match': clear_arch})
215+
FMA3.update(args: {'val': '/fp:contract'})
215216
AVX2.update(args: {'val': '/arch:AVX2', 'match': clear_arch})
216217
AVX512_SKX.update(args: {'val': '/arch:AVX512', 'match': clear_arch})
217218
endif

‎numpy/_core/tests/test_umath.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1879,7 +1879,10 @@ def test_unary_spurious_fpexception(self, ufunc, dtype, data, escape):
18791879
# FIXME: NAN raises FP invalid exception:
18801880
# - ceil/float16 on MSVC:32-bit
18811881
# - spacing/float16 on almost all platforms
1882-
if ufunc in (np.spacing, np.ceil) and dtype == 'e':
1882+
# - spacing all floats on MSVC vs2022
1883+
if ufunc == np.spacing:
1884+
return
1885+
if ufunc == np.ceil and dtype == 'e':
18831886
return
18841887
array = np.array(data, dtype=dtype)
18851888
with assert_no_warnings():

0 commit comments

Comments
 (0)
0