From 72fb5183d4d98de899a353164f99d131fdf3742d Mon Sep 17 00:00:00 2001 From: Tracy Sharpe <42477615+tracysh@users.noreply.github.com> Date: Thu, 25 Jun 2020 21:06:18 -0700 Subject: [PATCH] Fix Windows ARM64 break (#4343) --- onnxruntime/core/mlas/inc/mlas.h | 2 +- onnxruntime/core/mlas/lib/mlasi.h | 3 +++ onnxruntime/test/mlas/unittest.cpp | 18 +++++++++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/onnxruntime/core/mlas/inc/mlas.h b/onnxruntime/core/mlas/inc/mlas.h index 423d63dca0..19ae91c77c 100644 --- a/onnxruntime/core/mlas/inc/mlas.h +++ b/onnxruntime/core/mlas/inc/mlas.h @@ -473,4 +473,4 @@ MlasFindMinMaxElement( float* Min, float* Max, size_t N - ); \ No newline at end of file + ); diff --git a/onnxruntime/core/mlas/lib/mlasi.h b/onnxruntime/core/mlas/lib/mlasi.h index 551d0c7017..76cfe21bcc 100644 --- a/onnxruntime/core/mlas/lib/mlasi.h +++ b/onnxruntime/core/mlas/lib/mlasi.h @@ -753,6 +753,9 @@ MlasPartitionWork( #ifndef vmaxvq_f32 #define vmaxvq_f32(src) neon_fmaxv(src) #endif +#ifndef vminvq_f32 +#define vminvq_f32(src) neon_fminv(src) +#endif #endif // diff --git a/onnxruntime/test/mlas/unittest.cpp b/onnxruntime/test/mlas/unittest.cpp index 571a395fb6..7528cffbbb 100644 --- a/onnxruntime/test/mlas/unittest.cpp +++ b/onnxruntime/test/mlas/unittest.cpp @@ -2369,15 +2369,15 @@ private: MatrixGuardBuffer BufferInput; void - Test( - size_t N, - float MinimumValue, - float MaximumValue - ) + Test( + size_t N, + float MinimumValue, + float MaximumValue + ) { float* Input = BufferInput.GetBuffer(N); - std::default_random_engine generator(static_cast< unsigned >(N)); + std::default_random_engine generator(static_cast(N)); std::uniform_real_distribution distribution(MinimumValue, MaximumValue); for (size_t n = 0; n < N; n++) { @@ -2406,9 +2406,9 @@ private: public: void - ExecuteShort( - void - ) override + ExecuteShort( + void + ) override { for (size_t n = 1; n < 128; n++) { Test(n, -10.f, 10.f);