Commit 1377426
authored
Allow MSVC to build KleidiAI in Windows on Arm environments. (#26995)
### Description
Remove the limitations on using onnxruntime_USE_KLEIDIAI in a Windows on
Arm environment.
### Motivation and Context
Historically the KleidiAI build had difficulties with using Microsoft
compiler for Arm environments (MSVC). As a result a hard exclusion of
onnxruntime_USE_KLEIDIAI and MSVC was added and subsequently
consolidated into cmake/CMakeLists.txt by
[this](2e8a45a)
commit.
The problems in KleidiAI were resolved in their v1.14.0 release. v1.15.0
was introduced via
[this](8fe4804)
commit. This PR removes the limitation, allowing MSVC to be used to
compile with onnxruntime_USE_KLEIDIAI enabled in a Winodws on Arm
environment.
In addition there were legacy restrictions in CMakeLists.txt relating to
DOTPROD and I8MM CPU features. This is already handled in the KleidiAI
build.
### Verification
Following the Windows build instructions
[here](https://onnxruntime.ai/docs/build/inferencing.html#windows)
KleidiAI and its associated logic in MLAS will be built when ARM64 is
detected.
**Note**: As is made clear in these build instructions MSVC must include
support for ARM64. Both Python and Cmake must be native ARM64.
Signed-off-by: Colm Donelan <colm.donelan@arm.com>1 parent 4b50b2f commit 1377426
File tree
6 files changed
+13
-32
lines changed- cmake
- onnxruntime
- contrib_ops/cpu/quantization
- core/mlas
- inc
- lib
6 files changed
+13
-32
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
539 | 539 | | |
540 | 540 | | |
541 | 541 | | |
542 | | - | |
543 | | - | |
544 | | - | |
545 | | - | |
546 | | - | |
547 | | - | |
548 | | - | |
549 | | - | |
550 | | - | |
551 | | - | |
552 | | - | |
553 | | - | |
554 | | - | |
555 | | - | |
556 | | - | |
557 | | - | |
558 | | - | |
559 | | - | |
560 | | - | |
561 | 542 | | |
562 | 543 | | |
563 | 544 | | |
| |||
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
166 | | - | |
| 166 | + | |
167 | 167 | | |
168 | 168 | | |
169 | 169 | | |
| |||
307 | 307 | | |
308 | 308 | | |
309 | 309 | | |
310 | | - | |
| 310 | + | |
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
| |||
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
385 | | - | |
| 385 | + | |
386 | 386 | | |
387 | 387 | | |
388 | 388 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2116 | 2116 | | |
2117 | 2117 | | |
2118 | 2118 | | |
2119 | | - | |
| 2119 | + | |
2120 | 2120 | | |
2121 | 2121 | | |
2122 | 2122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
603 | 603 | | |
604 | 604 | | |
605 | 605 | | |
606 | | - | |
| 606 | + | |
607 | 607 | | |
608 | 608 | | |
609 | 609 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
205 | 205 | | |
206 | 206 | | |
207 | 207 | | |
208 | | - | |
| 208 | + | |
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
| |||
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
225 | | - | |
| 225 | + | |
226 | 226 | | |
227 | 227 | | |
228 | 228 | | |
| |||
346 | 346 | | |
347 | 347 | | |
348 | 348 | | |
349 | | - | |
| 349 | + | |
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
| |||
440 | 440 | | |
441 | 441 | | |
442 | 442 | | |
443 | | - | |
| 443 | + | |
444 | 444 | | |
445 | 445 | | |
446 | 446 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1670 | 1670 | | |
1671 | 1671 | | |
1672 | 1672 | | |
1673 | | - | |
| 1673 | + | |
1674 | 1674 | | |
1675 | 1675 | | |
1676 | 1676 | | |
| |||
1737 | 1737 | | |
1738 | 1738 | | |
1739 | 1739 | | |
1740 | | - | |
| 1740 | + | |
1741 | 1741 | | |
1742 | 1742 | | |
1743 | 1743 | | |
| |||
0 commit comments