From 6de97b9d3ef7e5160083d3fecd98775ce959684e Mon Sep 17 00:00:00 2001 From: Martin Klacer Date: Wed, 1 Apr 2026 18:02:41 +0100 Subject: [PATCH] kleidiai: add CPU feature detection to CI run script (#20394) * kleidiai: add cpu feature detection to CI run script Signed-off-by: Martin Klacer Change-Id: I663adc3a7691a98e7dac5488962c13cc344f034a * kleidiai: revert unrelated requirements change Signed-off-by: Martin Klacer * kleidiai: removed cpu feature detection from CI run script * As per the maintainers' suggestion, removed cpu feature detection from CI run script as CMake handles it already Signed-off-by: Martin Klacer --------- Signed-off-by: Martin Klacer --- ci/run.sh | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 2393b70ac4..e6702a43bd 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -151,35 +151,7 @@ fi if [ -n "${GG_BUILD_KLEIDIAI}" ]; then echo ">>===== Enabling KleidiAI support" - - CANDIDATES=( - "armv9-a+dotprod+i8mm+sve2" - "armv9-a+dotprod+i8mm" - "armv8.6-a+dotprod+i8mm" - "armv8.2-a+dotprod" - ) - CPU="" - - for cpu in "${CANDIDATES[@]}"; do - if echo 'int main(){}' | ${CXX:-c++} -march="$cpu" -x c++ - -c -o /dev/null >/dev/null 2>&1; then - CPU="$cpu" - break - fi - done - - if [ -z "$CPU" ]; then - echo "ERROR: None of the required ARM baselines (armv9/armv8.6/armv8.2 + dotprod) are supported by this compiler." - exit 1 - fi - - echo ">>===== Using ARM baseline: ${CPU}" - - CMAKE_EXTRA="${CMAKE_EXTRA:+$CMAKE_EXTRA } \ - -DGGML_NATIVE=OFF \ - -DGGML_CPU_KLEIDIAI=ON \ - -DGGML_CPU_AARCH64=ON \ - -DGGML_CPU_ARM_ARCH=${CPU} \ - -DBUILD_SHARED_LIBS=OFF" + CMAKE_EXTRA="${CMAKE_EXTRA:+$CMAKE_EXTRA } -DGGML_CPU_KLEIDIAI=ON" fi if [ ! -z ${GG_BUILD_BLAS} ]; then