8000 Merge pull request #25658 from charris/backport-25652 · numpy/numpy@1d50085 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1d50085

Browse files
charrischarris
authored
Merge pull request #25658 from charris/backport-25652
BUG: Fix AVX512 build flags on Intel Classic Compiler
2 parents fe24aba + 7baac4d commit 1d50085

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
python-version: ["3.11"]
2727

2828
steps:
29-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
29+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3030
with:
3131
submodules: recursive
3232
fetch-depth: 0
@@ -104,7 +104,7 @@ jobs:
104104
if: "github.repository == 'numpy/numpy'"
105105
runs-on: macos-13
106106
steps:
107-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
107+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
108108
with:
109109
submodules: recursive
110110
fetch-depth: 0

‎meson_cpu/x86/meson.build

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ if compiler_id in ['intel', 'intel-cl']
143143
# Intel compilers don't support the following features independently
144144
FMA3.update(implies: [F16C, AVX2])
145145
AVX2.update(implies: [F16C, FMA3])
146-
AVX512F.update(implies: [AVX2, AVX512CD, AVX512_SKX])
147-
AVX512CD.update(implies: [AVX512F, AVX512_SKX])
146+
AVX512F.update(implies: [AVX2, AVX512CD])
147+
AVX512CD.update(implies: [AVX512F])
148148
XOP.update(disable: 'Intel Compiler does not su 8000 pport it')
149149
FMA4.update(disable: 'Intel Compiler does not support it')
150150
endif
@@ -170,10 +170,10 @@ endif
170170
if compiler_id == 'intel'
171171
clear_m = '^(-mcpu=|-march=)'
172172
clear_any = '^(-mcpu=|-march=|-x[A-Z0-9\-])'
173-
FMA3.update(args: {'val': '-march=core-avx2', 'match': clear_m})
174-
AVX2.update(args: {'val': '-march=core-avx2', 'match': clear_m})
175-
AVX512F.update(args: {'val': '-march=common-avx512', 'match': clear_m})
176-
AVX512CD.update(args: {'val': '-march=common-avx512', 'match': clear_m})
173+
FMA3.update(args: {'val': '-xCORE-AVX2', 'match': clear_m})
174+
AVX2.update(args: {'val': '-xCORE-AVX2', 'match': clear_m})
175+
AVX512F.update(args: {'val': '-xCOMMON-AVX512', 'match': clear_m})
176+
AVX512CD.update(args: {'val': '-xCOMMON-AVX512', 'match': clear_m})
177177
AVX512_KNL.update(args: {'val': '-xKNL', 'match': clear_any})
178178
AVX512_KNM.update(args: {'val': '-xKNM', 'match': clear_any})
179179
AVX512_SKX.update(args: {'val': '-xSKYLAKE-AVX512', 'match': clear_any})

0 commit comments

Comments
 (0)
0