Skip to content

Commit f925249

Browse files
[ci] Fix lower batch test setup
-DXSIMD_DEFAULT_ARCH is not a cmake option but a preprocessor option
1 parent eae2990 commit f925249

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

.github/workflows/linux.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,15 @@ jobs:
8181
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=sandybridge"
8282
fi
8383
if [[ '${{ matrix.sys.flags }}' == 'avx_128' ]]; then
84-
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=sandybridge -DXSIMD_DEFAULT_ARCH=avx_128"
84+
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=sandybridge"
85+
CXXFLAGS="$CXX_FLAGS -DXSIMD_DEFAULT_ARCH=avx_128"
8586
fi
8687
if [[ '${{ matrix.sys.flags }}' == 'avx2' ]]; then
8788
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=haswell"
8889
fi
8990
if [[ '${{ matrix.sys.flags }}' == 'avx2_128' ]]; then
90-
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=haswell -DXSIMD_DEFAULT_ARCH=avx2_128"
91+
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=haswell"
92+
CXXFLAGS="$CXX_FLAGS -DXSIMD_DEFAULT_ARCH=avx2_128"
9193
fi
9294
if [[ '${{ matrix.sys.flags }}' == 'sse3' ]]; then
9395
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=nocona"
@@ -96,7 +98,8 @@ jobs:
9698
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=skylake-avx512"
9799
fi
98100
if [[ '${{ matrix.sys.flags }}' == 'avx512vl_256' ]]; then
99-
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=skylake-avx512 -DXSIMD_DEFAULT_ARCH=avx512vl_256"
101+
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=skylake-avx512"
102+
CXXFLAGS="$CXX_FLAGS -DXSIMD_DEFAULT_ARCH=avx512vl_256"
100103
fi
101104
if [[ '${{ matrix.sys.flags }}' == 'avx512pf' ]]; then
102105
CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DTARGET_ARCH=knl"

0 commit comments

Comments
 (0)