Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BUG: Fix AVX512 build flags on Intel Classic Compiler #25658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
python-version: ["3.11"]

steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
submodules: recursive
fetch-depth: 0
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
if: "github.repository == 'numpy/numpy'"
runs-on: macos-13
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
submodules: recursive
fetch-depth: 0
Expand Down
12 changes: 6 additions & 6 deletions meson_cpu/x86/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ if compiler_id in ['intel', 'intel-cl']
# Intel compilers don't support the following features independently
FMA3.update(implies: [F16C, AVX2])
AVX2.update(implies: [F16C, FMA3])
AVX512F.update(implies: [AVX2, AVX512CD, AVX512_SKX])
AVX512CD.update(implies: [AVX512F, AVX512_SKX])
AVX512F.update(implies: [AVX2, AVX512CD])
AVX512CD.update(implies: [AVX512F])
XOP.update(disable: 'Intel Compiler does not support it')
FMA4.update(disable: 'Intel Compiler does not support it')
endif
Expand All @@ -170,10 +170,10 @@ endif
if compiler_id == 'intel'
clear_m = '^(-mcpu=|-march=)'
clear_any = '^(-mcpu=|-march=|-x[A-Z0-9\-])'
FMA3.update(args: {'val': '-march=core-avx2', 'match': clear_m})
AVX2.update(args: {'val': '-march=core-avx2', 'match': clear_m})
AVX512F.update(args: {'val': '-march=common-avx512', 'match': clear_m})
AVX512CD.update(args: {'val': '-march=common-avx512', 'match': clear_m})
FMA3.update(args: {'val': '-xCORE-AVX2', 'match': clear_m})
AVX2.update(args: {'val': '-xCORE-AVX2', 'match': clear_m})
AVX512F.update(args: {'val': '-xCOMMON-AVX512', 'match': clear_m})
AVX512CD.update(args: {'val': '-xCOMMON-AVX512', 'match': clear_m})
AVX512_KNL.update(args: {'val': '-xKNL', 'match': clear_any})
AVX512_KNM.update(args: {'val': '-xKNM', 'match': clear_any})
AVX512_SKX.update(args: {'val': '-xSKYLAKE-AVX512', 'match': clear_any})
Expand Down