Skip to content

Commit 6de97b9

Browse files
kleidiai: add CPU feature detection to CI run script (ggml-org#20394)
* kleidiai: add cpu feature detection to CI run script Signed-off-by: Martin Klacer <martin.klacer@arm.com> Change-Id: I663adc3a7691a98e7dac5488962c13cc344f034a * kleidiai: revert unrelated requirements change Signed-off-by: Martin Klacer <martin.klacer@arm.com> * 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 <martin.klacer@arm.com> --------- Signed-off-by: Martin Klacer <martin.klacer@arm.com>
1 parent 5a0ed51 commit 6de97b9

1 file changed

Lines changed: 1 addition & 29 deletions

File tree

ci/run.sh

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -151,35 +151,7 @@ fi
151151

152152
if [ -n "${GG_BUILD_KLEIDIAI}" ]; then
153153
echo ">>===== Enabling KleidiAI support"
154-
155-
CANDIDATES=(
156-
"armv9-a+dotprod+i8mm+sve2"
157-
"armv9-a+dotprod+i8mm"
158-
"armv8.6-a+dotprod+i8mm"
159-
"armv8.2-a+dotprod"
160-
)
161-
CPU=""
162-
163-
for cpu in "${CANDIDATES[@]}"; do
164-
if echo 'int main(){}' | ${CXX:-c++} -march="$cpu" -x c++ - -c -o /dev/null >/dev/null 2>&1; then
165-
CPU="$cpu"
166-
break
167-
fi
168-
done
169-
170-
if [ -z "$CPU" ]; then
171-
echo "ERROR: None of the required ARM baselines (armv9/armv8.6/armv8.2 + dotprod) are supported by this compiler."
172-
exit 1
173-
fi
174-
175-
echo ">>===== Using ARM baseline: ${CPU}"
176-
177-
CMAKE_EXTRA="${CMAKE_EXTRA:+$CMAKE_EXTRA } \
178-
-DGGML_NATIVE=OFF \
179-
-DGGML_CPU_KLEIDIAI=ON \
180-
-DGGML_CPU_AARCH64=ON \
181-
-DGGML_CPU_ARM_ARCH=${CPU} \
182-
-DBUILD_SHARED_LIBS=OFF"
154+
CMAKE_EXTRA="${CMAKE_EXTRA:+$CMAKE_EXTRA } -DGGML_CPU_KLEIDIAI=ON"
183155
fi
184156

185157
if [ ! -z ${GG_BUILD_BLAS} ]; then

0 commit comments

Comments
 (0)