Skip to content

Commit 9eca8ce

Browse files
charrischarris
authored
Merge pull request #25475 from r-devulap/cpu-baseline-spr
BUG: Fix build issues on SPR
2 parents c9d1a10 + a8f153b commit 9eca8ce

3 files changed

Lines changed: 60 additions & 15 deletions

File tree

‎.github/workflows/linux_simd.yml‎

Lines changed: 58 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
- uses: ./.github/meson_actions
149149
name: Build/Test
150150

151-
intel_sde:
151+
intel_sde_avx512:
152152
needs: [baseline_only]
153153
runs-on: ubuntu-latest
154154
steps:
@@ -162,7 +162,7 @@ jobs:
162162

163163
- name: Install Intel SDE
164164
run: |
165-
curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/784319/sde-external-9.24.0-2023-07-13-lin.tar.xz
165+
curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/788820/sde-external-9.27.0-2023-09-13-lin.tar.xz
166166
mkdir /tmp/sde && tar -xvf /tmp/sde.tar.xz -C /tmp/sde/
167167
sudo mv /tmp/sde/* /opt/sde && sudo ln -s /opt/sde/sde64 /usr/bin/sde
168168
@@ -190,6 +190,52 @@ jobs:
190190
sde -knm -- python -c "import numpy; numpy.show_config()" &&
191191
sde -knm -- python -m pytest $NUMPY_SITE/numpy/core/tests/test_simd*
192192
193+
- name: linalg/ufunc/umath tests (TGL)
194+
run: |
195+
export NUMPY_SITE=$(realpath build-install/usr/lib/python*/site-packages/)
196+
export PYTHONPATH="$PYTHONPATH:$NUMPY_SITE"
197+
cd build-install &&
198+
sde -tgl -- python -c "import numpy; numpy.show_config()" &&
199+
sde -tgl -- python -m pytest $NUMPY_SITE/numpy/core/tests/test_umath* \
200+
$NUMPY_SITE/numpy/core/tests/test_ufunc.py \
201+
$NUMPY_SITE/numpy/core/tests/test_multiarray.py \
202+
$NUMPY_SITE/numpy/linalg/tests/test_*
203+
204+
205+
intel_sde_spr:
206+
needs: [baseline_only]
207+
runs-on: ubuntu-latest
208+
steps:
209+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
210+
with:
211+
submodules: recursive
212+
fetch-depth: 0
213+
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
214+
with:
215+
python-version: '3.11'
216+
217+
- name: Install Intel SDE
218+
run: |
219+
curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/788820/sde-external-9.27.0-2023-09-13-lin.tar.xz
220+
mkdir /tmp/sde && tar -xvf /tmp/sde.tar.xz -C /tmp/sde/
221+
sudo mv /tmp/sde/* /opt/sde && sudo ln -s /opt/sde/sde64 /usr/bin/sde
222+
223+
- name: Install dependencies
224+
run: |
225+
sudo apt update
226+
sudo apt install -y g++-13
227+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 1
228+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 1
229+
python -m pip install -r build_requirements.txt
230+
python -m pip install pytest pytest-xdist hypothesis typing_extensions
231+
232+
- name: Build
233+
run: spin build -- -Dallow-noblas=true -Dcpu-baseline=avx512_spr
234+
235+
- name: Meson Log
236+
if: always()
237+
run: cat build/meson-logs/meson-log.txt
238+
193239
- name: SIMD tests (SPR)
194240
run: |
195241
export NUMPY_SITE=$(realpath build-install/usr/lib/python*/site-packages/)
@@ -198,15 +244,13 @@ jobs:
198244
sde -spr -- python -c "import numpy; numpy.show_config()" &&
199245
sde -spr -- python -m pytest $NUMPY_SITE/numpy/core/tests/test_simd*
200246
201-
# Can't run on SDE just yet: see https://github.com/numpy/numpy/issues/23545#issuecomment-1659047365
202-
#
203-
#- name: linalg/ufunc/umath tests (SPR)
204-
# run: |
205-
# export NUMPY_SITE=$(realpath build-install/usr/lib/python*/site-packages/)
206-
# export PYTHONPATH="$PYTHONPATH:$NUMPY_SITE"
207-
# cd build-install &&
208-
# sde -spr -- python -c "import numpy; numpy.show_config()" &&
209-
# sde -spr -- python -m pytest $NUMPY_SITE/numpy/core/tests/test_umath* \
210-
# $NUMPY_SITE/numpy/core/tests/test_ufunc.py \
211-
# $NUMPY_SITE/numpy/linalg/tests/test_*
212-
247+
- name: linalg/ufunc/umath tests on Intel SPR
248+
run: |
249+
export NUMPY_SITE=$(realpath build-install/usr/lib/python*/site-packages/)
250+
export PYTHONPATH="$PYTHONPATH:$NUMPY_SITE"
251+
cd build-install &&
252+
sde -spr -- python -c "import numpy; numpy.show_config()" &&
253+
sde -spr -- python -m pytest $NUMPY_SITE/numpy/core/tests/test_umath* \
254+
$NUMPY_SITE/numpy/core/tests/test_ufunc.py \
255+
$NUMPY_SITE/numpy/core/tests/test_multiarray.py \
256+
$NUMPY_SITE/numpy/linalg/tests/test_*

‎numpy/core/src/npysort/simd_qsort_16bit.dispatch.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#if defined(NPY_HAVE_AVX512_SPR) && !defined(_MSC_VER)
1111
#include "x86-simd-sort/src/avx512fp16-16bit-qsort.hpp"
12+
#include "x86-simd-sort/src/avx512-16bit-qsort.hpp"
1213
#elif defined(NPY_HAVE_AVX512_ICL) && !defined(_MSC_VER)
1314
#include "x86-simd-sort/src/avx512-16bit-qsort.hpp"
1415
#endif

‎numpy/core/src/npysort/x86-simd-sort‎

0 commit comments

Comments
 (0)