update

microsoft · Oct 2, 2024 · b3dac37 · b3dac37
1 parent b39e962
commit b3dac37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/onnxruntime/core/providers/xnnpack/xnnpack_init.h b/onnxruntime/core/providers/xnnpack/xnnpack_init.h
@@ -49,11 +49,9 @@ namespace xnnpack {
 #if (!defined(_MSC_VER)) || (_MSC_VER >= 1930)
 #if (defined(_M_ARM64) || defined(__aarch64__) || defined(_M_ARM64EC)) && !XNN_ARCH_X86_64
 #if !defined(__APPLE__)
-// Had to temporary disable fp16 under APPLE ARM64, as compiling
-// the source files require a hardware specific compilation flag.
-// When building an universial binary for APPLE, this flag would
-// cause trouble for x64 target.
-// referenced from MLAS
+// Had to temporary disable fp16 under APPLE ARM64, as compiling the source files
+// require a hardware specific compilation flag. When building an universial binary for APPLE,
+// this flag would cause trouble for x64 target. Referenced from MLAS
 #define XNNPACK_FP16_SUPPORTED
 #endif  //
 #endif  // ARM64

diff --git a/onnxruntime/test/providers/cpu/nn/pool_fp16_op_test.cc b/onnxruntime/test/providers/cpu/nn/pool_fp16_op_test.cc
@@ -3,11 +3,7 @@
 
 #include "core/mlas/inc/mlas.h"
 
-<<<<<<< HEAD
-#if defined(MLAS_F16VEC_INTRINSICS_SUPPORTED) || defined(XNNPACK_FP16_SUPPORTED)
-=======
 #if defined(MLAS_F16VEC_INTRINSICS_SUPPORTED) || defined(COREML_ENABLE_MLPROGRAM) || defined(XNNPACK_FP16_SUPPORTED)
->>>>>>> 6527ac2a24 (onnx node supported)
 
 #include "core/providers/cpu/nn/pool.h"
 #include "gtest/gtest.h"